blob: a9984e857029680af5dbb7598f276810f7bd3917 [file] [log] [blame]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00001# Copyright (c) 2009 The Chromium Authors. All rights reserved.
2# 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
11import subprocess
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000012
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +000013import scm
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000014import gclient_utils
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000015
16
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000017class DiffFilterer(object):
18 """Simple class which tracks which file is being diffed and
19 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000020 working copy lines of the svn/git diff output."""
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000021 index_string = "Index: "
22 original_prefix = "--- "
23 working_prefix = "+++ "
24
25 def __init__(self, relpath):
26 # Note that we always use '/' as the path separator to be
27 # consistent with svn's cygwin-style output on Windows
28 self._relpath = relpath.replace("\\", "/")
29 self._current_file = ""
30 self._replacement_file = ""
31
32 def SetCurrentFile(self, file):
33 self._current_file = file
34 # Note that we always use '/' as the path separator to be
35 # consistent with svn's cygwin-style output on Windows
36 self._replacement_file = posixpath.join(self._relpath, file)
37
38 def ReplaceAndPrint(self, line):
39 print(line.replace(self._current_file, self._replacement_file))
40
41 def Filter(self, line):
42 if (line.startswith(self.index_string)):
43 self.SetCurrentFile(line[len(self.index_string):])
44 self.ReplaceAndPrint(line)
45 else:
46 if (line.startswith(self.original_prefix) or
47 line.startswith(self.working_prefix)):
48 self.ReplaceAndPrint(line)
49 else:
50 print line
51
52
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000053### SCM abstraction layer
54
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000055# Factory Method for SCM wrapper creation
56
57def CreateSCM(url=None, root_dir=None, relpath=None, scm_name='svn'):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000058 scm_map = {
59 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +000060 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000061 }
msb@chromium.orge28e4982009-09-25 20:51:45 +000062
msb@chromium.org1b8779a2009-11-19 18:11:39 +000063 orig_url = url
64
65 if url:
66 url, _ = gclient_utils.SplitUrlRevision(url)
67 if url.startswith('git:') or url.startswith('ssh:') or url.endswith('.git'):
68 scm_name = 'git'
msb@chromium.orge28e4982009-09-25 20:51:45 +000069
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000070 if not scm_name in scm_map:
71 raise gclient_utils.Error('Unsupported scm %s' % scm_name)
msb@chromium.org1b8779a2009-11-19 18:11:39 +000072 return scm_map[scm_name](orig_url, root_dir, relpath, scm_name)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000073
74
75# SCMWrapper base class
76
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000077class SCMWrapper(object):
78 """Add necessary glue between all the supported SCM.
79
msb@chromium.orgd6504212010-01-13 17:34:31 +000080 This is the abstraction layer to bind to different SCM.
81 """
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +000082 def __init__(self, url=None, root_dir=None, relpath=None,
83 scm_name='svn'):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000084 self.scm_name = scm_name
85 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +000086 self._root_dir = root_dir
87 if self._root_dir:
88 self._root_dir = self._root_dir.replace('/', os.sep)
89 self.relpath = relpath
90 if self.relpath:
91 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +000092 if self.relpath and self._root_dir:
93 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000094
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000095 def RunCommand(self, command, options, args, file_list=None):
96 # file_list will have all files that are modified appended to it.
maruel@chromium.orgde754ac2009-09-17 18:04:50 +000097 if file_list is None:
98 file_list = []
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000099
msb@chromium.org0f282062009-11-06 20:14:02 +0000100 commands = ['cleanup', 'export', 'update', 'revert', 'revinfo',
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000101 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000102
103 if not command in commands:
104 raise gclient_utils.Error('Unknown command %s' % command)
105
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000106 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000107 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000108 command, self.scm_name))
109
110 return getattr(self, command)(options, args, file_list)
111
112
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000113class GitWrapper(SCMWrapper, scm.GIT):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000114 """Wrapper for Git"""
115
116 def cleanup(self, options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000117 """'Cleanup' the repo.
118
119 There's no real git equivalent for the svn cleanup command, do a no-op.
120 """
msb@chromium.org3904caa2010-01-25 17:37:46 +0000121 __pychecker__ = 'unusednames=options,args,file_list'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000122
123 def diff(self, options, args, file_list):
msb@chromium.org3904caa2010-01-25 17:37:46 +0000124 __pychecker__ = 'unusednames=options,args,file_list'
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000125 merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
126 self._Run(['diff', merge_base], redirect_stdout=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000127
128 def export(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000129 """Export a clean directory tree into the given path.
130
131 Exports into the specified directory, creating the path if it does
132 already exist.
133 """
msb@chromium.org3904caa2010-01-25 17:37:46 +0000134 __pychecker__ = 'unusednames=options,file_list'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000135 assert len(args) == 1
136 export_path = os.path.abspath(os.path.join(args[0], self.relpath))
137 if not os.path.exists(export_path):
138 os.makedirs(export_path)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000139 self._Run(['checkout-index', '-a', '--prefix=%s/' % export_path],
140 redirect_stdout=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000141
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000142 def pack(self, options, args, file_list):
143 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000144 repository.
145
146 The patch file is generated from a diff of the merge base of HEAD and
147 its upstream branch.
148 """
msb@chromium.org3904caa2010-01-25 17:37:46 +0000149 __pychecker__ = 'unusednames=options,file_list'
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000150 path = os.path.join(self._root_dir, self.relpath)
151 merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
152 command = ['diff', merge_base]
153 filterer = DiffFilterer(self.relpath)
154 self.RunAndFilterOutput(command, path, False, False, filterer.Filter)
155
msb@chromium.orge28e4982009-09-25 20:51:45 +0000156 def update(self, options, args, file_list):
157 """Runs git to update or transparently checkout the working copy.
158
159 All updated files will be appended to file_list.
160
161 Raises:
162 Error: if can't get URL for relative path.
163 """
164
165 if args:
166 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
167
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000168 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000169
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000170 default_rev = "refs/heads/master"
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000171 url, revision = gclient_utils.SplitUrlRevision(self.url)
172 rev_str = ""
msb@chromium.orge28e4982009-09-25 20:51:45 +0000173 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000174 # Override the revision number.
175 revision = str(options.revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000176 if not revision:
177 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000178
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000179 rev_str = ' at %s' % revision
180 files = []
181
182 printed_path = False
183 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000184 if options.verbose:
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000185 print("\n_____ %s%s" % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000186 verbose = ['--verbose']
187 printed_path = True
188
189 if revision.startswith('refs/heads/'):
190 rev_type = "branch"
191 elif revision.startswith('origin/'):
192 # For compatability with old naming, translate 'origin' to 'refs/heads'
193 revision = revision.replace('origin/', 'refs/heads/')
194 rev_type = "branch"
195 else:
196 # hash is also a tag, only make a distinction at checkout
197 rev_type = "hash"
198
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000199
msb@chromium.orge28e4982009-09-25 20:51:45 +0000200 if not os.path.exists(self.checkout_path):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000201 self._Clone(rev_type, revision, url, options.verbose)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000202 files = self._Run(['ls-files']).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000203 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000204 if not verbose:
205 # Make the output a little prettier. It's nice to have some whitespace
206 # between projects when cloning.
207 print ""
msb@chromium.orge28e4982009-09-25 20:51:45 +0000208 return
209
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000210 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
211 raise gclient_utils.Error('\n____ %s%s\n'
212 '\tPath is not a git repo. No .git dir.\n'
213 '\tTo resolve:\n'
214 '\t\trm -rf %s\n'
215 '\tAnd run gclient sync again\n'
216 % (self.relpath, rev_str, self.relpath))
217
msb@chromium.org5bde4852009-12-14 16:47:12 +0000218 cur_branch = self._GetCurrentBranch()
219
220 # Check if we are in a rebase conflict
221 if cur_branch is None:
222 raise gclient_utils.Error('\n____ %s%s\n'
223 '\tAlready in a conflict, i.e. (no branch).\n'
224 '\tFix the conflict and run gclient again.\n'
225 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
226 '\tSee man git-rebase for details.\n'
227 % (self.relpath, rev_str))
228
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000229 # Cases:
230 # 1) current branch based on a hash (could be git-svn)
231 # - try to rebase onto the new upstream (hash or branch)
232 # 2) current branch based on a remote branch with local committed changes,
233 # but the DEPS file switched to point to a hash
234 # - rebase those changes on top of the hash
235 # 3) current branch based on a remote with or without changes, no switch
236 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
237 # 4) current branch based on a remote, switches to a new remote
238 # - exit
239
240 # GetUpstream returns something like 'refs/remotes/origin/master' for a
241 # tracking branch
242 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
243 # or it returns None if it couldn't find an upstream
244 upstream_branch = self.GetUpstream(self.checkout_path)
245 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
246 current_type = "hash"
247 logging.debug("Current branch is based off a specific rev and is not "
248 "tracking an upstream.")
249 elif upstream_branch.startswith('refs/remotes'):
250 current_type = "branch"
251 else:
252 raise gclient_utils.Error('Invalid Upstream')
253
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000254 # Update the remotes first so we have all the refs.
255 for i in range(3):
256 try:
257 remote_output, remote_err = self.Capture(
258 ['remote'] + verbose + ['update'],
259 self.checkout_path,
260 print_error=False)
261 break
262 except gclient_utils.CheckCallError, e:
263 # Hackish but at that point, git is known to work so just checking for
264 # 502 in stderr should be fine.
265 if '502' in e.stderr:
266 print str(e)
267 print "Retrying..."
268 continue
269 raise e
270
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000271 if verbose:
272 print remote_output.strip()
273 # git remote update prints to stderr when used with --verbose
274 print remote_err.strip()
275
276 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000277 if options.force or options.reset:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000278 self._Run(['reset', '--hard', 'HEAD'], redirect_stdout=False)
279
280 if current_type is 'hash':
281 # case 1
282 if self.IsGitSvn(self.checkout_path) and upstream_branch is not None:
283 # Our git-svn branch (upstream_branch) is our upstream
284 self._AttemptRebase(upstream_branch, files, verbose=options.verbose,
285 newbase=revision, printed_path=printed_path)
286 printed_path = True
287 else:
288 # Can't find a merge-base since we don't know our upstream. That makes
289 # this command VERY likely to produce a rebase failure. For now we
290 # assume origin is our upstream since that's what the old behavior was.
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000291 upstream_branch = 'origin'
292 if options.revision:
293 upstream_branch = revision
294 self._AttemptRebase(upstream_branch, files=files,
295 verbose=options.verbose, printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000296 printed_path = True
297 elif rev_type is 'hash':
298 # case 2
299 self._AttemptRebase(upstream_branch, files, verbose=options.verbose,
300 newbase=revision, printed_path=printed_path)
301 printed_path = True
302 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
303 # case 4
304 new_base = revision.replace('heads', 'remotes/origin')
305 if not printed_path:
306 print("\n_____ %s%s" % (self.relpath, rev_str))
307 switch_error = ("Switching upstream branch from %s to %s\n"
308 % (upstream_branch, new_base) +
309 "Please merge or rebase manually:\n" +
310 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
311 "OR git checkout -b <some new branch> %s" % new_base)
312 raise gclient_utils.Error(switch_error)
313 else:
314 # case 3 - the default case
315 files = self._Run(['diff', upstream_branch, '--name-only']).split()
316 if verbose:
317 print "Trying fast-forward merge to branch : %s" % upstream_branch
318 try:
319 merge_output, merge_err = self.Capture(['merge', '--ff-only',
320 upstream_branch],
321 self.checkout_path,
322 print_error=False)
323 except gclient_utils.CheckCallError, e:
324 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
325 if not printed_path:
326 print("\n_____ %s%s" % (self.relpath, rev_str))
327 printed_path = True
328 while True:
329 try:
330 action = str(raw_input("Cannot fast-forward merge, attempt to "
331 "rebase? (y)es / (q)uit / (s)kip : "))
332 except ValueError:
333 gclient_utils.Error('Invalid Character')
334 continue
335 if re.match(r'yes|y', action, re.I):
336 self._AttemptRebase(upstream_branch, files,
337 verbose=options.verbose,
338 printed_path=printed_path)
339 printed_path = True
340 break
341 elif re.match(r'quit|q', action, re.I):
342 raise gclient_utils.Error("Can't fast-forward, please merge or "
343 "rebase manually.\n"
344 "cd %s && git " % self.checkout_path
345 + "rebase %s" % upstream_branch)
346 elif re.match(r'skip|s', action, re.I):
347 print "Skipping %s" % self.relpath
348 return
349 else:
350 print "Input not recognized"
351 elif re.match("error: Your local changes to '.*' would be "
352 "overwritten by merge. Aborting.\nPlease, commit your "
353 "changes or stash them before you can merge.\n",
354 e.stderr):
355 if not printed_path:
356 print("\n_____ %s%s" % (self.relpath, rev_str))
357 printed_path = True
358 raise gclient_utils.Error(e.stderr)
359 else:
360 # Some other problem happened with the merge
361 logging.error("Error during fast-forward merge in %s!" % self.relpath)
362 print e.stderr
363 raise
364 else:
365 # Fast-forward merge was successful
366 if not re.match('Already up-to-date.', merge_output) or verbose:
367 if not printed_path:
368 print("\n_____ %s%s" % (self.relpath, rev_str))
369 printed_path = True
370 print merge_output.strip()
371 if merge_err:
372 print "Merge produced error output:\n%s" % merge_err.strip()
373 if not verbose:
374 # Make the output a little prettier. It's nice to have some
375 # whitespace between projects when syncing.
376 print ""
377
378 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000379
380 # If the rebase generated a conflict, abort and ask user to fix
381 if self._GetCurrentBranch() is None:
382 raise gclient_utils.Error('\n____ %s%s\n'
383 '\nConflict while rebasing this branch.\n'
384 'Fix the conflict and run gclient again.\n'
385 'See man git-rebase for details.\n'
386 % (self.relpath, rev_str))
387
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000388 if verbose:
389 print "Checked out revision %s" % self.revinfo(options, (), None)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000390
391 def revert(self, options, args, file_list):
392 """Reverts local modifications.
393
394 All reverted files will be appended to file_list.
395 """
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000396 __pychecker__ = 'unusednames=args'
msb@chromium.org260c6532009-10-28 03:22:35 +0000397 path = os.path.join(self._root_dir, self.relpath)
398 if not os.path.isdir(path):
399 # revert won't work if the directory doesn't exist. It needs to
400 # checkout instead.
401 print("\n_____ %s is missing, synching instead" % self.relpath)
402 # Don't reuse the args.
403 return self.update(options, [], file_list)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000404 merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
405 files = self._Run(['diff', merge_base, '--name-only']).split()
406 self._Run(['reset', '--hard', merge_base], redirect_stdout=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000407 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
408
msb@chromium.org0f282062009-11-06 20:14:02 +0000409 def revinfo(self, options, args, file_list):
410 """Display revision"""
msb@chromium.org3904caa2010-01-25 17:37:46 +0000411 __pychecker__ = 'unusednames=options,args,file_list'
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000412 return self._Run(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000413
msb@chromium.orge28e4982009-09-25 20:51:45 +0000414 def runhooks(self, options, args, file_list):
415 self.status(options, args, file_list)
416
417 def status(self, options, args, file_list):
418 """Display status information."""
msb@chromium.org3904caa2010-01-25 17:37:46 +0000419 __pychecker__ = 'unusednames=options,args'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000420 if not os.path.isdir(self.checkout_path):
421 print('\n________ couldn\'t run status in %s:\nThe directory '
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000422 'does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000423 else:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000424 merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
425 self._Run(['diff', '--name-status', merge_base], redirect_stdout=False)
426 files = self._Run(['diff', '--name-only', merge_base]).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000427 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
428
msb@chromium.orge6f78352010-01-13 17:05:33 +0000429 def FullUrlForRelativeUrl(self, url):
430 # Strip from last '/'
431 # Equivalent to unix basename
432 base_url = self.url
433 return base_url[:base_url.rfind('/')] + url
434
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000435 def _Clone(self, rev_type, revision, url, verbose=False):
436 """Clone a git repository from the given URL.
437
438 Once we've cloned the repo, we checkout a working branch based off the
439 specified revision."""
440 if not verbose:
441 # git clone doesn't seem to insert a newline properly before printing
442 # to stdout
443 print ""
444
445 clone_cmd = ['clone']
446 if verbose:
447 clone_cmd.append('--verbose')
448 clone_cmd.extend([url, self.checkout_path])
449
450 for i in range(3):
451 try:
452 self._Run(clone_cmd, cwd=self._root_dir, redirect_stdout=False)
453 break
454 except gclient_utils.Error, e:
455 # TODO(maruel): Hackish, should be fixed by moving _Run() to
456 # CheckCall().
457 # Too bad we don't have access to the actual output.
458 # We should check for "transfer closed with NNN bytes remaining to
459 # read". In the meantime, just make sure .git exists.
460 if (e.args[0] == 'git command clone returned 128' and
461 os.path.exists(os.path.join(self.checkout_path, '.git'))):
462 print str(e)
463 print "Retrying..."
464 continue
465 raise e
466
467 if rev_type is "branch":
468 short_rev = revision.replace('refs/heads/', '')
469 new_branch = revision.replace('heads', 'remotes/origin')
470 elif revision.startswith('refs/tags/'):
471 short_rev = revision.replace('refs/tags/', '')
472 new_branch = revision
473 else:
474 # revision is a specific sha1 hash
475 short_rev = revision
476 new_branch = revision
477
478 cur_branch = self._GetCurrentBranch()
479 if cur_branch != short_rev:
480 self._Run(['checkout', '-b', short_rev, new_branch],
481 redirect_stdout=False)
482
483 def _AttemptRebase(self, upstream, files, verbose=False, newbase=None,
484 branch=None, printed_path=False):
485 """Attempt to rebase onto either upstream or, if specified, newbase."""
486 files.extend(self._Run(['diff', upstream, '--name-only']).split())
487 revision = upstream
488 if newbase:
489 revision = newbase
490 if not printed_path:
491 print "\n_____ %s : Attempting rebase onto %s..." % (self.relpath,
492 revision)
493 printed_path = True
494 else:
495 print "Attempting rebase onto %s..." % revision
496
497 # Build the rebase command here using the args
498 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
499 rebase_cmd = ['rebase']
500 if verbose:
501 rebase_cmd.append('--verbose')
502 if newbase:
503 rebase_cmd.extend(['--onto', newbase])
504 rebase_cmd.append(upstream)
505 if branch:
506 rebase_cmd.append(branch)
507
508 try:
509 rebase_output, rebase_err = self.Capture(rebase_cmd, self.checkout_path,
510 print_error=False)
511 except gclient_utils.CheckCallError, e:
512 if re.match(r'cannot rebase: you have unstaged changes', e.stderr) or \
513 re.match(r'cannot rebase: your index contains uncommitted changes',
514 e.stderr):
515 while True:
516 rebase_action = str(raw_input("Cannot rebase because of unstaged "
517 "changes.\n'git reset --hard HEAD' ?\n"
518 "WARNING: destroys any uncommitted "
519 "work in your current branch!"
520 " (y)es / (q)uit / (s)how : "))
521 if re.match(r'yes|y', rebase_action, re.I):
522 self._Run(['reset', '--hard', 'HEAD'], redirect_stdout=False)
523 # Should this be recursive?
524 rebase_output, rebase_err = self.Capture(rebase_cmd,
525 self.checkout_path)
526 break
527 elif re.match(r'quit|q', rebase_action, re.I):
528 raise gclient_utils.Error("Please merge or rebase manually\n"
529 "cd %s && git " % self.checkout_path
530 + "%s" % ' '.join(rebase_cmd))
531 elif re.match(r'show|s', rebase_action, re.I):
532 print "\n%s" % e.stderr.strip()
533 continue
534 else:
535 gclient_utils.Error("Input not recognized")
536 continue
537 elif re.search(r'^CONFLICT', e.stdout, re.M):
538 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
539 "Fix the conflict and run gclient again.\n"
540 "See 'man git-rebase' for details.\n")
541 else:
542 print e.stdout.strip()
543 print "Rebase produced error output:\n%s" % e.stderr.strip()
544 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
545 "manually.\ncd %s && git " %
546 self.checkout_path
547 + "%s" % ' '.join(rebase_cmd))
548
549 print rebase_output.strip()
550 if rebase_err:
551 print "Rebase produced error output:\n%s" % rebase_err.strip()
552 if not verbose:
553 # Make the output a little prettier. It's nice to have some
554 # whitespace between projects when syncing.
555 print ""
556
msb@chromium.org923a0372009-12-11 20:42:43 +0000557 def _CheckMinVersion(self, min_version):
msb@chromium.org83376f22009-12-11 22:25:31 +0000558 def only_int(val):
559 if val.isdigit():
560 return int(val)
561 else:
562 return 0
msb@chromium.orgba9b2392009-12-11 23:30:13 +0000563 version = self._Run(['--version'], cwd='.').split()[-1]
msb@chromium.org83376f22009-12-11 22:25:31 +0000564 version_list = map(only_int, version.split('.'))
msb@chromium.org923a0372009-12-11 20:42:43 +0000565 min_version_list = map(int, min_version.split('.'))
566 for min_ver in min_version_list:
567 ver = version_list.pop(0)
568 if min_ver > ver:
569 raise gclient_utils.Error('git version %s < minimum required %s' %
570 (version, min_version))
571 elif min_ver < ver:
572 return
573
msb@chromium.org5bde4852009-12-14 16:47:12 +0000574 def _GetCurrentBranch(self):
575 # Returns name of current branch
576 # Returns None if inside a (no branch)
577 tokens = self._Run(['branch']).split()
578 branch = tokens[tokens.index('*') + 1]
579 if branch == '(no':
580 return None
581 return branch
582
maruel@chromium.org2de10252010-02-08 01:10:39 +0000583 def _Run(self, args, cwd=None, redirect_stdout=True):
584 # TODO(maruel): Merge with Capture or better gclient_utils.CheckCall().
maruel@chromium.orgffe96f02009-12-09 18:39:15 +0000585 if cwd is None:
586 cwd = self.checkout_path
maruel@chromium.org2de10252010-02-08 01:10:39 +0000587 stdout = None
msb@chromium.orge8e60e52009-11-02 21:50:56 +0000588 if redirect_stdout:
maruel@chromium.org2de10252010-02-08 01:10:39 +0000589 stdout = subprocess.PIPE
msb@chromium.orge28e4982009-09-25 20:51:45 +0000590 if cwd == None:
591 cwd = self.checkout_path
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000592 cmd = [self.COMMAND]
msb@chromium.orge28e4982009-09-25 20:51:45 +0000593 cmd.extend(args)
maruel@chromium.orgf3909bf2010-01-08 01:14:51 +0000594 logging.debug(cmd)
595 try:
596 sp = subprocess.Popen(cmd, cwd=cwd, stdout=stdout)
597 output = sp.communicate()[0]
598 except OSError:
599 raise gclient_utils.Error("git command '%s' failed to run." %
600 ' '.join(cmd) + "\nCheck that you have git installed.")
maruel@chromium.org2de10252010-02-08 01:10:39 +0000601 if sp.returncode:
msb@chromium.orge28e4982009-09-25 20:51:45 +0000602 raise gclient_utils.Error('git command %s returned %d' %
603 (args[0], sp.returncode))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000604 if output is not None:
msb@chromium.orge8e60e52009-11-02 21:50:56 +0000605 return output.strip()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000606
607
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000608class SVNWrapper(SCMWrapper, scm.SVN):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000609 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000610
611 def cleanup(self, options, args, file_list):
612 """Cleanup working copy."""
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000613 __pychecker__ = 'unusednames=file_list,options'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000614 command = ['cleanup']
615 command.extend(args)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000616 self.Run(command, os.path.join(self._root_dir, self.relpath))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000617
618 def diff(self, options, args, file_list):
619 # NOTE: This function does not currently modify file_list.
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000620 __pychecker__ = 'unusednames=file_list,options'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000621 command = ['diff']
622 command.extend(args)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000623 self.Run(command, os.path.join(self._root_dir, self.relpath))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000624
625 def export(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000626 """Export a clean directory tree into the given path."""
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000627 __pychecker__ = 'unusednames=file_list,options'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000628 assert len(args) == 1
629 export_path = os.path.abspath(os.path.join(args[0], self.relpath))
630 try:
631 os.makedirs(export_path)
632 except OSError:
633 pass
634 assert os.path.exists(export_path)
635 command = ['export', '--force', '.']
636 command.append(export_path)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000637 self.Run(command, os.path.join(self._root_dir, self.relpath))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000638
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000639 def pack(self, options, args, file_list):
640 """Generates a patch file which can be applied to the root of the
641 repository."""
642 __pychecker__ = 'unusednames=file_list,options'
643 path = os.path.join(self._root_dir, self.relpath)
644 command = ['diff']
645 command.extend(args)
646
647 filterer = DiffFilterer(self.relpath)
648 self.RunAndFilterOutput(command, path, False, False, filterer.Filter)
649
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000650 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000651 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000652
653 All updated files will be appended to file_list.
654
655 Raises:
656 Error: if can't get URL for relative path.
657 """
658 # Only update if git is not controlling the directory.
659 checkout_path = os.path.join(self._root_dir, self.relpath)
660 git_path = os.path.join(self._root_dir, self.relpath, '.git')
661 if os.path.exists(git_path):
662 print("________ found .git directory; skipping %s" % self.relpath)
663 return
664
665 if args:
666 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
667
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000668 url, revision = gclient_utils.SplitUrlRevision(self.url)
669 base_url = url
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000670 forced_revision = False
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000671 rev_str = ""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000672 if options.revision:
673 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000674 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000675 if revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000676 forced_revision = True
677 url = '%s@%s' % (url, revision)
msb@chromium.org770ff9e2009-09-23 17:18:18 +0000678 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000679
680 if not os.path.exists(checkout_path):
681 # We need to checkout.
682 command = ['checkout', url, checkout_path]
683 if revision:
684 command.extend(['--revision', str(revision)])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000685 self.RunAndGetFileList(options, command, self._root_dir, file_list)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000686 return
687
688 # Get the existing scm url and the revision number of the current checkout.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000689 from_info = self.CaptureInfo(os.path.join(checkout_path, '.'), '.')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000690 if not from_info:
691 raise gclient_utils.Error("Can't update/checkout %r if an unversioned "
692 "directory is present. Delete the directory "
693 "and try again." %
694 checkout_path)
695
maruel@chromium.org7753d242009-10-07 17:40:24 +0000696 if options.manually_grab_svn_rev:
697 # Retrieve the current HEAD version because svn is slow at null updates.
698 if not revision:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000699 from_info_live = self.CaptureInfo(from_info['URL'], '.')
maruel@chromium.org7753d242009-10-07 17:40:24 +0000700 revision = str(from_info_live['Revision'])
701 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000702
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000703 if from_info['URL'] != base_url:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000704 to_info = self.CaptureInfo(url, '.')
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +0000705 if not to_info.get('Repository Root') or not to_info.get('UUID'):
706 # The url is invalid or the server is not accessible, it's safer to bail
707 # out right now.
708 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000709 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
710 and (from_info['UUID'] == to_info['UUID']))
711 if can_switch:
712 print("\n_____ relocating %s to a new checkout" % self.relpath)
713 # We have different roots, so check if we can switch --relocate.
714 # Subversion only permits this if the repository UUIDs match.
715 # Perform the switch --relocate, then rewrite the from_url
716 # to reflect where we "are now." (This is the same way that
717 # Subversion itself handles the metadata when switch --relocate
718 # is used.) This makes the checks below for whether we
719 # can update to a revision or have to switch to a different
720 # branch work as expected.
721 # TODO(maruel): TEST ME !
722 command = ["switch", "--relocate",
723 from_info['Repository Root'],
724 to_info['Repository Root'],
725 self.relpath]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000726 self.Run(command, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000727 from_info['URL'] = from_info['URL'].replace(
728 from_info['Repository Root'],
729 to_info['Repository Root'])
730 else:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000731 if self.CaptureStatus(checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000732 raise gclient_utils.Error("Can't switch the checkout to %s; UUID "
733 "don't match and there is local changes "
734 "in %s. Delete the directory and "
735 "try again." % (url, checkout_path))
736 # Ok delete it.
737 print("\n_____ switching %s to a new checkout" % self.relpath)
bradnelson@google.com8f9c69f2009-09-17 00:48:28 +0000738 gclient_utils.RemoveDirectory(checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000739 # We need to checkout.
740 command = ['checkout', url, checkout_path]
741 if revision:
742 command.extend(['--revision', str(revision)])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000743 self.RunAndGetFileList(options, command, self._root_dir, file_list)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000744 return
745
746
747 # If the provided url has a revision number that matches the revision
748 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +0000749 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000750 if options.verbose or not forced_revision:
751 print("\n_____ %s%s" % (self.relpath, rev_str))
752 return
753
754 command = ["update", checkout_path]
755 if revision:
756 command.extend(['--revision', str(revision)])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000757 self.RunAndGetFileList(options, command, self._root_dir, file_list)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000758
759 def revert(self, options, args, file_list):
760 """Reverts local modifications. Subversion specific.
761
762 All reverted files will be appended to file_list, even if Subversion
763 doesn't know about them.
764 """
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000765 __pychecker__ = 'unusednames=args'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000766 path = os.path.join(self._root_dir, self.relpath)
767 if not os.path.isdir(path):
768 # svn revert won't work if the directory doesn't exist. It needs to
769 # checkout instead.
770 print("\n_____ %s is missing, synching instead" % self.relpath)
771 # Don't reuse the args.
772 return self.update(options, [], file_list)
773
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000774 for file_status in self.CaptureStatus(path):
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000775 file_path = os.path.join(path, file_status[1])
776 if file_status[0][0] == 'X':
maruel@chromium.org754960e2009-09-21 12:31:05 +0000777 # Ignore externals.
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000778 logging.info('Ignoring external %s' % file_path)
maruel@chromium.org754960e2009-09-21 12:31:05 +0000779 continue
780
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000781 if logging.getLogger().isEnabledFor(logging.INFO):
782 logging.info('%s%s' % (file[0], file[1]))
783 else:
784 print(file_path)
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000785 if file_status[0].isspace():
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000786 logging.error('No idea what is the status of %s.\n'
787 'You just found a bug in gclient, please ping '
788 'maruel@chromium.org ASAP!' % file_path)
789 # svn revert is really stupid. It fails on inconsistent line-endings,
790 # on switched directories, etc. So take no chance and delete everything!
791 try:
792 if not os.path.exists(file_path):
793 pass
maruel@chromium.orgd2e78ff2010-01-11 20:37:19 +0000794 elif os.path.isfile(file_path) or os.path.islink(file_path):
maruel@chromium.org754960e2009-09-21 12:31:05 +0000795 logging.info('os.remove(%s)' % file_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000796 os.remove(file_path)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000797 elif os.path.isdir(file_path):
maruel@chromium.org754960e2009-09-21 12:31:05 +0000798 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
bradnelson@google.com8f9c69f2009-09-17 00:48:28 +0000799 gclient_utils.RemoveDirectory(file_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000800 else:
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000801 logging.error('no idea what is %s.\nYou just found a bug in gclient'
802 ', please ping maruel@chromium.org ASAP!' % file_path)
803 except EnvironmentError:
804 logging.error('Failed to remove %s.' % file_path)
805
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000806 try:
807 # svn revert is so broken we don't even use it. Using
808 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000809 self.RunAndGetFileList(options, ['update', '--revision', 'BASE'], path,
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000810 file_list)
811 except OSError, e:
812 # Maybe the directory disapeared meanwhile. We don't want it to throw an
813 # exception.
814 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000815
msb@chromium.org0f282062009-11-06 20:14:02 +0000816 def revinfo(self, options, args, file_list):
817 """Display revision"""
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000818 __pychecker__ = 'unusednames=args,file_list,options'
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000819 return self.CaptureHeadRevision(self.url)
msb@chromium.org0f282062009-11-06 20:14:02 +0000820
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000821 def runhooks(self, options, args, file_list):
822 self.status(options, args, file_list)
823
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000824 def status(self, options, args, file_list):
825 """Display status information."""
826 path = os.path.join(self._root_dir, self.relpath)
827 command = ['status']
828 command.extend(args)
829 if not os.path.isdir(path):
830 # svn status won't work if the directory doesn't exist.
831 print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
832 "does not exist."
833 % (' '.join(command), path))
834 # There's no file list to retrieve.
835 else:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000836 self.RunAndGetFileList(options, command, path, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +0000837
838 def FullUrlForRelativeUrl(self, url):
839 # Find the forth '/' and strip from there. A bit hackish.
840 return '/'.join(self.url.split('/')[:4]) + url