blob: 95890a450ce8eb5e79bcd110001508ecec51eac7 [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.orgf5d37bf2010-09-02 00:50:34 +0000216 self._Clone(revision, url, options)
thomasvl@chromium.org858d6452011-03-24 17:59:20 +0000217 files = self._Capture(['ls-files']).splitlines()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000218 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000219 if not verbose:
220 # Make the output a little prettier. It's nice to have some whitespace
221 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000222 print('')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000223 return
224
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000225 if not managed:
226 print ('________ unmanaged solution; skipping %s' % self.relpath)
227 return
228
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000229 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
230 raise gclient_utils.Error('\n____ %s%s\n'
231 '\tPath is not a git repo. No .git dir.\n'
232 '\tTo resolve:\n'
233 '\t\trm -rf %s\n'
234 '\tAnd run gclient sync again\n'
235 % (self.relpath, rev_str, self.relpath))
236
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000237 # See if the url has changed (the unittests use git://foo for the url, let
238 # that through).
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000239 current_url = self._Capture(['config', 'remote.origin.url'])
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000240 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
241 # unit test pass. (and update the comment above)
242 if current_url != url and url != 'git://foo':
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000243 print('_____ switching %s to a new upstream' % self.relpath)
244 # Make sure it's clean
245 self._CheckClean(rev_str)
246 # Switch over to the new upstream
247 self._Run(['remote', 'set-url', 'origin', url], options)
248 quiet = []
249 if not options.verbose:
250 quiet = ['--quiet']
251 self._Run(['fetch', 'origin', '--prune'] + quiet, options)
252 self._Run(['reset', '--hard', 'origin/master'] + quiet, options)
253 files = self._Capture(['ls-files']).splitlines()
254 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
255 return
256
msb@chromium.org5bde4852009-12-14 16:47:12 +0000257 cur_branch = self._GetCurrentBranch()
258
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000259 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000260 # 0) HEAD is detached. Probably from our initial clone.
261 # - make sure HEAD is contained by a named ref, then update.
262 # Cases 1-4. HEAD is a branch.
263 # 1) current branch is not tracking a remote branch (could be git-svn)
264 # - try to rebase onto the new hash or branch
265 # 2) current branch is tracking a remote branch with local committed
266 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000267 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000268 # 3) current branch is tracking a remote branch w/or w/out changes,
269 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000270 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000271 # 4) current branch is tracking a remote branch, switches to a different
272 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000273 # - exit
274
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000275 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
276 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000277 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
278 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000279 if cur_branch is None:
280 upstream_branch = None
281 current_type = "detached"
282 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000283 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000284 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
285 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
286 current_type = "hash"
287 logging.debug("Current branch is not tracking an upstream (remote)"
288 " branch.")
289 elif upstream_branch.startswith('refs/remotes'):
290 current_type = "branch"
291 else:
292 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000293
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000294 # Update the remotes first so we have all the refs.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000295 backoff_time = 5
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000296 for _ in range(10):
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000297 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000298 remote_output = scm.GIT.Capture(
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000299 ['remote'] + verbose + ['update'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000300 cwd=self.checkout_path)
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000301 break
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000302 except subprocess2.CalledProcessError, e:
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000303 # Hackish but at that point, git is known to work so just checking for
304 # 502 in stderr should be fine.
305 if '502' in e.stderr:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000306 print(str(e))
307 print('Sleeping %.1f seconds and retrying...' % backoff_time)
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000308 time.sleep(backoff_time)
309 backoff_time *= 1.3
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000310 continue
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000311 raise
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000312
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000313 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000314 print(remote_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000315
316 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000317 if options.force or options.reset:
maruel@chromium.org37e89872010-09-07 16:11:33 +0000318 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000319
msb@chromium.org786fb682010-06-02 15:16:23 +0000320 if current_type == 'detached':
321 # case 0
322 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000323 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000324 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000325 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000326 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000327 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000328 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000329 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000330 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000331 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000332 newbase=revision, printed_path=printed_path)
333 printed_path = True
334 else:
335 # Can't find a merge-base since we don't know our upstream. That makes
336 # this command VERY likely to produce a rebase failure. For now we
337 # assume origin is our upstream since that's what the old behavior was.
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000338 upstream_branch = 'origin'
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000339 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000340 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000341 self._AttemptRebase(upstream_branch, files, options,
342 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000343 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000344 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000345 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000346 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000347 newbase=revision, printed_path=printed_path)
348 printed_path = True
349 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
350 # case 4
351 new_base = revision.replace('heads', 'remotes/origin')
352 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000353 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000354 switch_error = ("Switching upstream branch from %s to %s\n"
355 % (upstream_branch, new_base) +
356 "Please merge or rebase manually:\n" +
357 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
358 "OR git checkout -b <some new branch> %s" % new_base)
359 raise gclient_utils.Error(switch_error)
360 else:
361 # case 3 - the default case
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000362 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000363 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000364 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000365 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000366 merge_args = ['merge']
367 if not options.merge:
368 merge_args.append('--ff-only')
369 merge_args.append(upstream_branch)
370 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000371 except subprocess2.CalledProcessError, e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000372 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
373 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000374 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000375 printed_path = True
376 while True:
377 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000378 # TODO(maruel): That can't work with --jobs.
maruel@chromium.org90541732011-04-01 17:54:18 +0000379 action = ask_for_data(
380 'Cannot fast-forward merge, attempt to rebase? '
381 '(y)es / (q)uit / (s)kip : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000382 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000383 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000384 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000385 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000386 printed_path=printed_path)
387 printed_path = True
388 break
389 elif re.match(r'quit|q', action, re.I):
390 raise gclient_utils.Error("Can't fast-forward, please merge or "
391 "rebase manually.\n"
392 "cd %s && git " % self.checkout_path
393 + "rebase %s" % upstream_branch)
394 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000395 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000396 return
397 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000398 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000399 elif re.match("error: Your local changes to '.*' would be "
400 "overwritten by merge. Aborting.\nPlease, commit your "
401 "changes or stash them before you can merge.\n",
402 e.stderr):
403 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000404 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000405 printed_path = True
406 raise gclient_utils.Error(e.stderr)
407 else:
408 # Some other problem happened with the merge
409 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000410 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000411 raise
412 else:
413 # Fast-forward merge was successful
414 if not re.match('Already up-to-date.', merge_output) or verbose:
415 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000416 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000417 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000418 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000419 if not verbose:
420 # Make the output a little prettier. It's nice to have some
421 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000422 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423
424 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000425
426 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000427 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000428 raise gclient_utils.Error('\n____ %s%s\n'
429 '\nConflict while rebasing this branch.\n'
430 'Fix the conflict and run gclient again.\n'
431 'See man git-rebase for details.\n'
432 % (self.relpath, rev_str))
433
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000434 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000435 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000436
437 def revert(self, options, args, file_list):
438 """Reverts local modifications.
439
440 All reverted files will be appended to file_list.
441 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000442 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000443 # revert won't work if the directory doesn't exist. It needs to
444 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000445 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000446 # Don't reuse the args.
447 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000448
449 default_rev = "refs/heads/master"
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000450 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000451 if not deps_revision:
452 deps_revision = default_rev
453 if deps_revision.startswith('refs/heads/'):
454 deps_revision = deps_revision.replace('refs/heads/', 'origin/')
455
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000456 files = self._Capture(['diff', deps_revision, '--name-only']).split()
maruel@chromium.org37e89872010-09-07 16:11:33 +0000457 self._Run(['reset', '--hard', deps_revision], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000458 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
459
msb@chromium.org0f282062009-11-06 20:14:02 +0000460 def revinfo(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000461 """Returns revision"""
462 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000463
msb@chromium.orge28e4982009-09-25 20:51:45 +0000464 def runhooks(self, options, args, file_list):
465 self.status(options, args, file_list)
466
467 def status(self, options, args, file_list):
468 """Display status information."""
469 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000470 print(('\n________ couldn\'t run status in %s:\n'
471 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000472 else:
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000473 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000474 self._Run(['diff', '--name-status', merge_base], options)
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000475 files = self._Capture(['diff', '--name-only', merge_base]).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000476 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
477
msb@chromium.orge6f78352010-01-13 17:05:33 +0000478 def FullUrlForRelativeUrl(self, url):
479 # Strip from last '/'
480 # Equivalent to unix basename
481 base_url = self.url
482 return base_url[:base_url.rfind('/')] + url
483
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000484 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000485 """Clone a git repository from the given URL.
486
msb@chromium.org786fb682010-06-02 15:16:23 +0000487 Once we've cloned the repo, we checkout a working branch if the specified
488 revision is a branch head. If it is a tag or a specific commit, then we
489 leave HEAD detached as it makes future updates simpler -- in this case the
490 user should first create a new branch or switch to an existing branch before
491 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000492 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000493 # git clone doesn't seem to insert a newline properly before printing
494 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000495 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496
szager@google.com85d3e3a2011-10-07 17:12:00 +0000497 clone_cmd = ['clone', '--progress']
msb@chromium.org786fb682010-06-02 15:16:23 +0000498 if revision.startswith('refs/heads/'):
499 clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
500 detach_head = False
501 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000502 detach_head = True
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000503 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000504 clone_cmd.append('--verbose')
505 clone_cmd.extend([url, self.checkout_path])
506
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000507 # If the parent directory does not exist, Git clone on Windows will not
508 # create it, so we need to do it manually.
509 parent_dir = os.path.dirname(self.checkout_path)
510 if not os.path.exists(parent_dir):
511 os.makedirs(parent_dir)
512
szager@google.com85d3e3a2011-10-07 17:12:00 +0000513 percent_re = re.compile('.* ([0-9]{1,2})% .*')
514 def _GitFilter(line):
515 # git uses an escape sequence to clear the line; elide it.
516 esc = line.find(unichr(033))
517 if esc > -1:
518 line = line[:esc]
519 match = percent_re.match(line)
520 if not match or not int(match.group(1)) % 10:
521 print '%s' % line
522
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000523 for _ in range(3):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000524 try:
szager@google.com85d3e3a2011-10-07 17:12:00 +0000525 self._Run(clone_cmd, options, cwd=self._root_dir, filter_fn=_GitFilter,
526 print_stdout=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000527 break
maruel@chromium.org2a5b6a22011-09-09 14:03:12 +0000528 except subprocess2.CalledProcessError, e:
529 # Too bad we don't have access to the actual output yet.
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000530 # We should check for "transfer closed with NNN bytes remaining to
531 # read". In the meantime, just make sure .git exists.
maruel@chromium.org2a5b6a22011-09-09 14:03:12 +0000532 if (e.returncode == 128 and
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000533 os.path.exists(os.path.join(self.checkout_path, '.git'))):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000534 print(str(e))
535 print('Retrying...')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000536 continue
537 raise e
538
msb@chromium.org786fb682010-06-02 15:16:23 +0000539 if detach_head:
540 # Squelch git's very verbose detached HEAD warning and use our own
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000541 self._Capture(['checkout', '--quiet', '%s' % revision])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000542 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000543 ('Checked out %s to a detached HEAD. Before making any commits\n'
544 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
545 'an existing branch or use \'git checkout origin -b <branch>\' to\n'
546 'create a new branch for your work.') % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000547
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000548 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000549 branch=None, printed_path=False):
550 """Attempt to rebase onto either upstream or, if specified, newbase."""
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000551 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000552 revision = upstream
553 if newbase:
554 revision = newbase
555 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000556 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000557 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000558 printed_path = True
559 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000560 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000561
562 # Build the rebase command here using the args
563 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
564 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000565 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000566 rebase_cmd.append('--verbose')
567 if newbase:
568 rebase_cmd.extend(['--onto', newbase])
569 rebase_cmd.append(upstream)
570 if branch:
571 rebase_cmd.append(branch)
572
573 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000574 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000575 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000576 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
577 re.match(r'cannot rebase: your index contains uncommitted changes',
578 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000579 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000580 rebase_action = ask_for_data(
581 'Cannot rebase because of unstaged changes.\n'
582 '\'git reset --hard HEAD\' ?\n'
583 'WARNING: destroys any uncommitted work in your current branch!'
584 ' (y)es / (q)uit / (s)how : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000585 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000586 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000587 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000588 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000589 break
590 elif re.match(r'quit|q', rebase_action, re.I):
591 raise gclient_utils.Error("Please merge or rebase manually\n"
592 "cd %s && git " % self.checkout_path
593 + "%s" % ' '.join(rebase_cmd))
594 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000595 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000596 continue
597 else:
598 gclient_utils.Error("Input not recognized")
599 continue
600 elif re.search(r'^CONFLICT', e.stdout, re.M):
601 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
602 "Fix the conflict and run gclient again.\n"
603 "See 'man git-rebase' for details.\n")
604 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000605 print(e.stdout.strip())
606 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000607 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
608 "manually.\ncd %s && git " %
609 self.checkout_path
610 + "%s" % ' '.join(rebase_cmd))
611
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000612 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000613 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000614 # Make the output a little prettier. It's nice to have some
615 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000616 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000617
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000618 @staticmethod
619 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000620 (ok, current_version) = scm.GIT.AssertVersion(min_version)
621 if not ok:
622 raise gclient_utils.Error('git version %s < minimum required %s' %
623 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000624
msb@chromium.org786fb682010-06-02 15:16:23 +0000625 def _IsRebasing(self):
626 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
627 # have a plumbing command to determine whether a rebase is in progress, so
628 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
629 g = os.path.join(self.checkout_path, '.git')
630 return (
631 os.path.isdir(os.path.join(g, "rebase-merge")) or
632 os.path.isdir(os.path.join(g, "rebase-apply")))
633
634 def _CheckClean(self, rev_str):
635 # Make sure the tree is clean; see git-rebase.sh for reference
636 try:
637 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000638 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000639 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000640 raise gclient_utils.Error('\n____ %s%s\n'
641 '\tYou have unstaged changes.\n'
642 '\tPlease commit, stash, or reset.\n'
643 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000644 try:
645 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000646 '--ignore-submodules', 'HEAD', '--'],
647 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000648 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000649 raise gclient_utils.Error('\n____ %s%s\n'
650 '\tYour index contains uncommitted changes\n'
651 '\tPlease commit, stash, or reset.\n'
652 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000653
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000654 def _CheckDetachedHead(self, rev_str, options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000655 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
656 # reference by a commit). If not, error out -- most likely a rebase is
657 # in progress, try to detect so we can give a better error.
658 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000659 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
660 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000661 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000662 # Commit is not contained by any rev. See if the user is rebasing:
663 if self._IsRebasing():
664 # Punt to the user
665 raise gclient_utils.Error('\n____ %s%s\n'
666 '\tAlready in a conflict, i.e. (no branch).\n'
667 '\tFix the conflict and run gclient again.\n'
668 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
669 '\tSee man git-rebase for details.\n'
670 % (self.relpath, rev_str))
671 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000672 name = ('saved-by-gclient-' +
673 self._Capture(['rev-parse', '--short', 'HEAD']))
674 self._Capture(['branch', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000675 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000676 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000677
msb@chromium.org5bde4852009-12-14 16:47:12 +0000678 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000679 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000680 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000681 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000682 return None
683 return branch
684
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000685 def _Capture(self, args):
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000686 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +0000687 ['git'] + args,
688 stderr=subprocess2.PIPE,
689 cwd=self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000690
maruel@chromium.org37e89872010-09-07 16:11:33 +0000691 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000692 kwargs.setdefault('cwd', self.checkout_path)
szager@google.com85d3e3a2011-10-07 17:12:00 +0000693 kwargs.setdefault('print_stdout', True)
694 stdout = kwargs.get('stdout', sys.stdout)
695 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
696 ' '.join(args), kwargs['cwd']))
697 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000698
699
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000700class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000701 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000702
floitsch@google.comeaab7842011-04-28 09:07:58 +0000703 def GetRevisionDate(self, revision):
704 """Returns the given revision's date in ISO-8601 format (which contains the
705 time zone)."""
706 date = scm.SVN.Capture(['propget', '--revprop', 'svn:date', '-r', revision,
707 os.path.join(self.checkout_path, '.')])
708 return date.strip()
709
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000710 def cleanup(self, options, args, file_list):
711 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000712 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000713
714 def diff(self, options, args, file_list):
715 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000716 if not os.path.isdir(self.checkout_path):
717 raise gclient_utils.Error('Directory %s is not present.' %
718 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000719 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000720
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000721 def pack(self, options, args, file_list):
722 """Generates a patch file which can be applied to the root of the
723 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000724 if not os.path.isdir(self.checkout_path):
725 raise gclient_utils.Error('Directory %s is not present.' %
726 self.checkout_path)
727 gclient_utils.CheckCallAndFilter(
728 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
729 cwd=self.checkout_path,
730 print_stdout=False,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000731 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000732
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000733 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000734 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000735
736 All updated files will be appended to file_list.
737
738 Raises:
739 Error: if can't get URL for relative path.
740 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000741 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000742 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000743 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000744 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000745 return
746
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000747 hg_path = os.path.join(self.checkout_path, '.hg')
748 if os.path.exists(hg_path):
749 print('________ found .hg directory; skipping %s' % self.relpath)
750 return
751
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000752 if args:
753 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
754
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000755 # revision is the revision to match. It is None if no revision is specified,
756 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000757 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000758 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000759 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000760 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000761 if options.revision:
762 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000763 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000764 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000765 if revision != 'unmanaged':
766 forced_revision = True
767 # Reconstruct the url.
768 url = '%s@%s' % (url, revision)
769 rev_str = ' at %s' % revision
770 else:
771 managed = False
772 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000773 else:
774 forced_revision = False
775 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000776
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000777 if not os.path.exists(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000778 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000779 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000780 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000781 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000782 return
783
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000784 if not managed:
785 print ('________ unmanaged solution; skipping %s' % self.relpath)
786 return
787
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000788 # Get the existing scm url and the revision number of the current checkout.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000789 try:
790 from_info = scm.SVN.CaptureInfo(os.path.join(self.checkout_path, '.'))
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000791 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000792 raise gclient_utils.Error(
793 ('Can\'t update/checkout %s if an unversioned directory is present. '
794 'Delete the directory and try again.') % self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000795
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +0000796 if 'URL' not in from_info:
797 raise gclient_utils.Error(
798 ('gclient is confused. Couldn\'t get the url for %s.\n'
799 'Try using @unmanaged.\n%s') % (
800 self.checkout_path, from_info))
801
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000802 # Look for locked directories.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000803 dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +0000804 if any(d[0][2] == 'L' for d in dir_info):
805 try:
806 self._Run(['cleanup', self.checkout_path], options)
807 except subprocess2.CalledProcessError, e:
808 # Get the status again, svn cleanup may have cleaned up at least
809 # something.
810 dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
811
812 # Try to fix the failures by removing troublesome files.
813 for d in dir_info:
814 if d[0][2] == 'L':
815 if d[0][0] == '!' and options.force:
816 print 'Removing troublesome path %s' % d[1]
817 gclient_utils.rmtree(d[1])
818 else:
819 print 'Not removing troublesome path %s automatically.' % d[1]
820 if d[0][0] == '!':
821 print 'You can pass --force to enable automatic removal.'
822 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000823
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000824 # Retrieve the current HEAD version because svn is slow at null updates.
825 if options.manually_grab_svn_rev and not revision:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000826 from_info_live = scm.SVN.CaptureInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000827 revision = str(from_info_live['Revision'])
828 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000829
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000830 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000831 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000832 try:
833 to_info = scm.SVN.CaptureInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000834 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +0000835 # The url is invalid or the server is not accessible, it's safer to bail
836 # out right now.
837 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000838 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
839 and (from_info['UUID'] == to_info['UUID']))
840 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000841 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000842 # We have different roots, so check if we can switch --relocate.
843 # Subversion only permits this if the repository UUIDs match.
844 # Perform the switch --relocate, then rewrite the from_url
845 # to reflect where we "are now." (This is the same way that
846 # Subversion itself handles the metadata when switch --relocate
847 # is used.) This makes the checks below for whether we
848 # can update to a revision or have to switch to a different
849 # branch work as expected.
850 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000851 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000852 from_info['Repository Root'],
853 to_info['Repository Root'],
854 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000855 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000856 from_info['URL'] = from_info['URL'].replace(
857 from_info['Repository Root'],
858 to_info['Repository Root'])
859 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +0000860 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000861 # Look for local modifications but ignore unversioned files.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000862 for status in scm.SVN.CaptureStatus(self.checkout_path):
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000863 if status[0] != '?':
864 raise gclient_utils.Error(
865 ('Can\'t switch the checkout to %s; UUID don\'t match and '
866 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000867 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000868 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000869 print('\n_____ switching %s to a new checkout' % self.relpath)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000870 gclient_utils.RemoveDirectory(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000871 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000872 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000873 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000874 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000875 return
876
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000877 # If the provided url has a revision number that matches the revision
878 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +0000879 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000880 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000881 print('\n_____ %s%s' % (self.relpath, rev_str))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000882 return
883
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000884 command = ['update', self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000885 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000886 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000887
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000888 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000889 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +0000890 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000891 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +0000892 # Create an empty checkout and then update the one file we want. Future
893 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000894 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000895 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000896 if os.path.exists(os.path.join(self.checkout_path, filename)):
897 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +0000898 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000899 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +0000900 # After the initial checkout, we can use update as if it were any other
901 # dep.
902 self.update(options, args, file_list)
903 else:
904 # If the installed version of SVN doesn't support --depth, fallback to
905 # just exporting the file. This has the downside that revision
906 # information is not stored next to the file, so we will have to
907 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000908 if not os.path.exists(self.checkout_path):
909 os.makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +0000910 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000911 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000912 command = self._AddAdditionalUpdateFlags(command, options,
913 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000914 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000915
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000916 def revert(self, options, args, file_list):
917 """Reverts local modifications. Subversion specific.
918
919 All reverted files will be appended to file_list, even if Subversion
920 doesn't know about them.
921 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000922 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000923 # svn revert won't work if the directory doesn't exist. It needs to
924 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000925 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000926 # Don't reuse the args.
927 return self.update(options, [], file_list)
928
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000929 def printcb(file_status):
930 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000931 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000932 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000933 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000934 print(os.path.join(self.checkout_path, file_status[1]))
935 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000936
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000937 try:
938 # svn revert is so broken we don't even use it. Using
939 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000940 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +0000941 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
942 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000943 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000944 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000945 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000946
msb@chromium.org0f282062009-11-06 20:14:02 +0000947 def revinfo(self, options, args, file_list):
948 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000949 try:
950 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000951 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000952 return None
msb@chromium.org0f282062009-11-06 20:14:02 +0000953
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000954 def runhooks(self, options, args, file_list):
955 self.status(options, args, file_list)
956
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000957 def status(self, options, args, file_list):
958 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000959 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000960 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000961 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000962 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
963 'The directory does not exist.') %
964 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000965 # There's no file list to retrieve.
966 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +0000967 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +0000968
969 def FullUrlForRelativeUrl(self, url):
970 # Find the forth '/' and strip from there. A bit hackish.
971 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +0000972
maruel@chromium.org669600d2010-09-01 19:06:31 +0000973 def _Run(self, args, options, **kwargs):
974 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000975 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000976 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000977 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000978
979 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
980 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000981 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +0000982 scm.SVN.RunAndGetFileList(
983 options.verbose,
984 args + ['--ignore-externals'],
985 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000986 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000987
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000988 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000989 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +0000990 """Add additional flags to command depending on what options are set.
991 command should be a list of strings that represents an svn command.
992
993 This method returns a new list to be used as a command."""
994 new_command = command[:]
995 if revision:
996 new_command.extend(['--revision', str(revision).strip()])
997 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.orgedb6ea62011-10-11 20:25:13 +0000998 if ((options.force or options.manually_grab_svn_rev) and
999 scm.SVN.AssertVersion("1.5")[0]):
tony@chromium.org99828122010-06-04 01:41:02 +00001000 new_command.append('--force')
1001 return new_command