blob: 217a5a5a4bfbed8868ec1c4e43085c7fbea7e83a [file] [log] [blame]
[email protected]dfaecd22011-04-21 00:33:311# coding=utf8
[email protected]9799a072012-01-11 00:26:252# Copyright (c) 2012 The Chromium Authors. All rights reserved.
[email protected]dfaecd22011-04-21 00:33:313# Use of this source code is governed by a BSD-style license that can be
4# found in the LICENSE file.
5"""Manages a project checkout.
6
7Includes support for svn, git-svn and git.
8"""
9
[email protected]dfaecd22011-04-21 00:33:3110import ConfigParser
11import fnmatch
12import logging
13import os
14import re
[email protected]5e975632011-09-29 18:07:0615import shutil
[email protected]dfaecd22011-04-21 00:33:3116import subprocess
17import sys
18import tempfile
19
20import patch
21import scm
22import subprocess2
23
24
25def get_code_review_setting(path, key,
26 codereview_settings_file='codereview.settings'):
27 """Parses codereview.settings and return the value for the key if present.
28
29 Don't cache the values in case the file is changed."""
30 # TODO(maruel): Do not duplicate code.
31 settings = {}
32 try:
33 settings_file = open(os.path.join(path, codereview_settings_file), 'r')
34 try:
35 for line in settings_file.readlines():
36 if not line or line.startswith('#'):
37 continue
38 if not ':' in line:
39 # Invalid file.
40 return None
41 k, v = line.split(':', 1)
42 settings[k.strip()] = v.strip()
43 finally:
44 settings_file.close()
[email protected]004fb712011-06-21 20:02:1645 except IOError:
[email protected]dfaecd22011-04-21 00:33:3146 return None
47 return settings.get(key, None)
48
49
50class PatchApplicationFailed(Exception):
51 """Patch failed to be applied."""
[email protected]34f68552012-05-09 19:18:3652 def __init__(self, p, status):
53 super(PatchApplicationFailed, self).__init__(p, status)
54 self.patch = p
[email protected]dfaecd22011-04-21 00:33:3155 self.status = status
56
[email protected]34f68552012-05-09 19:18:3657 @property
58 def filename(self):
59 if self.patch:
60 return self.patch.filename
61
62 def __str__(self):
63 out = []
64 if self.filename:
65 out.append('Failed to apply patch for %s:' % self.filename)
66 if self.status:
67 out.append(self.status)
68 return '\n'.join(out)
69
[email protected]dfaecd22011-04-21 00:33:3170
71class CheckoutBase(object):
72 # Set to None to have verbose output.
73 VOID = subprocess2.VOID
74
[email protected]6ed8b502011-06-12 01:05:3575 def __init__(self, root_dir, project_name, post_processors):
76 """
77 Args:
78 post_processor: list of lambda(checkout, patches) to call on each of the
79 modified files.
80 """
[email protected]a5129fb2011-06-20 18:36:2581 super(CheckoutBase, self).__init__()
[email protected]dfaecd22011-04-21 00:33:3182 self.root_dir = root_dir
83 self.project_name = project_name
[email protected]3cdb7f32011-05-05 16:37:2484 if self.project_name is None:
85 self.project_path = self.root_dir
86 else:
87 self.project_path = os.path.join(self.root_dir, self.project_name)
[email protected]dfaecd22011-04-21 00:33:3188 # Only used for logging purposes.
89 self._last_seen_revision = None
[email protected]a5129fb2011-06-20 18:36:2590 self.post_processors = post_processors
[email protected]dfaecd22011-04-21 00:33:3191 assert self.root_dir
[email protected]dfaecd22011-04-21 00:33:3192 assert self.project_path
93
94 def get_settings(self, key):
95 return get_code_review_setting(self.project_path, key)
96
[email protected]51919772011-06-12 01:27:4297 def prepare(self, revision):
[email protected]dfaecd22011-04-21 00:33:3198 """Checks out a clean copy of the tree and removes any local modification.
99
100 This function shouldn't throw unless the remote repository is inaccessible,
101 there is no free disk space or hard issues like that.
[email protected]51919772011-06-12 01:27:42102
103 Args:
104 revision: The revision it should sync to, SCM specific.
[email protected]dfaecd22011-04-21 00:33:31105 """
106 raise NotImplementedError()
107
[email protected]b1d1a782011-09-29 14:13:55108 def apply_patch(self, patches, post_processors=None):
[email protected]dfaecd22011-04-21 00:33:31109 """Applies a patch and returns the list of modified files.
110
111 This function should throw patch.UnsupportedPatchFormat or
112 PatchApplicationFailed when relevant.
[email protected]8a1396c2011-04-22 00:14:24113
114 Args:
115 patches: patch.PatchSet object.
[email protected]dfaecd22011-04-21 00:33:31116 """
117 raise NotImplementedError()
118
119 def commit(self, commit_message, user):
120 """Commits the patch upstream, while impersonating 'user'."""
121 raise NotImplementedError()
122
[email protected]bc32ad12012-07-26 13:22:47123 def revisions(self, rev1, rev2):
124 """Returns the count of revisions from rev1 to rev2, e.g. len(]rev1, rev2]).
125
126 If rev2 is None, it means 'HEAD'.
127
128 Returns None if there is no link between the two.
129 """
130 raise NotImplementedError()
131
[email protected]dfaecd22011-04-21 00:33:31132
133class RawCheckout(CheckoutBase):
134 """Used to apply a patch locally without any intent to commit it.
135
136 To be used by the try server.
137 """
[email protected]51919772011-06-12 01:27:42138 def prepare(self, revision):
[email protected]dfaecd22011-04-21 00:33:31139 """Stubbed out."""
140 pass
141
[email protected]b1d1a782011-09-29 14:13:55142 def apply_patch(self, patches, post_processors=None):
[email protected]8a1396c2011-04-22 00:14:24143 """Ignores svn properties."""
[email protected]b1d1a782011-09-29 14:13:55144 post_processors = post_processors or self.post_processors or []
[email protected]dfaecd22011-04-21 00:33:31145 for p in patches:
[email protected]de800ff2012-09-12 19:25:24146 logging.debug('Applying %s' % p.filename)
[email protected]dfaecd22011-04-21 00:33:31147 try:
148 stdout = ''
149 filename = os.path.join(self.project_path, p.filename)
150 if p.is_delete:
151 os.remove(filename)
152 else:
153 dirname = os.path.dirname(p.filename)
154 full_dir = os.path.join(self.project_path, dirname)
155 if dirname and not os.path.isdir(full_dir):
156 os.makedirs(full_dir)
[email protected]4869bcf2011-06-04 01:14:32157
158 filepath = os.path.join(self.project_path, p.filename)
[email protected]dfaecd22011-04-21 00:33:31159 if p.is_binary:
[email protected]4869bcf2011-06-04 01:14:32160 with open(filepath, 'wb') as f:
[email protected]dfaecd22011-04-21 00:33:31161 f.write(p.get())
162 else:
[email protected]5e975632011-09-29 18:07:06163 if p.source_filename:
164 if not p.is_new:
165 raise PatchApplicationFailed(
[email protected]34f68552012-05-09 19:18:36166 p,
[email protected]5e975632011-09-29 18:07:06167 'File has a source filename specified but is not new')
168 # Copy the file first.
169 if os.path.isfile(filepath):
170 raise PatchApplicationFailed(
[email protected]34f68552012-05-09 19:18:36171 p, 'File exist but was about to be overwriten')
[email protected]5e975632011-09-29 18:07:06172 shutil.copy2(
173 os.path.join(self.project_path, p.source_filename), filepath)
[email protected]58fe6622011-06-03 20:59:27174 if p.diff_hunks:
175 stdout = subprocess2.check_output(
[email protected]5e975632011-09-29 18:07:06176 ['patch', '-u', '--binary', '-p%s' % p.patchlevel],
177 stdin=p.get(False),
[email protected]87e6d332011-09-09 19:01:28178 stderr=subprocess2.STDOUT,
[email protected]58fe6622011-06-03 20:59:27179 cwd=self.project_path)
[email protected]4869bcf2011-06-04 01:14:32180 elif p.is_new and not os.path.exists(filepath):
[email protected]58fe6622011-06-03 20:59:27181 # There is only a header. Just create the file.
[email protected]4869bcf2011-06-04 01:14:32182 open(filepath, 'w').close()
[email protected]b1d1a782011-09-29 14:13:55183 for post in post_processors:
[email protected]8a1396c2011-04-22 00:14:24184 post(self, p)
[email protected]dfaecd22011-04-21 00:33:31185 except OSError, e:
[email protected]34f68552012-05-09 19:18:36186 raise PatchApplicationFailed(p, '%s%s' % (stdout, e))
[email protected]dfaecd22011-04-21 00:33:31187 except subprocess.CalledProcessError, e:
188 raise PatchApplicationFailed(
[email protected]34f68552012-05-09 19:18:36189 p, '%s%s' % (stdout, getattr(e, 'stdout', None)))
[email protected]dfaecd22011-04-21 00:33:31190
191 def commit(self, commit_message, user):
192 """Stubbed out."""
193 raise NotImplementedError('RawCheckout can\'t commit')
194
[email protected]bc32ad12012-07-26 13:22:47195 def revisions(self, _rev1, _rev2):
196 return None
197
[email protected]dfaecd22011-04-21 00:33:31198
199class SvnConfig(object):
200 """Parses a svn configuration file."""
201 def __init__(self, svn_config_dir=None):
[email protected]a5129fb2011-06-20 18:36:25202 super(SvnConfig, self).__init__()
[email protected]dfaecd22011-04-21 00:33:31203 self.svn_config_dir = svn_config_dir
204 self.default = not bool(self.svn_config_dir)
205 if not self.svn_config_dir:
206 if sys.platform == 'win32':
207 self.svn_config_dir = os.path.join(os.environ['APPDATA'], 'Subversion')
208 else:
209 self.svn_config_dir = os.path.join(os.environ['HOME'], '.subversion')
210 svn_config_file = os.path.join(self.svn_config_dir, 'config')
211 parser = ConfigParser.SafeConfigParser()
212 if os.path.isfile(svn_config_file):
213 parser.read(svn_config_file)
214 else:
215 parser.add_section('auto-props')
216 self.auto_props = dict(parser.items('auto-props'))
217
218
219class SvnMixIn(object):
220 """MixIn class to add svn commands common to both svn and git-svn clients."""
221 # These members need to be set by the subclass.
222 commit_user = None
223 commit_pwd = None
224 svn_url = None
225 project_path = None
226 # Override at class level when necessary. If used, --non-interactive is
227 # implied.
228 svn_config = SvnConfig()
229 # Set to True when non-interactivity is necessary but a custom subversion
230 # configuration directory is not necessary.
231 non_interactive = False
232
[email protected]9842a0c2011-05-30 20:41:54233 def _add_svn_flags(self, args, non_interactive, credentials=True):
[email protected]dfaecd22011-04-21 00:33:31234 args = ['svn'] + args
235 if not self.svn_config.default:
236 args.extend(['--config-dir', self.svn_config.svn_config_dir])
237 if not self.svn_config.default or self.non_interactive or non_interactive:
238 args.append('--non-interactive')
[email protected]9842a0c2011-05-30 20:41:54239 if credentials:
240 if self.commit_user:
241 args.extend(['--username', self.commit_user])
242 if self.commit_pwd:
243 args.extend(['--password', self.commit_pwd])
[email protected]dfaecd22011-04-21 00:33:31244 return args
245
246 def _check_call_svn(self, args, **kwargs):
247 """Runs svn and throws an exception if the command failed."""
248 kwargs.setdefault('cwd', self.project_path)
249 kwargs.setdefault('stdout', self.VOID)
[email protected]0bcd1d32011-04-26 15:55:49250 return subprocess2.check_call_out(
251 self._add_svn_flags(args, False), **kwargs)
[email protected]dfaecd22011-04-21 00:33:31252
[email protected]9842a0c2011-05-30 20:41:54253 def _check_output_svn(self, args, credentials=True, **kwargs):
[email protected]dfaecd22011-04-21 00:33:31254 """Runs svn and throws an exception if the command failed.
255
256 Returns the output.
257 """
258 kwargs.setdefault('cwd', self.project_path)
[email protected]9842a0c2011-05-30 20:41:54259 return subprocess2.check_output(
[email protected]87e6d332011-09-09 19:01:28260 self._add_svn_flags(args, True, credentials),
261 stderr=subprocess2.STDOUT,
262 **kwargs)
[email protected]dfaecd22011-04-21 00:33:31263
264 @staticmethod
265 def _parse_svn_info(output, key):
266 """Returns value for key from svn info output.
267
268 Case insensitive.
269 """
270 values = {}
271 key = key.lower()
272 for line in output.splitlines(False):
273 if not line:
274 continue
275 k, v = line.split(':', 1)
276 k = k.strip().lower()
277 v = v.strip()
278 assert not k in values
279 values[k] = v
280 return values.get(key, None)
281
282
283class SvnCheckout(CheckoutBase, SvnMixIn):
284 """Manages a subversion checkout."""
[email protected]6ed8b502011-06-12 01:05:35285 def __init__(self, root_dir, project_name, commit_user, commit_pwd, svn_url,
286 post_processors=None):
[email protected]a5129fb2011-06-20 18:36:25287 CheckoutBase.__init__(self, root_dir, project_name, post_processors)
288 SvnMixIn.__init__(self)
[email protected]dfaecd22011-04-21 00:33:31289 self.commit_user = commit_user
290 self.commit_pwd = commit_pwd
291 self.svn_url = svn_url
292 assert bool(self.commit_user) >= bool(self.commit_pwd)
[email protected]dfaecd22011-04-21 00:33:31293
[email protected]51919772011-06-12 01:27:42294 def prepare(self, revision):
[email protected]dfaecd22011-04-21 00:33:31295 # Will checkout if the directory is not present.
[email protected]3cdb7f32011-05-05 16:37:24296 assert self.svn_url
[email protected]dfaecd22011-04-21 00:33:31297 if not os.path.isdir(self.project_path):
298 logging.info('Checking out %s in %s' %
299 (self.project_name, self.project_path))
[email protected]51919772011-06-12 01:27:42300 return self._revert(revision)
[email protected]dfaecd22011-04-21 00:33:31301
[email protected]b1d1a782011-09-29 14:13:55302 def apply_patch(self, patches, post_processors=None):
303 post_processors = post_processors or self.post_processors or []
[email protected]dfaecd22011-04-21 00:33:31304 for p in patches:
[email protected]de800ff2012-09-12 19:25:24305 logging.debug('Applying %s' % p.filename)
[email protected]dfaecd22011-04-21 00:33:31306 try:
[email protected]9842a0c2011-05-30 20:41:54307 # It is important to use credentials=False otherwise credentials could
308 # leak in the error message. Credentials are not necessary here for the
309 # following commands anyway.
[email protected]dfaecd22011-04-21 00:33:31310 stdout = ''
311 if p.is_delete:
[email protected]9842a0c2011-05-30 20:41:54312 stdout += self._check_output_svn(
313 ['delete', p.filename, '--force'], credentials=False)
[email protected]dfaecd22011-04-21 00:33:31314 else:
[email protected]dfaecd22011-04-21 00:33:31315 # svn add while creating directories otherwise svn add on the
316 # contained files will silently fail.
317 # First, find the root directory that exists.
318 dirname = os.path.dirname(p.filename)
319 dirs_to_create = []
320 while (dirname and
321 not os.path.isdir(os.path.join(self.project_path, dirname))):
322 dirs_to_create.append(dirname)
323 dirname = os.path.dirname(dirname)
324 for dir_to_create in reversed(dirs_to_create):
325 os.mkdir(os.path.join(self.project_path, dir_to_create))
326 stdout += self._check_output_svn(
[email protected]9842a0c2011-05-30 20:41:54327 ['add', dir_to_create, '--force'], credentials=False)
[email protected]dfaecd22011-04-21 00:33:31328
[email protected]4869bcf2011-06-04 01:14:32329 filepath = os.path.join(self.project_path, p.filename)
[email protected]dfaecd22011-04-21 00:33:31330 if p.is_binary:
[email protected]4869bcf2011-06-04 01:14:32331 with open(filepath, 'wb') as f:
[email protected]dfaecd22011-04-21 00:33:31332 f.write(p.get())
333 else:
[email protected]5e975632011-09-29 18:07:06334 if p.source_filename:
335 if not p.is_new:
336 raise PatchApplicationFailed(
[email protected]34f68552012-05-09 19:18:36337 p,
[email protected]5e975632011-09-29 18:07:06338 'File has a source filename specified but is not new')
339 # Copy the file first.
340 if os.path.isfile(filepath):
341 raise PatchApplicationFailed(
[email protected]34f68552012-05-09 19:18:36342 p, 'File exist but was about to be overwriten')
[email protected]3da83172012-05-07 16:17:20343 self._check_output_svn(
[email protected]b0f852f2012-09-15 01:37:21344 ['copy', p.source_filename, p.filename])
[email protected]58fe6622011-06-03 20:59:27345 if p.diff_hunks:
346 cmd = ['patch', '-p%s' % p.patchlevel, '--forward', '--force']
347 stdout += subprocess2.check_output(
[email protected]5e975632011-09-29 18:07:06348 cmd, stdin=p.get(False), cwd=self.project_path)
[email protected]4869bcf2011-06-04 01:14:32349 elif p.is_new and not os.path.exists(filepath):
350 # There is only a header. Just create the file if it doesn't
351 # exist.
352 open(filepath, 'w').close()
[email protected]3da83172012-05-07 16:17:20353 if p.is_new and not p.source_filename:
354 # Do not run it if p.source_filename is defined, since svn copy was
355 # using above.
[email protected]9842a0c2011-05-30 20:41:54356 stdout += self._check_output_svn(
357 ['add', p.filename, '--force'], credentials=False)
[email protected]d7ca6162012-08-29 17:22:22358 for name, value in p.svn_properties:
359 if value is None:
360 stdout += self._check_output_svn(
361 ['propdel', '--quiet', name, p.filename], credentials=False)
362 else:
363 stdout += self._check_output_svn(
364 ['propset', name, value, p.filename], credentials=False)
[email protected]9842a0c2011-05-30 20:41:54365 for prop, values in self.svn_config.auto_props.iteritems():
[email protected]dfaecd22011-04-21 00:33:31366 if fnmatch.fnmatch(p.filename, prop):
[email protected]9842a0c2011-05-30 20:41:54367 for value in values.split(';'):
368 if '=' not in value:
[email protected]e1a03762012-09-24 15:28:52369 params = [value, '.']
[email protected]9842a0c2011-05-30 20:41:54370 else:
371 params = value.split('=', 1)
[email protected]e1a03762012-09-24 15:28:52372 if params[1] == '*':
373 # Works around crbug.com/150960 on Windows.
374 params[1] = '.'
[email protected]9842a0c2011-05-30 20:41:54375 stdout += self._check_output_svn(
376 ['propset'] + params + [p.filename], credentials=False)
[email protected]b1d1a782011-09-29 14:13:55377 for post in post_processors:
[email protected]8a1396c2011-04-22 00:14:24378 post(self, p)
[email protected]dfaecd22011-04-21 00:33:31379 except OSError, e:
[email protected]34f68552012-05-09 19:18:36380 raise PatchApplicationFailed(p, '%s%s' % (stdout, e))
[email protected]dfaecd22011-04-21 00:33:31381 except subprocess.CalledProcessError, e:
382 raise PatchApplicationFailed(
[email protected]34f68552012-05-09 19:18:36383 p,
[email protected]9842a0c2011-05-30 20:41:54384 'While running %s;\n%s%s' % (
385 ' '.join(e.cmd), stdout, getattr(e, 'stdout', '')))
[email protected]dfaecd22011-04-21 00:33:31386
387 def commit(self, commit_message, user):
388 logging.info('Committing patch for %s' % user)
389 assert self.commit_user
[email protected]1bf50972011-05-05 19:57:21390 assert isinstance(commit_message, unicode)
[email protected]dfaecd22011-04-21 00:33:31391 handle, commit_filename = tempfile.mkstemp(text=True)
392 try:
[email protected]1bf50972011-05-05 19:57:21393 # Shouldn't assume default encoding is UTF-8. But really, if you are using
394 # anything else, you are living in another world.
395 os.write(handle, commit_message.encode('utf-8'))
[email protected]dfaecd22011-04-21 00:33:31396 os.close(handle)
397 # When committing, svn won't update the Revision metadata of the checkout,
398 # so if svn commit returns "Committed revision 3.", svn info will still
399 # return "Revision: 2". Since running svn update right after svn commit
400 # creates a race condition with other committers, this code _must_ parse
401 # the output of svn commit and use a regexp to grab the revision number.
402 # Note that "Committed revision N." is localized but subprocess2 forces
403 # LANGUAGE=en.
404 args = ['commit', '--file', commit_filename]
405 # realauthor is parsed by a server-side hook.
406 if user and user != self.commit_user:
407 args.extend(['--with-revprop', 'realauthor=%s' % user])
408 out = self._check_output_svn(args)
409 finally:
410 os.remove(commit_filename)
411 lines = filter(None, out.splitlines())
412 match = re.match(r'^Committed revision (\d+).$', lines[-1])
413 if not match:
414 raise PatchApplicationFailed(
415 None,
416 'Couldn\'t make sense out of svn commit message:\n' + out)
417 return int(match.group(1))
418
[email protected]51919772011-06-12 01:27:42419 def _revert(self, revision):
[email protected]dfaecd22011-04-21 00:33:31420 """Reverts local modifications or checks out if the directory is not
421 present. Use depot_tools's functionality to do this.
422 """
423 flags = ['--ignore-externals']
[email protected]51919772011-06-12 01:27:42424 if revision:
425 flags.extend(['--revision', str(revision)])
[email protected]dfaecd22011-04-21 00:33:31426 if not os.path.isdir(self.project_path):
427 logging.info(
428 'Directory %s is not present, checking it out.' % self.project_path)
429 self._check_call_svn(
430 ['checkout', self.svn_url, self.project_path] + flags, cwd=None)
431 else:
[email protected]ea15cb72012-05-04 14:16:31432 scm.SVN.Revert(self.project_path, no_ignore=True)
[email protected]dfaecd22011-04-21 00:33:31433 # Revive files that were deleted in scm.SVN.Revert().
434 self._check_call_svn(['update', '--force'] + flags)
[email protected]51919772011-06-12 01:27:42435 return self._get_revision()
[email protected]dfaecd22011-04-21 00:33:31436
[email protected]51919772011-06-12 01:27:42437 def _get_revision(self):
[email protected]dfaecd22011-04-21 00:33:31438 out = self._check_output_svn(['info', '.'])
[email protected]51919772011-06-12 01:27:42439 revision = int(self._parse_svn_info(out, 'revision'))
440 if revision != self._last_seen_revision:
441 logging.info('Updated to revision %d' % revision)
442 self._last_seen_revision = revision
443 return revision
[email protected]dfaecd22011-04-21 00:33:31444
[email protected]bc32ad12012-07-26 13:22:47445 def revisions(self, rev1, rev2):
446 """Returns the number of actual commits, not just the difference between
447 numbers.
448 """
449 rev2 = rev2 or 'HEAD'
450 # Revision range is inclusive and ordering doesn't matter, they'll appear in
451 # the order specified.
452 try:
453 out = self._check_output_svn(
454 ['log', '-q', self.svn_url, '-r', '%s:%s' % (rev1, rev2)])
455 except subprocess.CalledProcessError:
456 return None
457 # Ignore the '----' lines.
458 return len([l for l in out.splitlines() if l.startswith('r')]) - 1
459
[email protected]dfaecd22011-04-21 00:33:31460
461class GitCheckoutBase(CheckoutBase):
462 """Base class for git checkout. Not to be used as-is."""
[email protected]6ed8b502011-06-12 01:05:35463 def __init__(self, root_dir, project_name, remote_branch,
464 post_processors=None):
465 super(GitCheckoutBase, self).__init__(
466 root_dir, project_name, post_processors)
[email protected]dfaecd22011-04-21 00:33:31467 # There is no reason to not hardcode it.
468 self.remote = 'origin'
469 self.remote_branch = remote_branch
470 self.working_branch = 'working_branch'
[email protected]dfaecd22011-04-21 00:33:31471
[email protected]51919772011-06-12 01:27:42472 def prepare(self, revision):
[email protected]dfaecd22011-04-21 00:33:31473 """Resets the git repository in a clean state.
474
475 Checks it out if not present and deletes the working branch.
476 """
[email protected]3cdb7f32011-05-05 16:37:24477 assert self.remote_branch
[email protected]dfaecd22011-04-21 00:33:31478 assert os.path.isdir(self.project_path)
479 self._check_call_git(['reset', '--hard', '--quiet'])
[email protected]51919772011-06-12 01:27:42480 if revision:
481 try:
482 revision = self._check_output_git(['rev-parse', revision])
483 except subprocess.CalledProcessError:
484 self._check_call_git(
485 ['fetch', self.remote, self.remote_branch, '--quiet'])
486 revision = self._check_output_git(['rev-parse', revision])
487 self._check_call_git(['checkout', '--force', '--quiet', revision])
488 else:
489 branches, active = self._branches()
490 if active != 'master':
491 self._check_call_git(['checkout', '--force', '--quiet', 'master'])
492 self._check_call_git(['pull', self.remote, self.remote_branch, '--quiet'])
493 if self.working_branch in branches:
494 self._call_git(['branch', '-D', self.working_branch])
[email protected]dfaecd22011-04-21 00:33:31495
[email protected]b1d1a782011-09-29 14:13:55496 def apply_patch(self, patches, post_processors=None):
[email protected]8a1396c2011-04-22 00:14:24497 """Applies a patch on 'working_branch' and switch to it.
498
499 Also commits the changes on the local branch.
500
501 Ignores svn properties and raise an exception on unexpected ones.
502 """
[email protected]b1d1a782011-09-29 14:13:55503 post_processors = post_processors or self.post_processors or []
[email protected]dfaecd22011-04-21 00:33:31504 # It this throws, the checkout is corrupted. Maybe worth deleting it and
505 # trying again?
[email protected]3cdb7f32011-05-05 16:37:24506 if self.remote_branch:
507 self._check_call_git(
508 ['checkout', '-b', self.working_branch,
509 '%s/%s' % (self.remote, self.remote_branch), '--quiet'])
[email protected]5e975632011-09-29 18:07:06510 for index, p in enumerate(patches):
[email protected]de800ff2012-09-12 19:25:24511 logging.debug('Applying %s' % p.filename)
[email protected]dfaecd22011-04-21 00:33:31512 try:
513 stdout = ''
514 if p.is_delete:
[email protected]5e975632011-09-29 18:07:06515 if (not os.path.exists(p.filename) and
516 any(p1.source_filename == p.filename for p1 in patches[0:index])):
517 # The file could already be deleted if a prior patch with file
518 # rename was already processed. To be sure, look at all the previous
519 # patches to see if they were a file rename.
520 pass
521 else:
522 stdout += self._check_output_git(['rm', p.filename])
[email protected]dfaecd22011-04-21 00:33:31523 else:
524 dirname = os.path.dirname(p.filename)
525 full_dir = os.path.join(self.project_path, dirname)
526 if dirname and not os.path.isdir(full_dir):
527 os.makedirs(full_dir)
528 if p.is_binary:
529 with open(os.path.join(self.project_path, p.filename), 'wb') as f:
530 f.write(p.get())
531 stdout += self._check_output_git(['add', p.filename])
532 else:
[email protected]58fe6622011-06-03 20:59:27533 # No need to do anything special with p.is_new or if not
534 # p.diff_hunks. git apply manages all that already.
[email protected]dfaecd22011-04-21 00:33:31535 stdout += self._check_output_git(
[email protected]5e975632011-09-29 18:07:06536 ['apply', '--index', '-p%s' % p.patchlevel], stdin=p.get(True))
[email protected]d7ca6162012-08-29 17:22:22537 for name, _ in p.svn_properties:
[email protected]dfaecd22011-04-21 00:33:31538 # Ignore some known auto-props flags through .subversion/config,
539 # bails out on the other ones.
540 # TODO(maruel): Read ~/.subversion/config and detect the rules that
541 # applies here to figure out if the property will be correctly
542 # handled.
[email protected]d7ca6162012-08-29 17:22:22543 if not name in (
[email protected]9799a072012-01-11 00:26:25544 'svn:eol-style', 'svn:executable', 'svn:mime-type'):
[email protected]dfaecd22011-04-21 00:33:31545 raise patch.UnsupportedPatchFormat(
546 p.filename,
547 'Cannot apply svn property %s to file %s.' % (
[email protected]d7ca6162012-08-29 17:22:22548 name, p.filename))
[email protected]b1d1a782011-09-29 14:13:55549 for post in post_processors:
[email protected]8a1396c2011-04-22 00:14:24550 post(self, p)
[email protected]dfaecd22011-04-21 00:33:31551 except OSError, e:
[email protected]34f68552012-05-09 19:18:36552 raise PatchApplicationFailed(p, '%s%s' % (stdout, e))
[email protected]dfaecd22011-04-21 00:33:31553 except subprocess.CalledProcessError, e:
554 raise PatchApplicationFailed(
[email protected]34f68552012-05-09 19:18:36555 p, '%s%s' % (stdout, getattr(e, 'stdout', None)))
[email protected]dfaecd22011-04-21 00:33:31556 # Once all the patches are processed and added to the index, commit the
557 # index.
558 self._check_call_git(['commit', '-m', 'Committed patch'])
559 # TODO(maruel): Weirdly enough they don't match, need to investigate.
560 #found_files = self._check_output_git(
561 # ['diff', 'master', '--name-only']).splitlines(False)
562 #assert sorted(patches.filenames) == sorted(found_files), (
563 # sorted(out), sorted(found_files))
564
565 def commit(self, commit_message, user):
566 """Updates the commit message.
567
568 Subclass needs to dcommit or push.
569 """
[email protected]1bf50972011-05-05 19:57:21570 assert isinstance(commit_message, unicode)
[email protected]dfaecd22011-04-21 00:33:31571 self._check_call_git(['commit', '--amend', '-m', commit_message])
572 return self._check_output_git(['rev-parse', 'HEAD']).strip()
573
574 def _check_call_git(self, args, **kwargs):
575 kwargs.setdefault('cwd', self.project_path)
576 kwargs.setdefault('stdout', self.VOID)
[email protected]0bcd1d32011-04-26 15:55:49577 return subprocess2.check_call_out(['git'] + args, **kwargs)
[email protected]dfaecd22011-04-21 00:33:31578
579 def _call_git(self, args, **kwargs):
580 """Like check_call but doesn't throw on failure."""
581 kwargs.setdefault('cwd', self.project_path)
582 kwargs.setdefault('stdout', self.VOID)
583 return subprocess2.call(['git'] + args, **kwargs)
584
585 def _check_output_git(self, args, **kwargs):
586 kwargs.setdefault('cwd', self.project_path)
[email protected]87e6d332011-09-09 19:01:28587 return subprocess2.check_output(
588 ['git'] + args, stderr=subprocess2.STDOUT, **kwargs)
[email protected]dfaecd22011-04-21 00:33:31589
590 def _branches(self):
591 """Returns the list of branches and the active one."""
592 out = self._check_output_git(['branch']).splitlines(False)
593 branches = [l[2:] for l in out]
594 active = None
595 for l in out:
596 if l.startswith('*'):
597 active = l[2:]
598 break
599 return branches, active
600
[email protected]bc32ad12012-07-26 13:22:47601 def revisions(self, rev1, rev2):
602 """Returns the number of actual commits between both hash."""
603 self._fetch_remote()
604
605 rev2 = rev2 or '%s/%s' % (self.remote, self.remote_branch)
606 # Revision range is ]rev1, rev2] and ordering matters.
607 try:
608 out = self._check_output_git(
609 ['log', '--format="%H"' , '%s..%s' % (rev1, rev2)])
610 except subprocess.CalledProcessError:
611 return None
612 return len(out.splitlines())
613
614 def _fetch_remote(self):
615 """Fetches the remote without rebasing."""
616 raise NotImplementedError()
617
618
619class GitCheckout(GitCheckoutBase):
620 """Git checkout implementation."""
621 def _fetch_remote(self):
622 # git fetch is always verbose even with -q -q so redirect its output.
623 self._check_output_git(['fetch', self.remote, self.remote_branch])
624
[email protected]dfaecd22011-04-21 00:33:31625
[email protected]dfaecd22011-04-21 00:33:31626class ReadOnlyCheckout(object):
627 """Converts a checkout into a read-only one."""
[email protected]b1d1a782011-09-29 14:13:55628 def __init__(self, checkout, post_processors=None):
[email protected]a5129fb2011-06-20 18:36:25629 super(ReadOnlyCheckout, self).__init__()
[email protected]dfaecd22011-04-21 00:33:31630 self.checkout = checkout
[email protected]b1d1a782011-09-29 14:13:55631 self.post_processors = (post_processors or []) + (
632 self.checkout.post_processors or [])
[email protected]dfaecd22011-04-21 00:33:31633
[email protected]51919772011-06-12 01:27:42634 def prepare(self, revision):
635 return self.checkout.prepare(revision)
[email protected]dfaecd22011-04-21 00:33:31636
637 def get_settings(self, key):
638 return self.checkout.get_settings(key)
639
[email protected]b1d1a782011-09-29 14:13:55640 def apply_patch(self, patches, post_processors=None):
641 return self.checkout.apply_patch(
642 patches, post_processors or self.post_processors)
[email protected]dfaecd22011-04-21 00:33:31643
644 def commit(self, message, user): # pylint: disable=R0201
645 logging.info('Would have committed for %s with message: %s' % (
646 user, message))
647 return 'FAKE'
648
[email protected]bc32ad12012-07-26 13:22:47649 def revisions(self, rev1, rev2):
650 return self.checkout.revisions(rev1, rev2)
651
[email protected]dfaecd22011-04-21 00:33:31652 @property
653 def project_name(self):
654 return self.checkout.project_name
655
656 @property
657 def project_path(self):
658 return self.checkout.project_path