blob: 2d773a355fafe6e02be69ecb75777117dc4d1432 [file] [log] [blame]
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001# Copyright (c) 2011 The Chromium Authors. All rights reserved.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00004
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00005"""Gclient-specific SCM-specific operations."""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00006
maruel@chromium.org754960e2009-09-21 12:31:05 +00007import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00008import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00009import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000010import re
maruel@chromium.org90541732011-04-01 17:54:18 +000011import sys
maruel@chromium.orgfd876172010-04-30 14:01:05 +000012import time
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000013
14import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000015import scm
16import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000017
18
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000019class DiffFilterer(object):
20 """Simple class which tracks which file is being diffed and
21 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000022 working copy lines of the svn/git diff output."""
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000023 index_string = "Index: "
24 original_prefix = "--- "
25 working_prefix = "+++ "
26
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000027 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000028 # Note that we always use '/' as the path separator to be
29 # consistent with svn's cygwin-style output on Windows
30 self._relpath = relpath.replace("\\", "/")
31 self._current_file = ""
32 self._replacement_file = ""
33
maruel@chromium.org6e29d572010-06-04 17:32:20 +000034 def SetCurrentFile(self, current_file):
35 self._current_file = current_file
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000036 # Note that we always use '/' as the path separator to be
37 # consistent with svn's cygwin-style output on Windows
maruel@chromium.org6e29d572010-06-04 17:32:20 +000038 self._replacement_file = posixpath.join(self._relpath, current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000039
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000040 def _Replace(self, line):
41 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000042
43 def Filter(self, line):
44 if (line.startswith(self.index_string)):
45 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000046 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000047 else:
48 if (line.startswith(self.original_prefix) or
49 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000050 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000051 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000052
53
maruel@chromium.org90541732011-04-01 17:54:18 +000054def ask_for_data(prompt):
55 try:
56 return raw_input(prompt)
57 except KeyboardInterrupt:
58 # Hide the exception.
59 sys.exit(1)
60
61
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000062### SCM abstraction layer
63
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000064# Factory Method for SCM wrapper creation
65
maruel@chromium.org9eda4112010-06-11 18:56:10 +000066def GetScmName(url):
67 if url:
68 url, _ = gclient_utils.SplitUrlRevision(url)
69 if (url.startswith('git://') or url.startswith('ssh://') or
70 url.endswith('.git')):
71 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000072 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000073 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000074 return 'svn'
75 return None
76
77
78def CreateSCM(url, root_dir=None, relpath=None):
79 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000080 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +000081 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000082 }
msb@chromium.orge28e4982009-09-25 20:51:45 +000083
maruel@chromium.org9eda4112010-06-11 18:56:10 +000084 scm_name = GetScmName(url)
85 if not scm_name in SCM_MAP:
86 raise gclient_utils.Error('No SCM found for url %s' % url)
87 return SCM_MAP[scm_name](url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000088
89
90# SCMWrapper base class
91
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000092class SCMWrapper(object):
93 """Add necessary glue between all the supported SCM.
94
msb@chromium.orgd6504212010-01-13 17:34:31 +000095 This is the abstraction layer to bind to different SCM.
96 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +000097 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000098 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +000099 self._root_dir = root_dir
100 if self._root_dir:
101 self._root_dir = self._root_dir.replace('/', os.sep)
102 self.relpath = relpath
103 if self.relpath:
104 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000105 if self.relpath and self._root_dir:
106 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000107
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000108 def RunCommand(self, command, options, args, file_list=None):
109 # file_list will have all files that are modified appended to it.
maruel@chromium.orgde754ac2009-09-17 18:04:50 +0000110 if file_list is None:
111 file_list = []
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000112
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000113 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000114 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000115
116 if not command in commands:
117 raise gclient_utils.Error('Unknown command %s' % command)
118
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000119 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000120 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000121 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000122
123 return getattr(self, command)(options, args, file_list)
124
125
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000126class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000127 """Wrapper for Git"""
128
floitsch@google.comeaab7842011-04-28 09:07:58 +0000129 def GetRevisionDate(self, revision):
130 """Returns the given revision's date in ISO-8601 format (which contains the
131 time zone)."""
132 # TODO(floitsch): get the time-stamp of the given revision and not just the
133 # time-stamp of the currently checked out revision.
134 return self._Capture(['log', '-n', '1', '--format=%ai'])
135
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000136 @staticmethod
137 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000138 """'Cleanup' the repo.
139
140 There's no real git equivalent for the svn cleanup command, do a no-op.
141 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000142
143 def diff(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000144 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000145 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000146
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000147 def pack(self, options, args, file_list):
148 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000149 repository.
150
151 The patch file is generated from a diff of the merge base of HEAD and
152 its upstream branch.
153 """
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000154 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000155 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000156 ['git', 'diff', merge_base],
157 cwd=self.checkout_path,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000158 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000159
msb@chromium.orge28e4982009-09-25 20:51:45 +0000160 def update(self, options, args, file_list):
161 """Runs git to update or transparently checkout the working copy.
162
163 All updated files will be appended to file_list.
164
165 Raises:
166 Error: if can't get URL for relative path.
167 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000168 if args:
169 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
170
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000171 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000172
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000173 default_rev = "refs/heads/master"
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000174 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000175 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000176 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000177 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000178 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000179 # Override the revision number.
180 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000181 if revision == 'unmanaged':
182 revision = None
183 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000184 if not revision:
185 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000186
floitsch@google.comeaab7842011-04-28 09:07:58 +0000187 if gclient_utils.IsDateRevision(revision):
188 # Date-revisions only work on git-repositories if the reflog hasn't
189 # expired yet. Use rev-list to get the corresponding revision.
190 # git rev-list -n 1 --before='time-stamp' branchname
191 if options.transitive:
192 print('Warning: --transitive only works for SVN repositories.')
193 revision = default_rev
194
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000195 rev_str = ' at %s' % revision
196 files = []
197
198 printed_path = False
199 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000200 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000201 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000202 verbose = ['--verbose']
203 printed_path = True
204
205 if revision.startswith('refs/heads/'):
206 rev_type = "branch"
207 elif revision.startswith('origin/'):
208 # For compatability with old naming, translate 'origin' to 'refs/heads'
209 revision = revision.replace('origin/', 'refs/heads/')
210 rev_type = "branch"
211 else:
212 # hash is also a tag, only make a distinction at checkout
213 rev_type = "hash"
214
msb@chromium.orge28e4982009-09-25 20:51:45 +0000215 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000216 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000217 self._Clone(revision, url, options)
thomasvl@chromium.org858d6452011-03-24 17:59:20 +0000218 files = self._Capture(['ls-files']).splitlines()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000219 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000220 if not verbose:
221 # Make the output a little prettier. It's nice to have some whitespace
222 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000223 print('')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000224 return
225
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000226 if not managed:
227 print ('________ unmanaged solution; skipping %s' % self.relpath)
228 return
229
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000230 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
231 raise gclient_utils.Error('\n____ %s%s\n'
232 '\tPath is not a git repo. No .git dir.\n'
233 '\tTo resolve:\n'
234 '\t\trm -rf %s\n'
235 '\tAnd run gclient sync again\n'
236 % (self.relpath, rev_str, self.relpath))
237
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000238 # See if the url has changed (the unittests use git://foo for the url, let
239 # that through).
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000240 current_url = self._Capture(['config', 'remote.origin.url'])
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000241 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
242 # unit test pass. (and update the comment above)
243 if current_url != url and url != 'git://foo':
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000244 print('_____ switching %s to a new upstream' % self.relpath)
245 # Make sure it's clean
246 self._CheckClean(rev_str)
247 # Switch over to the new upstream
248 self._Run(['remote', 'set-url', 'origin', url], options)
249 quiet = []
250 if not options.verbose:
251 quiet = ['--quiet']
252 self._Run(['fetch', 'origin', '--prune'] + quiet, options)
253 self._Run(['reset', '--hard', 'origin/master'] + quiet, options)
254 files = self._Capture(['ls-files']).splitlines()
255 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
256 return
257
msb@chromium.org5bde4852009-12-14 16:47:12 +0000258 cur_branch = self._GetCurrentBranch()
259
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000260 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000261 # 0) HEAD is detached. Probably from our initial clone.
262 # - make sure HEAD is contained by a named ref, then update.
263 # Cases 1-4. HEAD is a branch.
264 # 1) current branch is not tracking a remote branch (could be git-svn)
265 # - try to rebase onto the new hash or branch
266 # 2) current branch is tracking a remote branch with local committed
267 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000268 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000269 # 3) current branch is tracking a remote branch w/or w/out changes,
270 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000271 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000272 # 4) current branch is tracking a remote branch, switches to a different
273 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000274 # - exit
275
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000276 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
277 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000278 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
279 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000280 if cur_branch is None:
281 upstream_branch = None
282 current_type = "detached"
283 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000284 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000285 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
286 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
287 current_type = "hash"
288 logging.debug("Current branch is not tracking an upstream (remote)"
289 " branch.")
290 elif upstream_branch.startswith('refs/remotes'):
291 current_type = "branch"
292 else:
293 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000294
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000295 # Update the remotes first so we have all the refs.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000296 backoff_time = 5
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000297 for _ in range(10):
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000298 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000299 remote_output = scm.GIT.Capture(
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000300 ['remote'] + verbose + ['update'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000301 cwd=self.checkout_path)
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000302 break
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000303 except subprocess2.CalledProcessError, e:
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000304 # Hackish but at that point, git is known to work so just checking for
305 # 502 in stderr should be fine.
306 if '502' in e.stderr:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000307 print(str(e))
308 print('Sleeping %.1f seconds and retrying...' % backoff_time)
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000309 time.sleep(backoff_time)
310 backoff_time *= 1.3
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000311 continue
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000312 raise
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000313
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000314 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000315 print(remote_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000316
317 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000318 if options.force or options.reset:
maruel@chromium.org37e89872010-09-07 16:11:33 +0000319 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000320
msb@chromium.org786fb682010-06-02 15:16:23 +0000321 if current_type == 'detached':
322 # case 0
323 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000324 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000325 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000326 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000327 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000328 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000329 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000330 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000331 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000332 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000333 newbase=revision, printed_path=printed_path)
334 printed_path = True
335 else:
336 # Can't find a merge-base since we don't know our upstream. That makes
337 # this command VERY likely to produce a rebase failure. For now we
338 # assume origin is our upstream since that's what the old behavior was.
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000339 upstream_branch = 'origin'
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000340 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000341 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000342 self._AttemptRebase(upstream_branch, files, options,
343 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000344 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000345 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000346 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000347 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000348 newbase=revision, printed_path=printed_path)
349 printed_path = True
350 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
351 # case 4
352 new_base = revision.replace('heads', 'remotes/origin')
353 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000354 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000355 switch_error = ("Switching upstream branch from %s to %s\n"
356 % (upstream_branch, new_base) +
357 "Please merge or rebase manually:\n" +
358 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
359 "OR git checkout -b <some new branch> %s" % new_base)
360 raise gclient_utils.Error(switch_error)
361 else:
362 # case 3 - the default case
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000363 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000364 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000365 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000366 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000367 merge_args = ['merge']
368 if not options.merge:
369 merge_args.append('--ff-only')
370 merge_args.append(upstream_branch)
371 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000372 except subprocess2.CalledProcessError, e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000373 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
374 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000375 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000376 printed_path = True
377 while True:
378 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000379 # TODO(maruel): That can't work with --jobs.
maruel@chromium.org90541732011-04-01 17:54:18 +0000380 action = ask_for_data(
381 'Cannot fast-forward merge, attempt to rebase? '
382 '(y)es / (q)uit / (s)kip : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000383 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000384 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000385 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000386 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000387 printed_path=printed_path)
388 printed_path = True
389 break
390 elif re.match(r'quit|q', action, re.I):
391 raise gclient_utils.Error("Can't fast-forward, please merge or "
392 "rebase manually.\n"
393 "cd %s && git " % self.checkout_path
394 + "rebase %s" % upstream_branch)
395 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000396 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000397 return
398 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000399 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000400 elif re.match("error: Your local changes to '.*' would be "
401 "overwritten by merge. Aborting.\nPlease, commit your "
402 "changes or stash them before you can merge.\n",
403 e.stderr):
404 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000405 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000406 printed_path = True
407 raise gclient_utils.Error(e.stderr)
408 else:
409 # Some other problem happened with the merge
410 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000411 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000412 raise
413 else:
414 # Fast-forward merge was successful
415 if not re.match('Already up-to-date.', merge_output) or verbose:
416 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000417 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000418 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000419 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000420 if not verbose:
421 # Make the output a little prettier. It's nice to have some
422 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000423 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000424
425 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000426
427 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000428 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000429 raise gclient_utils.Error('\n____ %s%s\n'
430 '\nConflict while rebasing this branch.\n'
431 'Fix the conflict and run gclient again.\n'
432 'See man git-rebase for details.\n'
433 % (self.relpath, rev_str))
434
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000435 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000436 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000437
438 def revert(self, options, args, file_list):
439 """Reverts local modifications.
440
441 All reverted files will be appended to file_list.
442 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000443 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000444 # revert won't work if the directory doesn't exist. It needs to
445 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000446 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000447 # Don't reuse the args.
448 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000449
450 default_rev = "refs/heads/master"
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000451 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000452 if not deps_revision:
453 deps_revision = default_rev
454 if deps_revision.startswith('refs/heads/'):
455 deps_revision = deps_revision.replace('refs/heads/', 'origin/')
456
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000457 files = self._Capture(['diff', deps_revision, '--name-only']).split()
maruel@chromium.org37e89872010-09-07 16:11:33 +0000458 self._Run(['reset', '--hard', deps_revision], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000459 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
460
msb@chromium.org0f282062009-11-06 20:14:02 +0000461 def revinfo(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000462 """Returns revision"""
463 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000464
msb@chromium.orge28e4982009-09-25 20:51:45 +0000465 def runhooks(self, options, args, file_list):
466 self.status(options, args, file_list)
467
468 def status(self, options, args, file_list):
469 """Display status information."""
470 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000471 print(('\n________ couldn\'t run status in %s:\n'
472 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000473 else:
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000474 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000475 self._Run(['diff', '--name-status', merge_base], options)
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000476 files = self._Capture(['diff', '--name-only', merge_base]).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000477 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
478
msb@chromium.orge6f78352010-01-13 17:05:33 +0000479 def FullUrlForRelativeUrl(self, url):
480 # Strip from last '/'
481 # Equivalent to unix basename
482 base_url = self.url
483 return base_url[:base_url.rfind('/')] + url
484
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000485 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000486 """Clone a git repository from the given URL.
487
msb@chromium.org786fb682010-06-02 15:16:23 +0000488 Once we've cloned the repo, we checkout a working branch if the specified
489 revision is a branch head. If it is a tag or a specific commit, then we
490 leave HEAD detached as it makes future updates simpler -- in this case the
491 user should first create a new branch or switch to an existing branch before
492 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000493 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000494 # git clone doesn't seem to insert a newline properly before printing
495 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000496 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000497
szager@google.com85d3e3a2011-10-07 17:12:00 +0000498 clone_cmd = ['clone', '--progress']
msb@chromium.org786fb682010-06-02 15:16:23 +0000499 if revision.startswith('refs/heads/'):
500 clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
501 detach_head = False
502 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000503 detach_head = True
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000504 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000505 clone_cmd.append('--verbose')
506 clone_cmd.extend([url, self.checkout_path])
507
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000508 # If the parent directory does not exist, Git clone on Windows will not
509 # create it, so we need to do it manually.
510 parent_dir = os.path.dirname(self.checkout_path)
511 if not os.path.exists(parent_dir):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000512 gclient_utils.safe_makedirs(parent_dir)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000513
szager@google.com85d3e3a2011-10-07 17:12:00 +0000514 percent_re = re.compile('.* ([0-9]{1,2})% .*')
515 def _GitFilter(line):
516 # git uses an escape sequence to clear the line; elide it.
517 esc = line.find(unichr(033))
518 if esc > -1:
519 line = line[:esc]
520 match = percent_re.match(line)
521 if not match or not int(match.group(1)) % 10:
522 print '%s' % line
523
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000524 for _ in range(3):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000525 try:
szager@google.com85d3e3a2011-10-07 17:12:00 +0000526 self._Run(clone_cmd, options, cwd=self._root_dir, filter_fn=_GitFilter,
527 print_stdout=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000528 break
maruel@chromium.org2a5b6a22011-09-09 14:03:12 +0000529 except subprocess2.CalledProcessError, e:
530 # Too bad we don't have access to the actual output yet.
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000531 # We should check for "transfer closed with NNN bytes remaining to
532 # read". In the meantime, just make sure .git exists.
maruel@chromium.org2a5b6a22011-09-09 14:03:12 +0000533 if (e.returncode == 128 and
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000534 os.path.exists(os.path.join(self.checkout_path, '.git'))):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000535 print(str(e))
536 print('Retrying...')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000537 continue
538 raise e
539
msb@chromium.org786fb682010-06-02 15:16:23 +0000540 if detach_head:
541 # Squelch git's very verbose detached HEAD warning and use our own
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000542 self._Capture(['checkout', '--quiet', '%s' % revision])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000543 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000544 ('Checked out %s to a detached HEAD. Before making any commits\n'
545 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
546 'an existing branch or use \'git checkout origin -b <branch>\' to\n'
547 'create a new branch for your work.') % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000548
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000549 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000550 branch=None, printed_path=False):
551 """Attempt to rebase onto either upstream or, if specified, newbase."""
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000552 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000553 revision = upstream
554 if newbase:
555 revision = newbase
556 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000557 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000558 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000559 printed_path = True
560 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000561 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000562
563 # Build the rebase command here using the args
564 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
565 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000566 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000567 rebase_cmd.append('--verbose')
568 if newbase:
569 rebase_cmd.extend(['--onto', newbase])
570 rebase_cmd.append(upstream)
571 if branch:
572 rebase_cmd.append(branch)
573
574 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000575 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000576 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000577 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
578 re.match(r'cannot rebase: your index contains uncommitted changes',
579 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000580 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000581 rebase_action = ask_for_data(
582 'Cannot rebase because of unstaged changes.\n'
583 '\'git reset --hard HEAD\' ?\n'
584 'WARNING: destroys any uncommitted work in your current branch!'
585 ' (y)es / (q)uit / (s)how : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000586 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000587 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000588 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000589 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000590 break
591 elif re.match(r'quit|q', rebase_action, re.I):
592 raise gclient_utils.Error("Please merge or rebase manually\n"
593 "cd %s && git " % self.checkout_path
594 + "%s" % ' '.join(rebase_cmd))
595 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000596 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000597 continue
598 else:
599 gclient_utils.Error("Input not recognized")
600 continue
601 elif re.search(r'^CONFLICT', e.stdout, re.M):
602 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
603 "Fix the conflict and run gclient again.\n"
604 "See 'man git-rebase' for details.\n")
605 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000606 print(e.stdout.strip())
607 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000608 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
609 "manually.\ncd %s && git " %
610 self.checkout_path
611 + "%s" % ' '.join(rebase_cmd))
612
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000613 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000614 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000615 # Make the output a little prettier. It's nice to have some
616 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000617 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000618
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000619 @staticmethod
620 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000621 (ok, current_version) = scm.GIT.AssertVersion(min_version)
622 if not ok:
623 raise gclient_utils.Error('git version %s < minimum required %s' %
624 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000625
msb@chromium.org786fb682010-06-02 15:16:23 +0000626 def _IsRebasing(self):
627 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
628 # have a plumbing command to determine whether a rebase is in progress, so
629 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
630 g = os.path.join(self.checkout_path, '.git')
631 return (
632 os.path.isdir(os.path.join(g, "rebase-merge")) or
633 os.path.isdir(os.path.join(g, "rebase-apply")))
634
635 def _CheckClean(self, rev_str):
636 # Make sure the tree is clean; see git-rebase.sh for reference
637 try:
638 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000639 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000640 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000641 raise gclient_utils.Error('\n____ %s%s\n'
642 '\tYou have unstaged changes.\n'
643 '\tPlease commit, stash, or reset.\n'
644 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000645 try:
646 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000647 '--ignore-submodules', 'HEAD', '--'],
648 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000649 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000650 raise gclient_utils.Error('\n____ %s%s\n'
651 '\tYour index contains uncommitted changes\n'
652 '\tPlease commit, stash, or reset.\n'
653 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000654
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000655 def _CheckDetachedHead(self, rev_str, options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000656 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
657 # reference by a commit). If not, error out -- most likely a rebase is
658 # in progress, try to detect so we can give a better error.
659 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000660 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
661 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000662 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000663 # Commit is not contained by any rev. See if the user is rebasing:
664 if self._IsRebasing():
665 # Punt to the user
666 raise gclient_utils.Error('\n____ %s%s\n'
667 '\tAlready in a conflict, i.e. (no branch).\n'
668 '\tFix the conflict and run gclient again.\n'
669 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
670 '\tSee man git-rebase for details.\n'
671 % (self.relpath, rev_str))
672 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000673 name = ('saved-by-gclient-' +
674 self._Capture(['rev-parse', '--short', 'HEAD']))
675 self._Capture(['branch', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000676 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000677 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000678
msb@chromium.org5bde4852009-12-14 16:47:12 +0000679 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000680 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000681 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000682 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000683 return None
684 return branch
685
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000686 def _Capture(self, args):
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000687 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +0000688 ['git'] + args,
689 stderr=subprocess2.PIPE,
690 cwd=self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000691
maruel@chromium.org37e89872010-09-07 16:11:33 +0000692 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000693 kwargs.setdefault('cwd', self.checkout_path)
szager@google.com85d3e3a2011-10-07 17:12:00 +0000694 kwargs.setdefault('print_stdout', True)
695 stdout = kwargs.get('stdout', sys.stdout)
696 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
697 ' '.join(args), kwargs['cwd']))
698 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000699
700
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000701class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000702 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000703
floitsch@google.comeaab7842011-04-28 09:07:58 +0000704 def GetRevisionDate(self, revision):
705 """Returns the given revision's date in ISO-8601 format (which contains the
706 time zone)."""
707 date = scm.SVN.Capture(['propget', '--revprop', 'svn:date', '-r', revision,
708 os.path.join(self.checkout_path, '.')])
709 return date.strip()
710
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000711 def cleanup(self, options, args, file_list):
712 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000713 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000714
715 def diff(self, options, args, file_list):
716 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000717 if not os.path.isdir(self.checkout_path):
718 raise gclient_utils.Error('Directory %s is not present.' %
719 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000720 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000721
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000722 def pack(self, options, args, file_list):
723 """Generates a patch file which can be applied to the root of the
724 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000725 if not os.path.isdir(self.checkout_path):
726 raise gclient_utils.Error('Directory %s is not present.' %
727 self.checkout_path)
728 gclient_utils.CheckCallAndFilter(
729 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
730 cwd=self.checkout_path,
731 print_stdout=False,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000732 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000733
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000734 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000735 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000736
737 All updated files will be appended to file_list.
738
739 Raises:
740 Error: if can't get URL for relative path.
741 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000742 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000743 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000744 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000745 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000746 return
747
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000748 hg_path = os.path.join(self.checkout_path, '.hg')
749 if os.path.exists(hg_path):
750 print('________ found .hg directory; skipping %s' % self.relpath)
751 return
752
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000753 if args:
754 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
755
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000756 # revision is the revision to match. It is None if no revision is specified,
757 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000758 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000759 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000760 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000761 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000762 if options.revision:
763 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000764 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000765 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000766 if revision != 'unmanaged':
767 forced_revision = True
768 # Reconstruct the url.
769 url = '%s@%s' % (url, revision)
770 rev_str = ' at %s' % revision
771 else:
772 managed = False
773 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000774 else:
775 forced_revision = False
776 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000777
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000778 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000779 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000780 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000781 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000782 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000783 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000784 return
785
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000786 if not managed:
787 print ('________ unmanaged solution; skipping %s' % self.relpath)
788 return
789
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000790 # Get the existing scm url and the revision number of the current checkout.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000791 try:
792 from_info = scm.SVN.CaptureInfo(os.path.join(self.checkout_path, '.'))
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000793 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000794 raise gclient_utils.Error(
795 ('Can\'t update/checkout %s if an unversioned directory is present. '
796 'Delete the directory and try again.') % self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000797
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +0000798 if 'URL' not in from_info:
799 raise gclient_utils.Error(
800 ('gclient is confused. Couldn\'t get the url for %s.\n'
801 'Try using @unmanaged.\n%s') % (
802 self.checkout_path, from_info))
803
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000804 # Look for locked directories.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000805 dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +0000806 if any(d[0][2] == 'L' for d in dir_info):
807 try:
808 self._Run(['cleanup', self.checkout_path], options)
809 except subprocess2.CalledProcessError, e:
810 # Get the status again, svn cleanup may have cleaned up at least
811 # something.
812 dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
813
814 # Try to fix the failures by removing troublesome files.
815 for d in dir_info:
816 if d[0][2] == 'L':
817 if d[0][0] == '!' and options.force:
818 print 'Removing troublesome path %s' % d[1]
819 gclient_utils.rmtree(d[1])
820 else:
821 print 'Not removing troublesome path %s automatically.' % d[1]
822 if d[0][0] == '!':
823 print 'You can pass --force to enable automatic removal.'
824 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000825
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000826 # Retrieve the current HEAD version because svn is slow at null updates.
827 if options.manually_grab_svn_rev and not revision:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000828 from_info_live = scm.SVN.CaptureInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000829 revision = str(from_info_live['Revision'])
830 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000831
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000832 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000833 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000834 try:
835 to_info = scm.SVN.CaptureInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000836 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +0000837 # The url is invalid or the server is not accessible, it's safer to bail
838 # out right now.
839 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000840 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
841 and (from_info['UUID'] == to_info['UUID']))
842 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000843 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000844 # We have different roots, so check if we can switch --relocate.
845 # Subversion only permits this if the repository UUIDs match.
846 # Perform the switch --relocate, then rewrite the from_url
847 # to reflect where we "are now." (This is the same way that
848 # Subversion itself handles the metadata when switch --relocate
849 # is used.) This makes the checks below for whether we
850 # can update to a revision or have to switch to a different
851 # branch work as expected.
852 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000853 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000854 from_info['Repository Root'],
855 to_info['Repository Root'],
856 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000857 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000858 from_info['URL'] = from_info['URL'].replace(
859 from_info['Repository Root'],
860 to_info['Repository Root'])
861 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +0000862 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000863 # Look for local modifications but ignore unversioned files.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000864 for status in scm.SVN.CaptureStatus(self.checkout_path):
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000865 if status[0] != '?':
866 raise gclient_utils.Error(
867 ('Can\'t switch the checkout to %s; UUID don\'t match and '
868 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000869 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000870 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000871 print('\n_____ switching %s to a new checkout' % self.relpath)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000872 gclient_utils.RemoveDirectory(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000873 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000874 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000875 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000876 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000877 return
878
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000879 # If the provided url has a revision number that matches the revision
880 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +0000881 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000882 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000883 print('\n_____ %s%s' % (self.relpath, rev_str))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000884 return
885
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000886 command = ['update', self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000887 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000888 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000889
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000890 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000891 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +0000892 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000893 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +0000894 # Create an empty checkout and then update the one file we want. Future
895 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000896 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000897 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000898 if os.path.exists(os.path.join(self.checkout_path, filename)):
899 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +0000900 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000901 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +0000902 # After the initial checkout, we can use update as if it were any other
903 # dep.
904 self.update(options, args, file_list)
905 else:
906 # If the installed version of SVN doesn't support --depth, fallback to
907 # just exporting the file. This has the downside that revision
908 # information is not stored next to the file, so we will have to
909 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000910 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000911 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +0000912 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000913 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000914 command = self._AddAdditionalUpdateFlags(command, options,
915 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000916 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000917
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000918 def revert(self, options, args, file_list):
919 """Reverts local modifications. Subversion specific.
920
921 All reverted files will be appended to file_list, even if Subversion
922 doesn't know about them.
923 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000924 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +0000925 if os.path.exists(self.checkout_path):
926 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000927 # svn revert won't work if the directory doesn't exist. It needs to
928 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000929 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000930 # Don't reuse the args.
931 return self.update(options, [], file_list)
932
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +0000933 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
934 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
935 print('________ found .git directory; skipping %s' % self.relpath)
936 return
937 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
938 print('________ found .hg directory; skipping %s' % self.relpath)
939 return
940 if not options.force:
941 raise gclient_utils.Error('Invalid checkout path, aborting')
942 print(
943 '\n_____ %s is not a valid svn checkout, synching instead' %
944 self.relpath)
945 gclient_utils.rmtree(self.checkout_path)
946 # Don't reuse the args.
947 return self.update(options, [], file_list)
948
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000949 def printcb(file_status):
950 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000951 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000952 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000953 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000954 print(os.path.join(self.checkout_path, file_status[1]))
955 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000956
maruel@chromium.org8b322b32011-11-01 19:05:50 +0000957 # Revert() may delete the directory altogether.
958 if not os.path.isdir(self.checkout_path):
959 # Don't reuse the args.
960 return self.update(options, [], file_list)
961
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000962 try:
963 # svn revert is so broken we don't even use it. Using
964 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000965 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +0000966 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
967 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000968 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000969 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000970 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000971
msb@chromium.org0f282062009-11-06 20:14:02 +0000972 def revinfo(self, options, args, file_list):
973 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000974 try:
975 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000976 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000977 return None
msb@chromium.org0f282062009-11-06 20:14:02 +0000978
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000979 def runhooks(self, options, args, file_list):
980 self.status(options, args, file_list)
981
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000982 def status(self, options, args, file_list):
983 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000984 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000985 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000986 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000987 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
988 'The directory does not exist.') %
989 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000990 # There's no file list to retrieve.
991 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +0000992 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +0000993
994 def FullUrlForRelativeUrl(self, url):
995 # Find the forth '/' and strip from there. A bit hackish.
996 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +0000997
maruel@chromium.org669600d2010-09-01 19:06:31 +0000998 def _Run(self, args, options, **kwargs):
999 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001000 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001001 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001002 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001003
1004 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1005 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001006 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001007 scm.SVN.RunAndGetFileList(
1008 options.verbose,
1009 args + ['--ignore-externals'],
1010 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001011 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001012
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001013 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001014 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001015 """Add additional flags to command depending on what options are set.
1016 command should be a list of strings that represents an svn command.
1017
1018 This method returns a new list to be used as a command."""
1019 new_command = command[:]
1020 if revision:
1021 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001022 # We don't want interaction when jobs are used.
1023 if options.jobs > 1:
1024 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001025 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001026 # --accept was added to 'svn update' in svn 1.6.
1027 if not scm.SVN.AssertVersion('1.5')[0]:
1028 return new_command
1029
1030 # It's annoying to have it block in the middle of a sync, just sensible
1031 # defaults.
1032 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001033 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001034 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1035 new_command.extend(('--accept', 'theirs-conflict'))
1036 elif options.manually_grab_svn_rev:
1037 new_command.append('--force')
1038 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1039 new_command.extend(('--accept', 'postpone'))
1040 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1041 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001042 return new_command