blob: 0b21dce99a5717e3ebdd3ce2474a220a9215564f [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
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000070 url.startswith('git+http://') or url.startswith('git+https://') or
maruel@chromium.org9eda4112010-06-11 18:56:10 +000071 url.endswith('.git')):
72 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000073 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000074 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000075 return 'svn'
76 return None
77
78
79def CreateSCM(url, root_dir=None, relpath=None):
80 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000081 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +000082 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000083 }
msb@chromium.orge28e4982009-09-25 20:51:45 +000084
maruel@chromium.org9eda4112010-06-11 18:56:10 +000085 scm_name = GetScmName(url)
86 if not scm_name in SCM_MAP:
87 raise gclient_utils.Error('No SCM found for url %s' % url)
88 return SCM_MAP[scm_name](url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000089
90
91# SCMWrapper base class
92
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000093class SCMWrapper(object):
94 """Add necessary glue between all the supported SCM.
95
msb@chromium.orgd6504212010-01-13 17:34:31 +000096 This is the abstraction layer to bind to different SCM.
97 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +000098 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000099 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000100 self._root_dir = root_dir
101 if self._root_dir:
102 self._root_dir = self._root_dir.replace('/', os.sep)
103 self.relpath = relpath
104 if self.relpath:
105 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000106 if self.relpath and self._root_dir:
107 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000108
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000109 def RunCommand(self, command, options, args, file_list=None):
110 # file_list will have all files that are modified appended to it.
maruel@chromium.orgde754ac2009-09-17 18:04:50 +0000111 if file_list is None:
112 file_list = []
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000113
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000114 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000115 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000116
117 if not command in commands:
118 raise gclient_utils.Error('Unknown command %s' % command)
119
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000120 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000121 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000122 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000123
124 return getattr(self, command)(options, args, file_list)
125
126
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000127class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000128 """Wrapper for Git"""
129
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000130 def __init__(self, url=None, root_dir=None, relpath=None):
131 """Removes 'git+' fake prefix from git URL."""
132 if url.startswith('git+http://') or url.startswith('git+https://'):
133 url = url[4:]
134 SCMWrapper.__init__(self, url, root_dir, relpath)
135
floitsch@google.comeaab7842011-04-28 09:07:58 +0000136 def GetRevisionDate(self, revision):
137 """Returns the given revision's date in ISO-8601 format (which contains the
138 time zone)."""
139 # TODO(floitsch): get the time-stamp of the given revision and not just the
140 # time-stamp of the currently checked out revision.
141 return self._Capture(['log', '-n', '1', '--format=%ai'])
142
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000143 @staticmethod
144 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000145 """'Cleanup' the repo.
146
147 There's no real git equivalent for the svn cleanup command, do a no-op.
148 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000149
150 def diff(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000151 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000152 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000153
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000154 def pack(self, options, args, file_list):
155 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000156 repository.
157
158 The patch file is generated from a diff of the merge base of HEAD and
159 its upstream branch.
160 """
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000161 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000162 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000163 ['git', 'diff', merge_base],
164 cwd=self.checkout_path,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000165 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000166
msb@chromium.orge28e4982009-09-25 20:51:45 +0000167 def update(self, options, args, file_list):
168 """Runs git to update or transparently checkout the working copy.
169
170 All updated files will be appended to file_list.
171
172 Raises:
173 Error: if can't get URL for relative path.
174 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000175 if args:
176 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
177
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000178 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000179
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000180 default_rev = "refs/heads/master"
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000181 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000182 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000183 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000184 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000185 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000186 # Override the revision number.
187 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000188 if revision == 'unmanaged':
189 revision = None
190 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000191 if not revision:
192 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000193
floitsch@google.comeaab7842011-04-28 09:07:58 +0000194 if gclient_utils.IsDateRevision(revision):
195 # Date-revisions only work on git-repositories if the reflog hasn't
196 # expired yet. Use rev-list to get the corresponding revision.
197 # git rev-list -n 1 --before='time-stamp' branchname
198 if options.transitive:
199 print('Warning: --transitive only works for SVN repositories.')
200 revision = default_rev
201
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000202 rev_str = ' at %s' % revision
203 files = []
204
205 printed_path = False
206 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000207 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000208 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000209 verbose = ['--verbose']
210 printed_path = True
211
212 if revision.startswith('refs/heads/'):
213 rev_type = "branch"
214 elif revision.startswith('origin/'):
215 # For compatability with old naming, translate 'origin' to 'refs/heads'
216 revision = revision.replace('origin/', 'refs/heads/')
217 rev_type = "branch"
218 else:
219 # hash is also a tag, only make a distinction at checkout
220 rev_type = "hash"
221
msb@chromium.orge28e4982009-09-25 20:51:45 +0000222 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000223 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000224 self._Clone(revision, url, options)
thomasvl@chromium.org858d6452011-03-24 17:59:20 +0000225 files = self._Capture(['ls-files']).splitlines()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000226 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000227 if not verbose:
228 # Make the output a little prettier. It's nice to have some whitespace
229 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000230 print('')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000231 return
232
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000233 if not managed:
234 print ('________ unmanaged solution; skipping %s' % self.relpath)
235 return
236
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000237 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
238 raise gclient_utils.Error('\n____ %s%s\n'
239 '\tPath is not a git repo. No .git dir.\n'
240 '\tTo resolve:\n'
241 '\t\trm -rf %s\n'
242 '\tAnd run gclient sync again\n'
243 % (self.relpath, rev_str, self.relpath))
244
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000245 # See if the url has changed (the unittests use git://foo for the url, let
246 # that through).
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000247 current_url = self._Capture(['config', 'remote.origin.url'])
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000248 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
249 # unit test pass. (and update the comment above)
250 if current_url != url and url != 'git://foo':
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000251 print('_____ switching %s to a new upstream' % self.relpath)
252 # Make sure it's clean
253 self._CheckClean(rev_str)
254 # Switch over to the new upstream
255 self._Run(['remote', 'set-url', 'origin', url], options)
256 quiet = []
257 if not options.verbose:
258 quiet = ['--quiet']
259 self._Run(['fetch', 'origin', '--prune'] + quiet, options)
260 self._Run(['reset', '--hard', 'origin/master'] + quiet, options)
261 files = self._Capture(['ls-files']).splitlines()
262 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
263 return
264
msb@chromium.org5bde4852009-12-14 16:47:12 +0000265 cur_branch = self._GetCurrentBranch()
266
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000267 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000268 # 0) HEAD is detached. Probably from our initial clone.
269 # - make sure HEAD is contained by a named ref, then update.
270 # Cases 1-4. HEAD is a branch.
271 # 1) current branch is not tracking a remote branch (could be git-svn)
272 # - try to rebase onto the new hash or branch
273 # 2) current branch is tracking a remote branch with local committed
274 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000275 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000276 # 3) current branch is tracking a remote branch w/or w/out changes,
277 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000278 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000279 # 4) current branch is tracking a remote branch, switches to a different
280 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000281 # - exit
282
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000283 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
284 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000285 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
286 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000287 if cur_branch is None:
288 upstream_branch = None
289 current_type = "detached"
290 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000291 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000292 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
293 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
294 current_type = "hash"
295 logging.debug("Current branch is not tracking an upstream (remote)"
296 " branch.")
297 elif upstream_branch.startswith('refs/remotes'):
298 current_type = "branch"
299 else:
300 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000301
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000302 # Update the remotes first so we have all the refs.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000303 backoff_time = 5
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000304 for _ in range(10):
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000305 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000306 remote_output = scm.GIT.Capture(
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000307 ['remote'] + verbose + ['update'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000308 cwd=self.checkout_path)
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000309 break
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000310 except subprocess2.CalledProcessError, e:
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000311 # Hackish but at that point, git is known to work so just checking for
312 # 502 in stderr should be fine.
313 if '502' in e.stderr:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000314 print(str(e))
315 print('Sleeping %.1f seconds and retrying...' % backoff_time)
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000316 time.sleep(backoff_time)
317 backoff_time *= 1.3
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000318 continue
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000319 raise
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000320
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000321 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000322 print(remote_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000323
324 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000325 if options.force or options.reset:
maruel@chromium.org37e89872010-09-07 16:11:33 +0000326 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000327
msb@chromium.org786fb682010-06-02 15:16:23 +0000328 if current_type == 'detached':
329 # case 0
330 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000331 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000332 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000333 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000334 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000335 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000336 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000337 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000338 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000339 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000340 newbase=revision, printed_path=printed_path)
341 printed_path = True
342 else:
343 # Can't find a merge-base since we don't know our upstream. That makes
344 # this command VERY likely to produce a rebase failure. For now we
345 # assume origin is our upstream since that's what the old behavior was.
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000346 upstream_branch = 'origin'
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000347 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000348 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000349 self._AttemptRebase(upstream_branch, files, options,
350 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000351 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000352 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000353 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000354 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000355 newbase=revision, printed_path=printed_path)
356 printed_path = True
357 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
358 # case 4
359 new_base = revision.replace('heads', 'remotes/origin')
360 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000361 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000362 switch_error = ("Switching upstream branch from %s to %s\n"
363 % (upstream_branch, new_base) +
364 "Please merge or rebase manually:\n" +
365 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
366 "OR git checkout -b <some new branch> %s" % new_base)
367 raise gclient_utils.Error(switch_error)
368 else:
369 # case 3 - the default case
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000370 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000371 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000372 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000373 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000374 merge_args = ['merge']
375 if not options.merge:
376 merge_args.append('--ff-only')
377 merge_args.append(upstream_branch)
378 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000379 except subprocess2.CalledProcessError, e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000380 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
381 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000382 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000383 printed_path = True
384 while True:
385 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000386 # TODO(maruel): That can't work with --jobs.
maruel@chromium.org90541732011-04-01 17:54:18 +0000387 action = ask_for_data(
388 'Cannot fast-forward merge, attempt to rebase? '
389 '(y)es / (q)uit / (s)kip : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000390 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000391 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000392 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000393 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000394 printed_path=printed_path)
395 printed_path = True
396 break
397 elif re.match(r'quit|q', action, re.I):
398 raise gclient_utils.Error("Can't fast-forward, please merge or "
399 "rebase manually.\n"
400 "cd %s && git " % self.checkout_path
401 + "rebase %s" % upstream_branch)
402 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000403 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000404 return
405 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000406 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000407 elif re.match("error: Your local changes to '.*' would be "
408 "overwritten by merge. Aborting.\nPlease, commit your "
409 "changes or stash them before you can merge.\n",
410 e.stderr):
411 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000412 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000413 printed_path = True
414 raise gclient_utils.Error(e.stderr)
415 else:
416 # Some other problem happened with the merge
417 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000418 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000419 raise
420 else:
421 # Fast-forward merge was successful
422 if not re.match('Already up-to-date.', merge_output) or verbose:
423 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000424 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000425 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000426 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000427 if not verbose:
428 # Make the output a little prettier. It's nice to have some
429 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000430 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000431
432 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000433
434 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000435 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000436 raise gclient_utils.Error('\n____ %s%s\n'
437 '\nConflict while rebasing this branch.\n'
438 'Fix the conflict and run gclient again.\n'
439 'See man git-rebase for details.\n'
440 % (self.relpath, rev_str))
441
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000442 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000443 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000444
445 def revert(self, options, args, file_list):
446 """Reverts local modifications.
447
448 All reverted files will be appended to file_list.
449 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000450 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000451 # revert won't work if the directory doesn't exist. It needs to
452 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000453 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000454 # Don't reuse the args.
455 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000456
457 default_rev = "refs/heads/master"
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000458 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000459 if not deps_revision:
460 deps_revision = default_rev
461 if deps_revision.startswith('refs/heads/'):
462 deps_revision = deps_revision.replace('refs/heads/', 'origin/')
463
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000464 files = self._Capture(['diff', deps_revision, '--name-only']).split()
maruel@chromium.org37e89872010-09-07 16:11:33 +0000465 self._Run(['reset', '--hard', deps_revision], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000466 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
467
msb@chromium.org0f282062009-11-06 20:14:02 +0000468 def revinfo(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000469 """Returns revision"""
470 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000471
msb@chromium.orge28e4982009-09-25 20:51:45 +0000472 def runhooks(self, options, args, file_list):
473 self.status(options, args, file_list)
474
475 def status(self, options, args, file_list):
476 """Display status information."""
477 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000478 print(('\n________ couldn\'t run status in %s:\n'
479 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000480 else:
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000481 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000482 self._Run(['diff', '--name-status', merge_base], options)
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000483 files = self._Capture(['diff', '--name-only', merge_base]).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000484 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
485
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000486 def GetUsableRev(self, rev, options):
487 """Finds a useful revision for this repository.
488
489 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
490 will be called on the source."""
491 sha1 = None
492 # As an optimization, only verify an SVN revision as [0-9]{1,6} for now to
493 # avoid making a network request.
494 if (scm.GIT.IsGitSvn(cwd=self.checkout_path) and
495 rev.isdigit() and len(rev) < 7):
496 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
497 if not local_head or local_head < int(rev):
498 if options.verbose:
499 print('Running git svn fetch. This might take a while.\n')
500 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
501 sha1 = scm.GIT.GetSha1ForSvnRev(cwd=self.checkout_path, rev=rev)
502 elif scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
503 sha1 = rev
504 if not sha1:
505 raise gclient_utils.Error(
506 ( '%s is not a value hash. Safesync URLs with a git checkout\n'
507 'currently require a git-svn remote or a safesync_url that\n'
508 'provides git sha1s. Please add a git-svn remote or change\n'
509 'your safesync_url. For more info, see:\n'
510 'http://code.google.com/p/chromium/wiki/UsingNewGit'
511 '#Initial_checkout') % rev)
512 return sha1
513
msb@chromium.orge6f78352010-01-13 17:05:33 +0000514 def FullUrlForRelativeUrl(self, url):
515 # Strip from last '/'
516 # Equivalent to unix basename
517 base_url = self.url
518 return base_url[:base_url.rfind('/')] + url
519
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000520 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 """Clone a git repository from the given URL.
522
msb@chromium.org786fb682010-06-02 15:16:23 +0000523 Once we've cloned the repo, we checkout a working branch if the specified
524 revision is a branch head. If it is a tag or a specific commit, then we
525 leave HEAD detached as it makes future updates simpler -- in this case the
526 user should first create a new branch or switch to an existing branch before
527 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000528 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000529 # git clone doesn't seem to insert a newline properly before printing
530 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000531 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000532
szager@google.com85d3e3a2011-10-07 17:12:00 +0000533 clone_cmd = ['clone', '--progress']
msb@chromium.org786fb682010-06-02 15:16:23 +0000534 if revision.startswith('refs/heads/'):
535 clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
536 detach_head = False
537 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000538 detach_head = True
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000539 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000540 clone_cmd.append('--verbose')
541 clone_cmd.extend([url, self.checkout_path])
542
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000543 # If the parent directory does not exist, Git clone on Windows will not
544 # create it, so we need to do it manually.
545 parent_dir = os.path.dirname(self.checkout_path)
546 if not os.path.exists(parent_dir):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000547 gclient_utils.safe_makedirs(parent_dir)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000548
szager@google.com85d3e3a2011-10-07 17:12:00 +0000549 percent_re = re.compile('.* ([0-9]{1,2})% .*')
550 def _GitFilter(line):
551 # git uses an escape sequence to clear the line; elide it.
552 esc = line.find(unichr(033))
553 if esc > -1:
554 line = line[:esc]
555 match = percent_re.match(line)
556 if not match or not int(match.group(1)) % 10:
557 print '%s' % line
558
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000559 for _ in range(3):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000560 try:
szager@google.com85d3e3a2011-10-07 17:12:00 +0000561 self._Run(clone_cmd, options, cwd=self._root_dir, filter_fn=_GitFilter,
562 print_stdout=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000563 break
maruel@chromium.org2a5b6a22011-09-09 14:03:12 +0000564 except subprocess2.CalledProcessError, e:
565 # Too bad we don't have access to the actual output yet.
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000566 # We should check for "transfer closed with NNN bytes remaining to
567 # read". In the meantime, just make sure .git exists.
maruel@chromium.org2a5b6a22011-09-09 14:03:12 +0000568 if (e.returncode == 128 and
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000569 os.path.exists(os.path.join(self.checkout_path, '.git'))):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000570 print(str(e))
571 print('Retrying...')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000572 continue
573 raise e
574
msb@chromium.org786fb682010-06-02 15:16:23 +0000575 if detach_head:
576 # Squelch git's very verbose detached HEAD warning and use our own
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000577 self._Capture(['checkout', '--quiet', '%s' % revision])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000578 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000579 ('Checked out %s to a detached HEAD. Before making any commits\n'
580 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
581 'an existing branch or use \'git checkout origin -b <branch>\' to\n'
582 'create a new branch for your work.') % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000583
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000584 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000585 branch=None, printed_path=False):
586 """Attempt to rebase onto either upstream or, if specified, newbase."""
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000587 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000588 revision = upstream
589 if newbase:
590 revision = newbase
591 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000592 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000593 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000594 printed_path = True
595 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000596 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000597
598 # Build the rebase command here using the args
599 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
600 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000601 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000602 rebase_cmd.append('--verbose')
603 if newbase:
604 rebase_cmd.extend(['--onto', newbase])
605 rebase_cmd.append(upstream)
606 if branch:
607 rebase_cmd.append(branch)
608
609 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000610 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000611 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000612 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
613 re.match(r'cannot rebase: your index contains uncommitted changes',
614 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000615 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000616 rebase_action = ask_for_data(
617 'Cannot rebase because of unstaged changes.\n'
618 '\'git reset --hard HEAD\' ?\n'
619 'WARNING: destroys any uncommitted work in your current branch!'
620 ' (y)es / (q)uit / (s)how : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000621 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000622 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000623 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000624 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000625 break
626 elif re.match(r'quit|q', rebase_action, re.I):
627 raise gclient_utils.Error("Please merge or rebase manually\n"
628 "cd %s && git " % self.checkout_path
629 + "%s" % ' '.join(rebase_cmd))
630 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000631 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000632 continue
633 else:
634 gclient_utils.Error("Input not recognized")
635 continue
636 elif re.search(r'^CONFLICT', e.stdout, re.M):
637 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
638 "Fix the conflict and run gclient again.\n"
639 "See 'man git-rebase' for details.\n")
640 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000641 print(e.stdout.strip())
642 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000643 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
644 "manually.\ncd %s && git " %
645 self.checkout_path
646 + "%s" % ' '.join(rebase_cmd))
647
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000648 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000649 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000650 # Make the output a little prettier. It's nice to have some
651 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000652 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000653
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000654 @staticmethod
655 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000656 (ok, current_version) = scm.GIT.AssertVersion(min_version)
657 if not ok:
658 raise gclient_utils.Error('git version %s < minimum required %s' %
659 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000660
msb@chromium.org786fb682010-06-02 15:16:23 +0000661 def _IsRebasing(self):
662 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
663 # have a plumbing command to determine whether a rebase is in progress, so
664 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
665 g = os.path.join(self.checkout_path, '.git')
666 return (
667 os.path.isdir(os.path.join(g, "rebase-merge")) or
668 os.path.isdir(os.path.join(g, "rebase-apply")))
669
670 def _CheckClean(self, rev_str):
671 # Make sure the tree is clean; see git-rebase.sh for reference
672 try:
673 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000674 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000675 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000676 raise gclient_utils.Error('\n____ %s%s\n'
677 '\tYou have unstaged changes.\n'
678 '\tPlease commit, stash, or reset.\n'
679 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000680 try:
681 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000682 '--ignore-submodules', 'HEAD', '--'],
683 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000684 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000685 raise gclient_utils.Error('\n____ %s%s\n'
686 '\tYour index contains uncommitted changes\n'
687 '\tPlease commit, stash, or reset.\n'
688 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000689
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000690 def _CheckDetachedHead(self, rev_str, options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000691 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
692 # reference by a commit). If not, error out -- most likely a rebase is
693 # in progress, try to detect so we can give a better error.
694 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000695 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
696 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000697 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000698 # Commit is not contained by any rev. See if the user is rebasing:
699 if self._IsRebasing():
700 # Punt to the user
701 raise gclient_utils.Error('\n____ %s%s\n'
702 '\tAlready in a conflict, i.e. (no branch).\n'
703 '\tFix the conflict and run gclient again.\n'
704 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
705 '\tSee man git-rebase for details.\n'
706 % (self.relpath, rev_str))
707 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000708 name = ('saved-by-gclient-' +
709 self._Capture(['rev-parse', '--short', 'HEAD']))
710 self._Capture(['branch', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000711 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000712 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000713
msb@chromium.org5bde4852009-12-14 16:47:12 +0000714 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000715 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000716 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000717 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000718 return None
719 return branch
720
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000721 def _Capture(self, args):
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000722 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +0000723 ['git'] + args,
724 stderr=subprocess2.PIPE,
725 cwd=self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000726
maruel@chromium.org37e89872010-09-07 16:11:33 +0000727 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000728 kwargs.setdefault('cwd', self.checkout_path)
szager@google.com85d3e3a2011-10-07 17:12:00 +0000729 kwargs.setdefault('print_stdout', True)
730 stdout = kwargs.get('stdout', sys.stdout)
731 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
732 ' '.join(args), kwargs['cwd']))
733 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000734
735
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000736class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000737 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000738
floitsch@google.comeaab7842011-04-28 09:07:58 +0000739 def GetRevisionDate(self, revision):
740 """Returns the given revision's date in ISO-8601 format (which contains the
741 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000742 date = scm.SVN.Capture(
743 ['propget', '--revprop', 'svn:date', '-r', revision],
744 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +0000745 return date.strip()
746
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000747 def cleanup(self, options, args, file_list):
748 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000749 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000750
751 def diff(self, options, args, file_list):
752 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000753 if not os.path.isdir(self.checkout_path):
754 raise gclient_utils.Error('Directory %s is not present.' %
755 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000756 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000757
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000758 def pack(self, options, args, file_list):
759 """Generates a patch file which can be applied to the root of the
760 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000761 if not os.path.isdir(self.checkout_path):
762 raise gclient_utils.Error('Directory %s is not present.' %
763 self.checkout_path)
764 gclient_utils.CheckCallAndFilter(
765 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
766 cwd=self.checkout_path,
767 print_stdout=False,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000768 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000769
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000770 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000771 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000772
773 All updated files will be appended to file_list.
774
775 Raises:
776 Error: if can't get URL for relative path.
777 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000778 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000779 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000780 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000781 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000782 return
783
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000784 hg_path = os.path.join(self.checkout_path, '.hg')
785 if os.path.exists(hg_path):
786 print('________ found .hg directory; skipping %s' % self.relpath)
787 return
788
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000789 if args:
790 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
791
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000792 # revision is the revision to match. It is None if no revision is specified,
793 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000794 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000795 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000796 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000797 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000798 if options.revision:
799 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000800 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000801 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000802 if revision != 'unmanaged':
803 forced_revision = True
804 # Reconstruct the url.
805 url = '%s@%s' % (url, revision)
806 rev_str = ' at %s' % revision
807 else:
808 managed = False
809 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000810 else:
811 forced_revision = False
812 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000813
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000814 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000815 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000816 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000817 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000818 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000819 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000820 return
821
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000822 if not managed:
823 print ('________ unmanaged solution; skipping %s' % self.relpath)
824 return
825
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000826 # Get the existing scm url and the revision number of the current checkout.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000827 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000828 from_info = scm.SVN.CaptureLocalInfo(
829 [], os.path.join(self.checkout_path, '.'))
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000830 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000831 raise gclient_utils.Error(
832 ('Can\'t update/checkout %s if an unversioned directory is present. '
833 'Delete the directory and try again.') % self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000834
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +0000835 if 'URL' not in from_info:
836 raise gclient_utils.Error(
837 ('gclient is confused. Couldn\'t get the url for %s.\n'
838 'Try using @unmanaged.\n%s') % (
839 self.checkout_path, from_info))
840
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000841 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000842 dir_info = scm.SVN.CaptureStatus(
843 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +0000844 if any(d[0][2] == 'L' for d in dir_info):
845 try:
846 self._Run(['cleanup', self.checkout_path], options)
847 except subprocess2.CalledProcessError, e:
848 # Get the status again, svn cleanup may have cleaned up at least
849 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000850 dir_info = scm.SVN.CaptureStatus(
851 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +0000852
853 # Try to fix the failures by removing troublesome files.
854 for d in dir_info:
855 if d[0][2] == 'L':
856 if d[0][0] == '!' and options.force:
857 print 'Removing troublesome path %s' % d[1]
858 gclient_utils.rmtree(d[1])
859 else:
860 print 'Not removing troublesome path %s automatically.' % d[1]
861 if d[0][0] == '!':
862 print 'You can pass --force to enable automatic removal.'
863 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000864
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000865 # Retrieve the current HEAD version because svn is slow at null updates.
866 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000867 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000868 revision = str(from_info_live['Revision'])
869 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000870
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000871 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000872 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000873 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000874 to_info = scm.SVN.CaptureRemoteInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000875 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +0000876 # The url is invalid or the server is not accessible, it's safer to bail
877 # out right now.
878 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000879 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
880 and (from_info['UUID'] == to_info['UUID']))
881 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000882 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000883 # We have different roots, so check if we can switch --relocate.
884 # Subversion only permits this if the repository UUIDs match.
885 # Perform the switch --relocate, then rewrite the from_url
886 # to reflect where we "are now." (This is the same way that
887 # Subversion itself handles the metadata when switch --relocate
888 # is used.) This makes the checks below for whether we
889 # can update to a revision or have to switch to a different
890 # branch work as expected.
891 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000892 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000893 from_info['Repository Root'],
894 to_info['Repository Root'],
895 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000896 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000897 from_info['URL'] = from_info['URL'].replace(
898 from_info['Repository Root'],
899 to_info['Repository Root'])
900 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +0000901 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000902 # Look for local modifications but ignore unversioned files.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000903 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000904 if status[0] != '?':
905 raise gclient_utils.Error(
906 ('Can\'t switch the checkout to %s; UUID don\'t match and '
907 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000908 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000909 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000910 print('\n_____ switching %s to a new checkout' % self.relpath)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000911 gclient_utils.RemoveDirectory(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000912 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000913 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000914 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000915 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000916 return
917
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000918 # If the provided url has a revision number that matches the revision
919 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +0000920 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000921 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000922 print('\n_____ %s%s' % (self.relpath, rev_str))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000923 return
924
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000925 command = ['update', self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000926 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000927 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000928
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000929 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000930 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +0000931 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000932 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +0000933 # Create an empty checkout and then update the one file we want. Future
934 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000935 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000936 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000937 if os.path.exists(os.path.join(self.checkout_path, filename)):
938 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +0000939 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000940 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +0000941 # After the initial checkout, we can use update as if it were any other
942 # dep.
943 self.update(options, args, file_list)
944 else:
945 # If the installed version of SVN doesn't support --depth, fallback to
946 # just exporting the file. This has the downside that revision
947 # information is not stored next to the file, so we will have to
948 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000949 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +0000950 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +0000951 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000952 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000953 command = self._AddAdditionalUpdateFlags(command, options,
954 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000955 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000956
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000957 def revert(self, options, args, file_list):
958 """Reverts local modifications. Subversion specific.
959
960 All reverted files will be appended to file_list, even if Subversion
961 doesn't know about them.
962 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000963 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +0000964 if os.path.exists(self.checkout_path):
965 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000966 # svn revert won't work if the directory doesn't exist. It needs to
967 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000968 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000969 # Don't reuse the args.
970 return self.update(options, [], file_list)
971
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +0000972 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
973 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
974 print('________ found .git directory; skipping %s' % self.relpath)
975 return
976 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
977 print('________ found .hg directory; skipping %s' % self.relpath)
978 return
979 if not options.force:
980 raise gclient_utils.Error('Invalid checkout path, aborting')
981 print(
982 '\n_____ %s is not a valid svn checkout, synching instead' %
983 self.relpath)
984 gclient_utils.rmtree(self.checkout_path)
985 # Don't reuse the args.
986 return self.update(options, [], file_list)
987
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000988 def printcb(file_status):
989 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000990 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000991 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000992 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000993 print(os.path.join(self.checkout_path, file_status[1]))
994 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000995
maruel@chromium.org8b322b32011-11-01 19:05:50 +0000996 # Revert() may delete the directory altogether.
997 if not os.path.isdir(self.checkout_path):
998 # Don't reuse the args.
999 return self.update(options, [], file_list)
1000
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001001 try:
1002 # svn revert is so broken we don't even use it. Using
1003 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001004 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001005 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1006 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001007 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001008 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001009 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001010
msb@chromium.org0f282062009-11-06 20:14:02 +00001011 def revinfo(self, options, args, file_list):
1012 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001013 try:
1014 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001015 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001016 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001017
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001018 def runhooks(self, options, args, file_list):
1019 self.status(options, args, file_list)
1020
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001021 def status(self, options, args, file_list):
1022 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001023 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001024 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001025 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001026 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1027 'The directory does not exist.') %
1028 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001029 # There's no file list to retrieve.
1030 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001031 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001032
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001033 def GetUsableRev(self, rev, options):
1034 """Verifies the validity of the revision for this repository."""
1035 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1036 raise gclient_utils.Error(
1037 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1038 'correct.') % rev)
1039 return rev
1040
msb@chromium.orge6f78352010-01-13 17:05:33 +00001041 def FullUrlForRelativeUrl(self, url):
1042 # Find the forth '/' and strip from there. A bit hackish.
1043 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001044
maruel@chromium.org669600d2010-09-01 19:06:31 +00001045 def _Run(self, args, options, **kwargs):
1046 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001047 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001048 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001049 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001050
1051 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1052 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001053 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001054 scm.SVN.RunAndGetFileList(
1055 options.verbose,
1056 args + ['--ignore-externals'],
1057 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001058 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001059
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001060 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001061 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001062 """Add additional flags to command depending on what options are set.
1063 command should be a list of strings that represents an svn command.
1064
1065 This method returns a new list to be used as a command."""
1066 new_command = command[:]
1067 if revision:
1068 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001069 # We don't want interaction when jobs are used.
1070 if options.jobs > 1:
1071 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001072 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001073 # --accept was added to 'svn update' in svn 1.6.
1074 if not scm.SVN.AssertVersion('1.5')[0]:
1075 return new_command
1076
1077 # It's annoying to have it block in the middle of a sync, just sensible
1078 # defaults.
1079 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001080 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001081 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1082 new_command.extend(('--accept', 'theirs-conflict'))
1083 elif options.manually_grab_svn_rev:
1084 new_command.append('--force')
1085 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1086 new_command.extend(('--accept', 'postpone'))
1087 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1088 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001089 return new_command