blob: 83955c6973bfbb55a5935fc7a22bd82b285e3288 [file] [log] [blame]
scherkus@chromium.org95f0f4e2010-05-22 00:55:26 +00001# Copyright (c) 2010 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
msb@chromium.orge28e4982009-09-25 20:51:45 +0000177 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000178 # Override the revision number.
179 revision = str(options.revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000180 if not revision:
181 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000182
floitsch@google.comeaab7842011-04-28 09:07:58 +0000183 if gclient_utils.IsDateRevision(revision):
184 # Date-revisions only work on git-repositories if the reflog hasn't
185 # expired yet. Use rev-list to get the corresponding revision.
186 # git rev-list -n 1 --before='time-stamp' branchname
187 if options.transitive:
188 print('Warning: --transitive only works for SVN repositories.')
189 revision = default_rev
190
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000191 rev_str = ' at %s' % revision
192 files = []
193
194 printed_path = False
195 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000196 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000197 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000198 verbose = ['--verbose']
199 printed_path = True
200
201 if revision.startswith('refs/heads/'):
202 rev_type = "branch"
203 elif revision.startswith('origin/'):
204 # For compatability with old naming, translate 'origin' to 'refs/heads'
205 revision = revision.replace('origin/', 'refs/heads/')
206 rev_type = "branch"
207 else:
208 # hash is also a tag, only make a distinction at checkout
209 rev_type = "hash"
210
msb@chromium.orge28e4982009-09-25 20:51:45 +0000211 if not os.path.exists(self.checkout_path):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000212 self._Clone(revision, url, options)
thomasvl@chromium.org858d6452011-03-24 17:59:20 +0000213 files = self._Capture(['ls-files']).splitlines()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000214 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000215 if not verbose:
216 # Make the output a little prettier. It's nice to have some whitespace
217 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000218 print('')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000219 return
220
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000221 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
222 raise gclient_utils.Error('\n____ %s%s\n'
223 '\tPath is not a git repo. No .git dir.\n'
224 '\tTo resolve:\n'
225 '\t\trm -rf %s\n'
226 '\tAnd run gclient sync again\n'
227 % (self.relpath, rev_str, self.relpath))
228
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000229 # See if the url has changed (the unittests use git://foo for the url, let
230 # that through).
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000231 current_url = self._Capture(['config', 'remote.origin.url'])
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000232 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
233 # unit test pass. (and update the comment above)
234 if current_url != url and url != 'git://foo':
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000235 print('_____ switching %s to a new upstream' % self.relpath)
236 # Make sure it's clean
237 self._CheckClean(rev_str)
238 # Switch over to the new upstream
239 self._Run(['remote', 'set-url', 'origin', url], options)
240 quiet = []
241 if not options.verbose:
242 quiet = ['--quiet']
243 self._Run(['fetch', 'origin', '--prune'] + quiet, options)
244 self._Run(['reset', '--hard', 'origin/master'] + quiet, options)
245 files = self._Capture(['ls-files']).splitlines()
246 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
247 return
248
msb@chromium.org5bde4852009-12-14 16:47:12 +0000249 cur_branch = self._GetCurrentBranch()
250
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000251 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000252 # 0) HEAD is detached. Probably from our initial clone.
253 # - make sure HEAD is contained by a named ref, then update.
254 # Cases 1-4. HEAD is a branch.
255 # 1) current branch is not tracking a remote branch (could be git-svn)
256 # - try to rebase onto the new hash or branch
257 # 2) current branch is tracking a remote branch with local committed
258 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000259 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000260 # 3) current branch is tracking a remote branch w/or w/out changes,
261 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000262 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000263 # 4) current branch is tracking a remote branch, switches to a different
264 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000265 # - exit
266
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000267 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
268 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000269 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
270 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000271 if cur_branch is None:
272 upstream_branch = None
273 current_type = "detached"
274 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000275 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000276 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
277 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
278 current_type = "hash"
279 logging.debug("Current branch is not tracking an upstream (remote)"
280 " branch.")
281 elif upstream_branch.startswith('refs/remotes'):
282 current_type = "branch"
283 else:
284 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000285
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000286 # Update the remotes first so we have all the refs.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000287 backoff_time = 5
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000288 for _ in range(10):
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000289 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000290 remote_output = scm.GIT.Capture(
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000291 ['remote'] + verbose + ['update'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000292 cwd=self.checkout_path)
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000293 break
maruel@chromium.org982984e2010-05-11 20:57:49 +0000294 except gclient_utils.CheckCallError, e:
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000295 # Hackish but at that point, git is known to work so just checking for
296 # 502 in stderr should be fine.
297 if '502' in e.stderr:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000298 print(str(e))
299 print('Sleeping %.1f seconds and retrying...' % backoff_time)
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000300 time.sleep(backoff_time)
301 backoff_time *= 1.3
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000302 continue
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000303 raise
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000304
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000305 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000306 print(remote_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000307
308 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000309 if options.force or options.reset:
maruel@chromium.org37e89872010-09-07 16:11:33 +0000310 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000311
msb@chromium.org786fb682010-06-02 15:16:23 +0000312 if current_type == 'detached':
313 # case 0
314 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000315 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000316 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000317 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000318 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000319 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000320 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000321 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000322 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000323 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000324 newbase=revision, printed_path=printed_path)
325 printed_path = True
326 else:
327 # Can't find a merge-base since we don't know our upstream. That makes
328 # this command VERY likely to produce a rebase failure. For now we
329 # assume origin is our upstream since that's what the old behavior was.
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000330 upstream_branch = 'origin'
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000331 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000332 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000333 self._AttemptRebase(upstream_branch, files, options,
334 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000335 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000336 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000337 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000338 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000339 newbase=revision, printed_path=printed_path)
340 printed_path = True
341 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
342 # case 4
343 new_base = revision.replace('heads', 'remotes/origin')
344 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000345 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000346 switch_error = ("Switching upstream branch from %s to %s\n"
347 % (upstream_branch, new_base) +
348 "Please merge or rebase manually:\n" +
349 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
350 "OR git checkout -b <some new branch> %s" % new_base)
351 raise gclient_utils.Error(switch_error)
352 else:
353 # case 3 - the default case
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000354 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000355 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000356 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000357 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000358 merge_output = scm.GIT.Capture(['merge', '--ff-only', upstream_branch],
359 cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000360 except gclient_utils.CheckCallError, e:
361 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
362 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000363 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000364 printed_path = True
365 while True:
366 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000367 # TODO(maruel): That can't work with --jobs.
maruel@chromium.org90541732011-04-01 17:54:18 +0000368 action = ask_for_data(
369 'Cannot fast-forward merge, attempt to rebase? '
370 '(y)es / (q)uit / (s)kip : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000371 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000372 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000373 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000374 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000375 printed_path=printed_path)
376 printed_path = True
377 break
378 elif re.match(r'quit|q', action, re.I):
379 raise gclient_utils.Error("Can't fast-forward, please merge or "
380 "rebase manually.\n"
381 "cd %s && git " % self.checkout_path
382 + "rebase %s" % upstream_branch)
383 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000384 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000385 return
386 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000387 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000388 elif re.match("error: Your local changes to '.*' would be "
389 "overwritten by merge. Aborting.\nPlease, commit your "
390 "changes or stash them before you can merge.\n",
391 e.stderr):
392 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000393 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000394 printed_path = True
395 raise gclient_utils.Error(e.stderr)
396 else:
397 # Some other problem happened with the merge
398 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000399 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000400 raise
401 else:
402 # Fast-forward merge was successful
403 if not re.match('Already up-to-date.', merge_output) or verbose:
404 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000405 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000406 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000407 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000408 if not verbose:
409 # Make the output a little prettier. It's nice to have some
410 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000411 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000412
413 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000414
415 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000416 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000417 raise gclient_utils.Error('\n____ %s%s\n'
418 '\nConflict while rebasing this branch.\n'
419 'Fix the conflict and run gclient again.\n'
420 'See man git-rebase for details.\n'
421 % (self.relpath, rev_str))
422
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000424 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000425
426 def revert(self, options, args, file_list):
427 """Reverts local modifications.
428
429 All reverted files will be appended to file_list.
430 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000431 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000432 # revert won't work if the directory doesn't exist. It needs to
433 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000434 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000435 # Don't reuse the args.
436 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000437
438 default_rev = "refs/heads/master"
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000439 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000440 if not deps_revision:
441 deps_revision = default_rev
442 if deps_revision.startswith('refs/heads/'):
443 deps_revision = deps_revision.replace('refs/heads/', 'origin/')
444
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000445 files = self._Capture(['diff', deps_revision, '--name-only']).split()
maruel@chromium.org37e89872010-09-07 16:11:33 +0000446 self._Run(['reset', '--hard', deps_revision], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000447 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
448
msb@chromium.org0f282062009-11-06 20:14:02 +0000449 def revinfo(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000450 """Returns revision"""
451 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000452
msb@chromium.orge28e4982009-09-25 20:51:45 +0000453 def runhooks(self, options, args, file_list):
454 self.status(options, args, file_list)
455
456 def status(self, options, args, file_list):
457 """Display status information."""
458 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000459 print(('\n________ couldn\'t run status in %s:\n'
460 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000461 else:
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000462 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000463 self._Run(['diff', '--name-status', merge_base], options)
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000464 files = self._Capture(['diff', '--name-only', merge_base]).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000465 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
466
msb@chromium.orge6f78352010-01-13 17:05:33 +0000467 def FullUrlForRelativeUrl(self, url):
468 # Strip from last '/'
469 # Equivalent to unix basename
470 base_url = self.url
471 return base_url[:base_url.rfind('/')] + url
472
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000473 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 """Clone a git repository from the given URL.
475
msb@chromium.org786fb682010-06-02 15:16:23 +0000476 Once we've cloned the repo, we checkout a working branch if the specified
477 revision is a branch head. If it is a tag or a specific commit, then we
478 leave HEAD detached as it makes future updates simpler -- in this case the
479 user should first create a new branch or switch to an existing branch before
480 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000481 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000482 # git clone doesn't seem to insert a newline properly before printing
483 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000484 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000485
486 clone_cmd = ['clone']
msb@chromium.org786fb682010-06-02 15:16:23 +0000487 if revision.startswith('refs/heads/'):
488 clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
489 detach_head = False
490 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000491 detach_head = True
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000492 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000493 clone_cmd.append('--verbose')
494 clone_cmd.extend([url, self.checkout_path])
495
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000496 # If the parent directory does not exist, Git clone on Windows will not
497 # create it, so we need to do it manually.
498 parent_dir = os.path.dirname(self.checkout_path)
499 if not os.path.exists(parent_dir):
500 os.makedirs(parent_dir)
501
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000502 for _ in range(3):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000503 try:
maruel@chromium.org37e89872010-09-07 16:11:33 +0000504 self._Run(clone_cmd, options, cwd=self._root_dir)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000505 break
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000506 except (gclient_utils.Error, subprocess2.CalledProcessError), e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000507 # TODO(maruel): Hackish, should be fixed by moving _Run() to
508 # CheckCall().
509 # Too bad we don't have access to the actual output.
510 # We should check for "transfer closed with NNN bytes remaining to
511 # read". In the meantime, just make sure .git exists.
512 if (e.args[0] == 'git command clone returned 128' and
513 os.path.exists(os.path.join(self.checkout_path, '.git'))):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000514 print(str(e))
515 print('Retrying...')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000516 continue
517 raise e
518
msb@chromium.org786fb682010-06-02 15:16:23 +0000519 if detach_head:
520 # Squelch git's very verbose detached HEAD warning and use our own
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000521 self._Capture(['checkout', '--quiet', '%s' % revision])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000522 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000523 ('Checked out %s to a detached HEAD. Before making any commits\n'
524 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
525 'an existing branch or use \'git checkout origin -b <branch>\' to\n'
526 'create a new branch for your work.') % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000527
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000528 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000529 branch=None, printed_path=False):
530 """Attempt to rebase onto either upstream or, if specified, newbase."""
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000531 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000532 revision = upstream
533 if newbase:
534 revision = newbase
535 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000536 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000537 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000538 printed_path = True
539 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000540 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000541
542 # Build the rebase command here using the args
543 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
544 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000545 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000546 rebase_cmd.append('--verbose')
547 if newbase:
548 rebase_cmd.extend(['--onto', newbase])
549 rebase_cmd.append(upstream)
550 if branch:
551 rebase_cmd.append(branch)
552
553 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000554 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000555 except gclient_utils.CheckCallError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000556 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
557 re.match(r'cannot rebase: your index contains uncommitted changes',
558 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000559 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000560 rebase_action = ask_for_data(
561 'Cannot rebase because of unstaged changes.\n'
562 '\'git reset --hard HEAD\' ?\n'
563 'WARNING: destroys any uncommitted work in your current branch!'
564 ' (y)es / (q)uit / (s)how : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000565 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000566 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000567 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000568 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000569 break
570 elif re.match(r'quit|q', rebase_action, re.I):
571 raise gclient_utils.Error("Please merge or rebase manually\n"
572 "cd %s && git " % self.checkout_path
573 + "%s" % ' '.join(rebase_cmd))
574 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000575 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000576 continue
577 else:
578 gclient_utils.Error("Input not recognized")
579 continue
580 elif re.search(r'^CONFLICT', e.stdout, re.M):
581 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
582 "Fix the conflict and run gclient again.\n"
583 "See 'man git-rebase' for details.\n")
584 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000585 print(e.stdout.strip())
586 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000587 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
588 "manually.\ncd %s && git " %
589 self.checkout_path
590 + "%s" % ' '.join(rebase_cmd))
591
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000592 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000593 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000594 # Make the output a little prettier. It's nice to have some
595 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000596 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000597
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000598 @staticmethod
599 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000600 (ok, current_version) = scm.GIT.AssertVersion(min_version)
601 if not ok:
602 raise gclient_utils.Error('git version %s < minimum required %s' %
603 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000604
msb@chromium.org786fb682010-06-02 15:16:23 +0000605 def _IsRebasing(self):
606 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
607 # have a plumbing command to determine whether a rebase is in progress, so
608 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
609 g = os.path.join(self.checkout_path, '.git')
610 return (
611 os.path.isdir(os.path.join(g, "rebase-merge")) or
612 os.path.isdir(os.path.join(g, "rebase-apply")))
613
614 def _CheckClean(self, rev_str):
615 # Make sure the tree is clean; see git-rebase.sh for reference
616 try:
617 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000618 cwd=self.checkout_path)
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000619 except gclient_utils.CheckCallError:
620 raise gclient_utils.Error('\n____ %s%s\n'
621 '\tYou have unstaged changes.\n'
622 '\tPlease commit, stash, or reset.\n'
623 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000624 try:
625 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000626 '--ignore-submodules', 'HEAD', '--'],
627 cwd=self.checkout_path)
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000628 except gclient_utils.CheckCallError:
629 raise gclient_utils.Error('\n____ %s%s\n'
630 '\tYour index contains uncommitted changes\n'
631 '\tPlease commit, stash, or reset.\n'
632 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000633
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000634 def _CheckDetachedHead(self, rev_str, options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000635 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
636 # reference by a commit). If not, error out -- most likely a rebase is
637 # in progress, try to detect so we can give a better error.
638 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000639 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
640 cwd=self.checkout_path)
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000641 except gclient_utils.CheckCallError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000642 # Commit is not contained by any rev. See if the user is rebasing:
643 if self._IsRebasing():
644 # Punt to the user
645 raise gclient_utils.Error('\n____ %s%s\n'
646 '\tAlready in a conflict, i.e. (no branch).\n'
647 '\tFix the conflict and run gclient again.\n'
648 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
649 '\tSee man git-rebase for details.\n'
650 % (self.relpath, rev_str))
651 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000652 name = ('saved-by-gclient-' +
653 self._Capture(['rev-parse', '--short', 'HEAD']))
654 self._Capture(['branch', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000655 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000656 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000657
msb@chromium.org5bde4852009-12-14 16:47:12 +0000658 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000659 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000660 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000661 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000662 return None
663 return branch
664
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000665 def _Capture(self, args):
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000666 return gclient_utils.CheckCall(
667 ['git'] + args, cwd=self.checkout_path, print_error=False)[0].strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000668
maruel@chromium.org37e89872010-09-07 16:11:33 +0000669 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000670 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org37e89872010-09-07 16:11:33 +0000671 gclient_utils.CheckCallAndFilterAndHeader(['git'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000672 always=options.verbose, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000673
674
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000675class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000676 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000677
floitsch@google.comeaab7842011-04-28 09:07:58 +0000678 def GetRevisionDate(self, revision):
679 """Returns the given revision's date in ISO-8601 format (which contains the
680 time zone)."""
681 date = scm.SVN.Capture(['propget', '--revprop', 'svn:date', '-r', revision,
682 os.path.join(self.checkout_path, '.')])
683 return date.strip()
684
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000685 def cleanup(self, options, args, file_list):
686 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000687 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000688
689 def diff(self, options, args, file_list):
690 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000691 if not os.path.isdir(self.checkout_path):
692 raise gclient_utils.Error('Directory %s is not present.' %
693 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000694 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000695
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000696 def pack(self, options, args, file_list):
697 """Generates a patch file which can be applied to the root of the
698 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000699 if not os.path.isdir(self.checkout_path):
700 raise gclient_utils.Error('Directory %s is not present.' %
701 self.checkout_path)
702 gclient_utils.CheckCallAndFilter(
703 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
704 cwd=self.checkout_path,
705 print_stdout=False,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000706 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000707
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000708 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000709 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000710
711 All updated files will be appended to file_list.
712
713 Raises:
714 Error: if can't get URL for relative path.
715 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000716 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000717 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000718 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000719 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000720 return
721
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000722 hg_path = os.path.join(self.checkout_path, '.hg')
723 if os.path.exists(hg_path):
724 print('________ found .hg directory; skipping %s' % self.relpath)
725 return
726
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000727 if args:
728 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
729
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000730 # revision is the revision to match. It is None if no revision is specified,
731 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000732 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000733 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000734 base_url = url
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000735 if options.revision:
736 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000737 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000738 if revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000739 forced_revision = True
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000740 # Reconstruct the url.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000741 url = '%s@%s' % (url, revision)
msb@chromium.org770ff9e2009-09-23 17:18:18 +0000742 rev_str = ' at %s' % revision
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000743 else:
744 forced_revision = False
745 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000746
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000747 if not os.path.exists(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000748 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000749 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000750 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000751 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000752 return
753
754 # Get the existing scm url and the revision number of the current checkout.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000755 try:
756 from_info = scm.SVN.CaptureInfo(os.path.join(self.checkout_path, '.'))
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000757 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000758 raise gclient_utils.Error(
759 ('Can\'t update/checkout %s if an unversioned directory is present. '
760 'Delete the directory and try again.') % self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000761
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000762 # Look for locked directories.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000763 dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
764 if [True for d in dir_info
765 if d[0][2] == 'L' and d[1] == self.checkout_path]:
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000766 # The current directory is locked, clean it up.
maruel@chromium.org669600d2010-09-01 19:06:31 +0000767 self._Run(['cleanup'], options)
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000768
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000769 # Retrieve the current HEAD version because svn is slow at null updates.
770 if options.manually_grab_svn_rev and not revision:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000771 from_info_live = scm.SVN.CaptureInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000772 revision = str(from_info_live['Revision'])
773 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000774
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000775 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000776 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000777 try:
778 to_info = scm.SVN.CaptureInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000779 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +0000780 # The url is invalid or the server is not accessible, it's safer to bail
781 # out right now.
782 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000783 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
784 and (from_info['UUID'] == to_info['UUID']))
785 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000786 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000787 # We have different roots, so check if we can switch --relocate.
788 # Subversion only permits this if the repository UUIDs match.
789 # Perform the switch --relocate, then rewrite the from_url
790 # to reflect where we "are now." (This is the same way that
791 # Subversion itself handles the metadata when switch --relocate
792 # is used.) This makes the checks below for whether we
793 # can update to a revision or have to switch to a different
794 # branch work as expected.
795 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000796 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000797 from_info['Repository Root'],
798 to_info['Repository Root'],
799 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000800 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000801 from_info['URL'] = from_info['URL'].replace(
802 from_info['Repository Root'],
803 to_info['Repository Root'])
804 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +0000805 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000806 # Look for local modifications but ignore unversioned files.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000807 for status in scm.SVN.CaptureStatus(self.checkout_path):
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000808 if status[0] != '?':
809 raise gclient_utils.Error(
810 ('Can\'t switch the checkout to %s; UUID don\'t match and '
811 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000812 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000813 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000814 print('\n_____ switching %s to a new checkout' % self.relpath)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000815 gclient_utils.RemoveDirectory(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
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000822 # If the provided url has a revision number that matches the revision
823 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +0000824 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000825 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000826 print('\n_____ %s%s' % (self.relpath, rev_str))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000827 return
828
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000829 command = ['update', self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000830 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000831 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000832
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000833 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000834 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +0000835 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000836 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +0000837 # Create an empty checkout and then update the one file we want. Future
838 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000839 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000840 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000841 if os.path.exists(os.path.join(self.checkout_path, filename)):
842 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +0000843 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000844 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +0000845 # After the initial checkout, we can use update as if it were any other
846 # dep.
847 self.update(options, args, file_list)
848 else:
849 # If the installed version of SVN doesn't support --depth, fallback to
850 # just exporting the file. This has the downside that revision
851 # information is not stored next to the file, so we will have to
852 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000853 if not os.path.exists(self.checkout_path):
854 os.makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +0000855 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000856 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000857 command = self._AddAdditionalUpdateFlags(command, options,
858 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000859 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000860
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000861 def revert(self, options, args, file_list):
862 """Reverts local modifications. Subversion specific.
863
864 All reverted files will be appended to file_list, even if Subversion
865 doesn't know about them.
866 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000867 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000868 # svn revert won't work if the directory doesn't exist. It needs to
869 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000870 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000871 # Don't reuse the args.
872 return self.update(options, [], file_list)
873
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000874 def printcb(file_status):
875 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000876 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000877 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000878 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000879 print(os.path.join(self.checkout_path, file_status[1]))
880 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000881
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000882 try:
883 # svn revert is so broken we don't even use it. Using
884 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000885 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +0000886 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
887 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000888 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000889 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000890 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000891
msb@chromium.org0f282062009-11-06 20:14:02 +0000892 def revinfo(self, options, args, file_list):
893 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000894 try:
895 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000896 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000897 return None
msb@chromium.org0f282062009-11-06 20:14:02 +0000898
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000899 def runhooks(self, options, args, file_list):
900 self.status(options, args, file_list)
901
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000902 def status(self, options, args, file_list):
903 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000904 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000905 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000906 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000907 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
908 'The directory does not exist.') %
909 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000910 # There's no file list to retrieve.
911 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +0000912 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +0000913
914 def FullUrlForRelativeUrl(self, url):
915 # Find the forth '/' and strip from there. A bit hackish.
916 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +0000917
maruel@chromium.org669600d2010-09-01 19:06:31 +0000918 def _Run(self, args, options, **kwargs):
919 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000920 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000921 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000922 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000923
924 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
925 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000926 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +0000927 scm.SVN.RunAndGetFileList(
928 options.verbose,
929 args + ['--ignore-externals'],
930 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000931 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000932
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000933 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000934 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +0000935 """Add additional flags to command depending on what options are set.
936 command should be a list of strings that represents an svn command.
937
938 This method returns a new list to be used as a command."""
939 new_command = command[:]
940 if revision:
941 new_command.extend(['--revision', str(revision).strip()])
942 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000943 if ((options.force or options.manually_grab_svn_rev) and
944 scm.SVN.AssertVersion("1.5")[0]):
tony@chromium.org99828122010-06-04 01:41:02 +0000945 new_command.append('--force')
946 return new_command