blob: 36f043b3c089068cd75e83ac7e55c7efc9b8c078 [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.
291 self._AttemptRebase('origin', files=files, verbose=options.verbose,
292 printed_path=printed_path)
293 printed_path = True
294 elif rev_type is 'hash':
295 # case 2
296 self._AttemptRebase(upstream_branch, files, verbose=options.verbose,
297 newbase=revision, printed_path=printed_path)
298 printed_path = True
299 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
300 # case 4
301 new_base = revision.replace('heads', 'remotes/origin')
302 if not printed_path:
303 print("\n_____ %s%s" % (self.relpath, rev_str))
304 switch_error = ("Switching upstream branch from %s to %s\n"
305 % (upstream_branch, new_base) +
306 "Please merge or rebase manually:\n" +
307 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
308 "OR git checkout -b <some new branch> %s" % new_base)
309 raise gclient_utils.Error(switch_error)
310 else:
311 # case 3 - the default case
312 files = self._Run(['diff', upstream_branch, '--name-only']).split()
313 if verbose:
314 print "Trying fast-forward merge to branch : %s" % upstream_branch
315 try:
316 merge_output, merge_err = self.Capture(['merge', '--ff-only',
317 upstream_branch],
318 self.checkout_path,
319 print_error=False)
320 except gclient_utils.CheckCallError, e:
321 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
322 if not printed_path:
323 print("\n_____ %s%s" % (self.relpath, rev_str))
324 printed_path = True
325 while True:
326 try:
327 action = str(raw_input("Cannot fast-forward merge, attempt to "
328 "rebase? (y)es / (q)uit / (s)kip : "))
329 except ValueError:
330 gclient_utils.Error('Invalid Character')
331 continue
332 if re.match(r'yes|y', action, re.I):
333 self._AttemptRebase(upstream_branch, files,
334 verbose=options.verbose,
335 printed_path=printed_path)
336 printed_path = True
337 break
338 elif re.match(r'quit|q', action, re.I):
339 raise gclient_utils.Error("Can't fast-forward, please merge or "
340 "rebase manually.\n"
341 "cd %s && git " % self.checkout_path
342 + "rebase %s" % upstream_branch)
343 elif re.match(r'skip|s', action, re.I):
344 print "Skipping %s" % self.relpath
345 return
346 else:
347 print "Input not recognized"
348 elif re.match("error: Your local changes to '.*' would be "
349 "overwritten by merge. Aborting.\nPlease, commit your "
350 "changes or stash them before you can merge.\n",
351 e.stderr):
352 if not printed_path:
353 print("\n_____ %s%s" % (self.relpath, rev_str))
354 printed_path = True
355 raise gclient_utils.Error(e.stderr)
356 else:
357 # Some other problem happened with the merge
358 logging.error("Error during fast-forward merge in %s!" % self.relpath)
359 print e.stderr
360 raise
361 else:
362 # Fast-forward merge was successful
363 if not re.match('Already up-to-date.', merge_output) or verbose:
364 if not printed_path:
365 print("\n_____ %s%s" % (self.relpath, rev_str))
366 printed_path = True
367 print merge_output.strip()
368 if merge_err:
369 print "Merge produced error output:\n%s" % merge_err.strip()
370 if not verbose:
371 # Make the output a little prettier. It's nice to have some
372 # whitespace between projects when syncing.
373 print ""
374
375 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000376
377 # If the rebase generated a conflict, abort and ask user to fix
378 if self._GetCurrentBranch() is None:
379 raise gclient_utils.Error('\n____ %s%s\n'
380 '\nConflict while rebasing this branch.\n'
381 'Fix the conflict and run gclient again.\n'
382 'See man git-rebase for details.\n'
383 % (self.relpath, rev_str))
384
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000385 if verbose:
386 print "Checked out revision %s" % self.revinfo(options, (), None)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000387
388 def revert(self, options, args, file_list):
389 """Reverts local modifications.
390
391 All reverted files will be appended to file_list.
392 """
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000393 __pychecker__ = 'unusednames=args'
msb@chromium.org260c6532009-10-28 03:22:35 +0000394 path = os.path.join(self._root_dir, self.relpath)
395 if not os.path.isdir(path):
396 # revert won't work if the directory doesn't exist. It needs to
397 # checkout instead.
398 print("\n_____ %s is missing, synching instead" % self.relpath)
399 # Don't reuse the args.
400 return self.update(options, [], file_list)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000401 merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
402 files = self._Run(['diff', merge_base, '--name-only']).split()
403 self._Run(['reset', '--hard', merge_base], redirect_stdout=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000404 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
405
msb@chromium.org0f282062009-11-06 20:14:02 +0000406 def revinfo(self, options, args, file_list):
407 """Display revision"""
msb@chromium.org3904caa2010-01-25 17:37:46 +0000408 __pychecker__ = 'unusednames=options,args,file_list'
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000409 return self._Run(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000410
msb@chromium.orge28e4982009-09-25 20:51:45 +0000411 def runhooks(self, options, args, file_list):
412 self.status(options, args, file_list)
413
414 def status(self, options, args, file_list):
415 """Display status information."""
msb@chromium.org3904caa2010-01-25 17:37:46 +0000416 __pychecker__ = 'unusednames=options,args'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000417 if not os.path.isdir(self.checkout_path):
418 print('\n________ couldn\'t run status in %s:\nThe directory '
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000419 'does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000420 else:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000421 merge_base = self._Run(['merge-base', 'HEAD', 'origin'])
422 self._Run(['diff', '--name-status', merge_base], redirect_stdout=False)
423 files = self._Run(['diff', '--name-only', merge_base]).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000424 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
425
msb@chromium.orge6f78352010-01-13 17:05:33 +0000426 def FullUrlForRelativeUrl(self, url):
427 # Strip from last '/'
428 # Equivalent to unix basename
429 base_url = self.url
430 return base_url[:base_url.rfind('/')] + url
431
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000432 def _Clone(self, rev_type, revision, url, verbose=False):
433 """Clone a git repository from the given URL.
434
435 Once we've cloned the repo, we checkout a working branch based off the
436 specified revision."""
437 if not verbose:
438 # git clone doesn't seem to insert a newline properly before printing
439 # to stdout
440 print ""
441
442 clone_cmd = ['clone']
443 if verbose:
444 clone_cmd.append('--verbose')
445 clone_cmd.extend([url, self.checkout_path])
446
447 for i in range(3):
448 try:
449 self._Run(clone_cmd, cwd=self._root_dir, redirect_stdout=False)
450 break
451 except gclient_utils.Error, e:
452 # TODO(maruel): Hackish, should be fixed by moving _Run() to
453 # CheckCall().
454 # Too bad we don't have access to the actual output.
455 # We should check for "transfer closed with NNN bytes remaining to
456 # read". In the meantime, just make sure .git exists.
457 if (e.args[0] == 'git command clone returned 128' and
458 os.path.exists(os.path.join(self.checkout_path, '.git'))):
459 print str(e)
460 print "Retrying..."
461 continue
462 raise e
463
464 if rev_type is "branch":
465 short_rev = revision.replace('refs/heads/', '')
466 new_branch = revision.replace('heads', 'remotes/origin')
467 elif revision.startswith('refs/tags/'):
468 short_rev = revision.replace('refs/tags/', '')
469 new_branch = revision
470 else:
471 # revision is a specific sha1 hash
472 short_rev = revision
473 new_branch = revision
474
475 cur_branch = self._GetCurrentBranch()
476 if cur_branch != short_rev:
477 self._Run(['checkout', '-b', short_rev, new_branch],
478 redirect_stdout=False)
479
480 def _AttemptRebase(self, upstream, files, verbose=False, newbase=None,
481 branch=None, printed_path=False):
482 """Attempt to rebase onto either upstream or, if specified, newbase."""
483 files.extend(self._Run(['diff', upstream, '--name-only']).split())
484 revision = upstream
485 if newbase:
486 revision = newbase
487 if not printed_path:
488 print "\n_____ %s : Attempting rebase onto %s..." % (self.relpath,
489 revision)
490 printed_path = True
491 else:
492 print "Attempting rebase onto %s..." % revision
493
494 # Build the rebase command here using the args
495 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
496 rebase_cmd = ['rebase']
497 if verbose:
498 rebase_cmd.append('--verbose')
499 if newbase:
500 rebase_cmd.extend(['--onto', newbase])
501 rebase_cmd.append(upstream)
502 if branch:
503 rebase_cmd.append(branch)
504
505 try:
506 rebase_output, rebase_err = self.Capture(rebase_cmd, self.checkout_path,
507 print_error=False)
508 except gclient_utils.CheckCallError, e:
509 if re.match(r'cannot rebase: you have unstaged changes', e.stderr) or \
510 re.match(r'cannot rebase: your index contains uncommitted changes',
511 e.stderr):
512 while True:
513 rebase_action = str(raw_input("Cannot rebase because of unstaged "
514 "changes.\n'git reset --hard HEAD' ?\n"
515 "WARNING: destroys any uncommitted "
516 "work in your current branch!"
517 " (y)es / (q)uit / (s)how : "))
518 if re.match(r'yes|y', rebase_action, re.I):
519 self._Run(['reset', '--hard', 'HEAD'], redirect_stdout=False)
520 # Should this be recursive?
521 rebase_output, rebase_err = self.Capture(rebase_cmd,
522 self.checkout_path)
523 break
524 elif re.match(r'quit|q', rebase_action, re.I):
525 raise gclient_utils.Error("Please merge or rebase manually\n"
526 "cd %s && git " % self.checkout_path
527 + "%s" % ' '.join(rebase_cmd))
528 elif re.match(r'show|s', rebase_action, re.I):
529 print "\n%s" % e.stderr.strip()
530 continue
531 else:
532 gclient_utils.Error("Input not recognized")
533 continue
534 elif re.search(r'^CONFLICT', e.stdout, re.M):
535 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
536 "Fix the conflict and run gclient again.\n"
537 "See 'man git-rebase' for details.\n")
538 else:
539 print e.stdout.strip()
540 print "Rebase produced error output:\n%s" % e.stderr.strip()
541 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
542 "manually.\ncd %s && git " %
543 self.checkout_path
544 + "%s" % ' '.join(rebase_cmd))
545
546 print rebase_output.strip()
547 if rebase_err:
548 print "Rebase produced error output:\n%s" % rebase_err.strip()
549 if not verbose:
550 # Make the output a little prettier. It's nice to have some
551 # whitespace between projects when syncing.
552 print ""
553
msb@chromium.org923a0372009-12-11 20:42:43 +0000554 def _CheckMinVersion(self, min_version):
msb@chromium.org83376f22009-12-11 22:25:31 +0000555 def only_int(val):
556 if val.isdigit():
557 return int(val)
558 else:
559 return 0
msb@chromium.orgba9b2392009-12-11 23:30:13 +0000560 version = self._Run(['--version'], cwd='.').split()[-1]
msb@chromium.org83376f22009-12-11 22:25:31 +0000561 version_list = map(only_int, version.split('.'))
msb@chromium.org923a0372009-12-11 20:42:43 +0000562 min_version_list = map(int, min_version.split('.'))
563 for min_ver in min_version_list:
564 ver = version_list.pop(0)
565 if min_ver > ver:
566 raise gclient_utils.Error('git version %s < minimum required %s' %
567 (version, min_version))
568 elif min_ver < ver:
569 return
570
msb@chromium.org5bde4852009-12-14 16:47:12 +0000571 def _GetCurrentBranch(self):
572 # Returns name of current branch
573 # Returns None if inside a (no branch)
574 tokens = self._Run(['branch']).split()
575 branch = tokens[tokens.index('*') + 1]
576 if branch == '(no':
577 return None
578 return branch
579
maruel@chromium.org2de10252010-02-08 01:10:39 +0000580 def _Run(self, args, cwd=None, redirect_stdout=True):
581 # TODO(maruel): Merge with Capture or better gclient_utils.CheckCall().
maruel@chromium.orgffe96f02009-12-09 18:39:15 +0000582 if cwd is None:
583 cwd = self.checkout_path
maruel@chromium.org2de10252010-02-08 01:10:39 +0000584 stdout = None
msb@chromium.orge8e60e52009-11-02 21:50:56 +0000585 if redirect_stdout:
maruel@chromium.org2de10252010-02-08 01:10:39 +0000586 stdout = subprocess.PIPE
msb@chromium.orge28e4982009-09-25 20:51:45 +0000587 if cwd == None:
588 cwd = self.checkout_path
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000589 cmd = [self.COMMAND]
msb@chromium.orge28e4982009-09-25 20:51:45 +0000590 cmd.extend(args)
maruel@chromium.orgf3909bf2010-01-08 01:14:51 +0000591 logging.debug(cmd)
592 try:
593 sp = subprocess.Popen(cmd, cwd=cwd, stdout=stdout)
594 output = sp.communicate()[0]
595 except OSError:
596 raise gclient_utils.Error("git command '%s' failed to run." %
597 ' '.join(cmd) + "\nCheck that you have git installed.")
maruel@chromium.org2de10252010-02-08 01:10:39 +0000598 if sp.returncode:
msb@chromium.orge28e4982009-09-25 20:51:45 +0000599 raise gclient_utils.Error('git command %s returned %d' %
600 (args[0], sp.returncode))
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000601 if output is not None:
msb@chromium.orge8e60e52009-11-02 21:50:56 +0000602 return output.strip()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000603
604
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000605class SVNWrapper(SCMWrapper, scm.SVN):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000606 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000607
608 def cleanup(self, options, args, file_list):
609 """Cleanup working copy."""
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000610 __pychecker__ = 'unusednames=file_list,options'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000611 command = ['cleanup']
612 command.extend(args)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000613 self.Run(command, os.path.join(self._root_dir, self.relpath))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000614
615 def diff(self, options, args, file_list):
616 # NOTE: This function does not currently modify file_list.
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000617 __pychecker__ = 'unusednames=file_list,options'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000618 command = ['diff']
619 command.extend(args)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000620 self.Run(command, os.path.join(self._root_dir, self.relpath))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000621
622 def export(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000623 """Export a clean directory tree into the given path."""
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000624 __pychecker__ = 'unusednames=file_list,options'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000625 assert len(args) == 1
626 export_path = os.path.abspath(os.path.join(args[0], self.relpath))
627 try:
628 os.makedirs(export_path)
629 except OSError:
630 pass
631 assert os.path.exists(export_path)
632 command = ['export', '--force', '.']
633 command.append(export_path)
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000634 self.Run(command, os.path.join(self._root_dir, self.relpath))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000635
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000636 def pack(self, options, args, file_list):
637 """Generates a patch file which can be applied to the root of the
638 repository."""
639 __pychecker__ = 'unusednames=file_list,options'
640 path = os.path.join(self._root_dir, self.relpath)
641 command = ['diff']
642 command.extend(args)
643
644 filterer = DiffFilterer(self.relpath)
645 self.RunAndFilterOutput(command, path, False, False, filterer.Filter)
646
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000647 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000648 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000649
650 All updated files will be appended to file_list.
651
652 Raises:
653 Error: if can't get URL for relative path.
654 """
655 # Only update if git is not controlling the directory.
656 checkout_path = os.path.join(self._root_dir, self.relpath)
657 git_path = os.path.join(self._root_dir, self.relpath, '.git')
658 if os.path.exists(git_path):
659 print("________ found .git directory; skipping %s" % self.relpath)
660 return
661
662 if args:
663 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
664
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000665 url, revision = gclient_utils.SplitUrlRevision(self.url)
666 base_url = url
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000667 forced_revision = False
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000668 rev_str = ""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000669 if options.revision:
670 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000671 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000672 if revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000673 forced_revision = True
674 url = '%s@%s' % (url, revision)
msb@chromium.org770ff9e2009-09-23 17:18:18 +0000675 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000676
677 if not os.path.exists(checkout_path):
678 # We need to checkout.
679 command = ['checkout', url, checkout_path]
680 if revision:
681 command.extend(['--revision', str(revision)])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000682 self.RunAndGetFileList(options, command, self._root_dir, file_list)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000683 return
684
685 # Get the existing scm url and the revision number of the current checkout.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000686 from_info = self.CaptureInfo(os.path.join(checkout_path, '.'), '.')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000687 if not from_info:
688 raise gclient_utils.Error("Can't update/checkout %r if an unversioned "
689 "directory is present. Delete the directory "
690 "and try again." %
691 checkout_path)
692
maruel@chromium.org7753d242009-10-07 17:40:24 +0000693 if options.manually_grab_svn_rev:
694 # Retrieve the current HEAD version because svn is slow at null updates.
695 if not revision:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000696 from_info_live = self.CaptureInfo(from_info['URL'], '.')
maruel@chromium.org7753d242009-10-07 17:40:24 +0000697 revision = str(from_info_live['Revision'])
698 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000699
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000700 if from_info['URL'] != base_url:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000701 to_info = self.CaptureInfo(url, '.')
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +0000702 if not to_info.get('Repository Root') or not to_info.get('UUID'):
703 # The url is invalid or the server is not accessible, it's safer to bail
704 # out right now.
705 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000706 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
707 and (from_info['UUID'] == to_info['UUID']))
708 if can_switch:
709 print("\n_____ relocating %s to a new checkout" % self.relpath)
710 # We have different roots, so check if we can switch --relocate.
711 # Subversion only permits this if the repository UUIDs match.
712 # Perform the switch --relocate, then rewrite the from_url
713 # to reflect where we "are now." (This is the same way that
714 # Subversion itself handles the metadata when switch --relocate
715 # is used.) This makes the checks below for whether we
716 # can update to a revision or have to switch to a different
717 # branch work as expected.
718 # TODO(maruel): TEST ME !
719 command = ["switch", "--relocate",
720 from_info['Repository Root'],
721 to_info['Repository Root'],
722 self.relpath]
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000723 self.Run(command, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000724 from_info['URL'] = from_info['URL'].replace(
725 from_info['Repository Root'],
726 to_info['Repository Root'])
727 else:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000728 if self.CaptureStatus(checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000729 raise gclient_utils.Error("Can't switch the checkout to %s; UUID "
730 "don't match and there is local changes "
731 "in %s. Delete the directory and "
732 "try again." % (url, checkout_path))
733 # Ok delete it.
734 print("\n_____ switching %s to a new checkout" % self.relpath)
bradnelson@google.com8f9c69f2009-09-17 00:48:28 +0000735 gclient_utils.RemoveDirectory(checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000736 # We need to checkout.
737 command = ['checkout', url, checkout_path]
738 if revision:
739 command.extend(['--revision', str(revision)])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000740 self.RunAndGetFileList(options, command, self._root_dir, file_list)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000741 return
742
743
744 # If the provided url has a revision number that matches the revision
745 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +0000746 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000747 if options.verbose or not forced_revision:
748 print("\n_____ %s%s" % (self.relpath, rev_str))
749 return
750
751 command = ["update", checkout_path]
752 if revision:
753 command.extend(['--revision', str(revision)])
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000754 self.RunAndGetFileList(options, command, self._root_dir, file_list)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000755
756 def revert(self, options, args, file_list):
757 """Reverts local modifications. Subversion specific.
758
759 All reverted files will be appended to file_list, even if Subversion
760 doesn't know about them.
761 """
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000762 __pychecker__ = 'unusednames=args'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000763 path = os.path.join(self._root_dir, self.relpath)
764 if not os.path.isdir(path):
765 # svn revert won't work if the directory doesn't exist. It needs to
766 # checkout instead.
767 print("\n_____ %s is missing, synching instead" % self.relpath)
768 # Don't reuse the args.
769 return self.update(options, [], file_list)
770
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000771 for file_status in self.CaptureStatus(path):
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000772 file_path = os.path.join(path, file_status[1])
773 if file_status[0][0] == 'X':
maruel@chromium.org754960e2009-09-21 12:31:05 +0000774 # Ignore externals.
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000775 logging.info('Ignoring external %s' % file_path)
maruel@chromium.org754960e2009-09-21 12:31:05 +0000776 continue
777
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000778 if logging.getLogger().isEnabledFor(logging.INFO):
779 logging.info('%s%s' % (file[0], file[1]))
780 else:
781 print(file_path)
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000782 if file_status[0].isspace():
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000783 logging.error('No idea what is the status of %s.\n'
784 'You just found a bug in gclient, please ping '
785 'maruel@chromium.org ASAP!' % file_path)
786 # svn revert is really stupid. It fails on inconsistent line-endings,
787 # on switched directories, etc. So take no chance and delete everything!
788 try:
789 if not os.path.exists(file_path):
790 pass
maruel@chromium.orgd2e78ff2010-01-11 20:37:19 +0000791 elif os.path.isfile(file_path) or os.path.islink(file_path):
maruel@chromium.org754960e2009-09-21 12:31:05 +0000792 logging.info('os.remove(%s)' % file_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000793 os.remove(file_path)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000794 elif os.path.isdir(file_path):
maruel@chromium.org754960e2009-09-21 12:31:05 +0000795 logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
bradnelson@google.com8f9c69f2009-09-17 00:48:28 +0000796 gclient_utils.RemoveDirectory(file_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000797 else:
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000798 logging.error('no idea what is %s.\nYou just found a bug in gclient'
799 ', please ping maruel@chromium.org ASAP!' % file_path)
800 except EnvironmentError:
801 logging.error('Failed to remove %s.' % file_path)
802
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000803 try:
804 # svn revert is so broken we don't even use it. Using
805 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000806 self.RunAndGetFileList(options, ['update', '--revision', 'BASE'], path,
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000807 file_list)
808 except OSError, e:
809 # Maybe the directory disapeared meanwhile. We don't want it to throw an
810 # exception.
811 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000812
msb@chromium.org0f282062009-11-06 20:14:02 +0000813 def revinfo(self, options, args, file_list):
814 """Display revision"""
maruel@chromium.orge3608df2009-11-10 20:22:57 +0000815 __pychecker__ = 'unusednames=args,file_list,options'
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000816 return self.CaptureHeadRevision(self.url)
msb@chromium.org0f282062009-11-06 20:14:02 +0000817
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000818 def runhooks(self, options, args, file_list):
819 self.status(options, args, file_list)
820
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000821 def status(self, options, args, file_list):
822 """Display status information."""
823 path = os.path.join(self._root_dir, self.relpath)
824 command = ['status']
825 command.extend(args)
826 if not os.path.isdir(path):
827 # svn status won't work if the directory doesn't exist.
828 print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
829 "does not exist."
830 % (' '.join(command), path))
831 # There's no file list to retrieve.
832 else:
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +0000833 self.RunAndGetFileList(options, command, path, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +0000834
835 def FullUrlForRelativeUrl(self, url):
836 # Find the forth '/' and strip from there. A bit hackish.
837 return '/'.join(self.url.split('/')[:4]) + url