blob: 1c3eb79492e42d1457385915ba5b6eba9f3306db [file] [log] [blame]
[email protected]93567042012-02-15 01:02:261# Copyright (c) 2012 The Chromium Authors. All rights reserved.
[email protected]5aeb7dd2009-11-17 18:09:012# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
[email protected]5f3eee32009-09-17 00:34:304
[email protected]d5800f12009-11-12 20:03:435"""Gclient-specific SCM-specific operations."""
[email protected]5f3eee32009-09-17 00:34:306
[email protected]754960e2009-09-21 12:31:057import logging
[email protected]5f3eee32009-09-17 00:34:308import os
[email protected]ee4071d2009-12-22 22:25:379import posixpath
[email protected]5f3eee32009-09-17 00:34:3010import re
[email protected]90541732011-04-01 17:54:1811import sys
[email protected]fd876172010-04-30 14:01:0512import time
[email protected]5f3eee32009-09-17 00:34:3013
14import gclient_utils
[email protected]31cb48a2011-04-04 18:01:3615import scm
16import subprocess2
[email protected]5f3eee32009-09-17 00:34:3017
18
[email protected]71cbb502013-04-19 23:30:1519THIS_FILE_PATH = os.path.abspath(__file__)
20
21
[email protected]306080c2012-05-04 13:11:2922class DiffFiltererWrapper(object):
23 """Simple base class which tracks which file is being diffed and
[email protected]ee4071d2009-12-22 22:25:3724 replaces instances of its file name in the original and
[email protected]d6504212010-01-13 17:34:3125 working copy lines of the svn/git diff output."""
[email protected]306080c2012-05-04 13:11:2926 index_string = None
[email protected]ee4071d2009-12-22 22:25:3727 original_prefix = "--- "
28 working_prefix = "+++ "
29
[email protected]77e4eca2010-09-21 13:23:0730 def __init__(self, relpath):
[email protected]ee4071d2009-12-22 22:25:3731 # Note that we always use '/' as the path separator to be
32 # consistent with svn's cygwin-style output on Windows
33 self._relpath = relpath.replace("\\", "/")
[email protected]306080c2012-05-04 13:11:2934 self._current_file = None
[email protected]ee4071d2009-12-22 22:25:3735
[email protected]6e29d572010-06-04 17:32:2036 def SetCurrentFile(self, current_file):
37 self._current_file = current_file
[email protected]306080c2012-05-04 13:11:2938
[email protected]3830a672013-02-19 20:15:1439 @property
40 def _replacement_file(self):
[email protected]306080c2012-05-04 13:11:2941 return posixpath.join(self._relpath, self._current_file)
[email protected]ee4071d2009-12-22 22:25:3742
[email protected]f5d37bf2010-09-02 00:50:3443 def _Replace(self, line):
44 return line.replace(self._current_file, self._replacement_file)
[email protected]ee4071d2009-12-22 22:25:3745
46 def Filter(self, line):
47 if (line.startswith(self.index_string)):
48 self.SetCurrentFile(line[len(self.index_string):])
[email protected]f5d37bf2010-09-02 00:50:3449 line = self._Replace(line)
[email protected]ee4071d2009-12-22 22:25:3750 else:
51 if (line.startswith(self.original_prefix) or
52 line.startswith(self.working_prefix)):
[email protected]f5d37bf2010-09-02 00:50:3453 line = self._Replace(line)
[email protected]77e4eca2010-09-21 13:23:0754 print(line)
[email protected]ee4071d2009-12-22 22:25:3755
56
[email protected]306080c2012-05-04 13:11:2957class SvnDiffFilterer(DiffFiltererWrapper):
58 index_string = "Index: "
59
60
61class GitDiffFilterer(DiffFiltererWrapper):
62 index_string = "diff --git "
63
64 def SetCurrentFile(self, current_file):
65 # Get filename by parsing "a/<filename> b/<filename>"
66 self._current_file = current_file[:(len(current_file)/2)][2:]
67
68 def _Replace(self, line):
69 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
70
71
[email protected]18fa4542013-05-21 13:30:4672def ask_for_data(prompt, options):
73 if options.jobs > 1:
74 raise gclient_utils.Error("Background task requires input. Rerun "
75 "gclient with --jobs=1 so that\n"
76 "interaction is possible.")
[email protected]90541732011-04-01 17:54:1877 try:
78 return raw_input(prompt)
79 except KeyboardInterrupt:
80 # Hide the exception.
81 sys.exit(1)
82
83
[email protected]5f3eee32009-09-17 00:34:3084### SCM abstraction layer
85
[email protected]cb5442b2009-09-22 16:51:2486# Factory Method for SCM wrapper creation
87
[email protected]9eda4112010-06-11 18:56:1088def GetScmName(url):
89 if url:
90 url, _ = gclient_utils.SplitUrlRevision(url)
91 if (url.startswith('git://') or url.startswith('ssh://') or
[email protected]4e075672011-11-21 16:35:0892 url.startswith('git+http://') or url.startswith('git+https://') or
[email protected]9eda4112010-06-11 18:56:1093 url.endswith('.git')):
94 return 'git'
[email protected]b74dca22010-06-11 20:10:4095 elif (url.startswith('http://') or url.startswith('https://') or
[email protected]54a07a22010-06-14 19:07:3996 url.startswith('svn://') or url.startswith('svn+ssh://')):
[email protected]9eda4112010-06-11 18:56:1097 return 'svn'
98 return None
99
100
101def CreateSCM(url, root_dir=None, relpath=None):
102 SCM_MAP = {
[email protected]cb5442b2009-09-22 16:51:24103 'svn' : SVNWrapper,
[email protected]e28e4982009-09-25 20:51:45104 'git' : GitWrapper,
[email protected]cb5442b2009-09-22 16:51:24105 }
[email protected]e28e4982009-09-25 20:51:45106
[email protected]9eda4112010-06-11 18:56:10107 scm_name = GetScmName(url)
108 if not scm_name in SCM_MAP:
109 raise gclient_utils.Error('No SCM found for url %s' % url)
[email protected]9e3e82c2012-04-18 12:55:43110 scm_class = SCM_MAP[scm_name]
111 if not scm_class.BinaryExists():
112 raise gclient_utils.Error('%s command not found' % scm_name)
113 return scm_class(url, root_dir, relpath)
[email protected]cb5442b2009-09-22 16:51:24114
115
116# SCMWrapper base class
117
[email protected]5f3eee32009-09-17 00:34:30118class SCMWrapper(object):
119 """Add necessary glue between all the supported SCM.
120
[email protected]d6504212010-01-13 17:34:31121 This is the abstraction layer to bind to different SCM.
122 """
[email protected]12b07e72013-05-03 22:06:34123 nag_timer = 30
124 nag_max = 3
125
[email protected]9eda4112010-06-11 18:56:10126 def __init__(self, url=None, root_dir=None, relpath=None):
[email protected]5f3eee32009-09-17 00:34:30127 self.url = url
[email protected]5e73b0c2009-09-18 19:47:48128 self._root_dir = root_dir
129 if self._root_dir:
130 self._root_dir = self._root_dir.replace('/', os.sep)
131 self.relpath = relpath
132 if self.relpath:
133 self.relpath = self.relpath.replace('/', os.sep)
[email protected]e28e4982009-09-25 20:51:45134 if self.relpath and self._root_dir:
135 self.checkout_path = os.path.join(self._root_dir, self.relpath)
[email protected]5f3eee32009-09-17 00:34:30136
[email protected]5f3eee32009-09-17 00:34:30137 def RunCommand(self, command, options, args, file_list=None):
138 # file_list will have all files that are modified appended to it.
[email protected]de754ac2009-09-17 18:04:50139 if file_list is None:
140 file_list = []
[email protected]5f3eee32009-09-17 00:34:30141
[email protected]6e043f72011-05-02 07:24:32142 commands = ['cleanup', 'update', 'updatesingle', 'revert',
[email protected]4b5b1772010-04-08 01:52:56143 'revinfo', 'status', 'diff', 'pack', 'runhooks']
[email protected]5f3eee32009-09-17 00:34:30144
145 if not command in commands:
146 raise gclient_utils.Error('Unknown command %s' % command)
147
[email protected]cb5442b2009-09-22 16:51:24148 if not command in dir(self):
[email protected]ee4071d2009-12-22 22:25:37149 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
[email protected]9eda4112010-06-11 18:56:10150 command, self.__class__.__name__))
[email protected]cb5442b2009-09-22 16:51:24151
152 return getattr(self, command)(options, args, file_list)
153
154
[email protected]55e724e2010-03-11 19:36:49155class GitWrapper(SCMWrapper):
[email protected]e28e4982009-09-25 20:51:45156 """Wrapper for Git"""
157
[email protected]4e075672011-11-21 16:35:08158 def __init__(self, url=None, root_dir=None, relpath=None):
159 """Removes 'git+' fake prefix from git URL."""
160 if url.startswith('git+http://') or url.startswith('git+https://'):
161 url = url[4:]
162 SCMWrapper.__init__(self, url, root_dir, relpath)
163
[email protected]9e3e82c2012-04-18 12:55:43164 @staticmethod
165 def BinaryExists():
166 """Returns true if the command exists."""
167 try:
168 # We assume git is newer than 1.7. See: crbug.com/114483
169 result, version = scm.GIT.AssertVersion('1.7')
170 if not result:
171 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
172 return result
173 except OSError:
174 return False
175
[email protected]eaab7842011-04-28 09:07:58176 def GetRevisionDate(self, revision):
177 """Returns the given revision's date in ISO-8601 format (which contains the
178 time zone)."""
179 # TODO(floitsch): get the time-stamp of the given revision and not just the
180 # time-stamp of the currently checked out revision.
181 return self._Capture(['log', '-n', '1', '--format=%ai'])
182
[email protected]6e29d572010-06-04 17:32:20183 @staticmethod
184 def cleanup(options, args, file_list):
[email protected]d8a63782010-01-25 17:47:05185 """'Cleanup' the repo.
186
187 There's no real git equivalent for the svn cleanup command, do a no-op.
188 """
[email protected]e28e4982009-09-25 20:51:45189
190 def diff(self, options, args, file_list):
[email protected]6cafa132010-09-07 14:17:26191 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
[email protected]37e89872010-09-07 16:11:33192 self._Run(['diff', merge_base], options)
[email protected]e28e4982009-09-25 20:51:45193
[email protected]ee4071d2009-12-22 22:25:37194 def pack(self, options, args, file_list):
195 """Generates a patch file which can be applied to the root of the
[email protected]d6504212010-01-13 17:34:31196 repository.
197
198 The patch file is generated from a diff of the merge base of HEAD and
199 its upstream branch.
200 """
[email protected]6cafa132010-09-07 14:17:26201 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
[email protected]17d01792010-09-01 18:07:10202 gclient_utils.CheckCallAndFilter(
[email protected]8469bf92010-09-03 19:03:15203 ['git', 'diff', merge_base],
204 cwd=self.checkout_path,
[email protected]12b07e72013-05-03 22:06:34205 nag_timer=self.nag_timer,
206 nag_max=self.nag_max,
[email protected]306080c2012-05-04 13:11:29207 filter_fn=GitDiffFilterer(self.relpath).Filter)
[email protected]ee4071d2009-12-22 22:25:37208
[email protected]d4af6622012-06-04 22:13:55209 def UpdateSubmoduleConfig(self):
210 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
211 'submodule.$name.ignore', '||',
212 'git', 'config', '-f', '$toplevel/.git/config',
[email protected]37e4f232012-06-21 21:47:42213 'submodule.$name.ignore', 'all']
[email protected]d4af6622012-06-04 22:13:55214 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
[email protected]78f5c162012-06-22 22:34:25215 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
[email protected]987b0612012-07-09 23:41:08216 cmd3 = ['git', 'config', 'branch.autosetupmerge']
[email protected]08b21bf2013-04-05 03:38:10217 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
[email protected]987b0612012-07-09 23:41:08218 kwargs = {'cwd': self.checkout_path,
219 'print_stdout': False,
[email protected]12b07e72013-05-03 22:06:34220 'nag_timer': self.nag_timer,
221 'nag_max': self.nag_max,
[email protected]987b0612012-07-09 23:41:08222 'filter_fn': lambda x: None}
[email protected]d4af6622012-06-04 22:13:55223 try:
[email protected]987b0612012-07-09 23:41:08224 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
225 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
[email protected]d4af6622012-06-04 22:13:55226 except subprocess2.CalledProcessError:
227 # Not a fatal error, or even very interesting in a non-git-submodule
228 # world. So just keep it quiet.
229 pass
[email protected]987b0612012-07-09 23:41:08230 try:
231 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
232 except subprocess2.CalledProcessError:
233 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
[email protected]d4af6622012-06-04 22:13:55234
[email protected]08b21bf2013-04-05 03:38:10235 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
236
[email protected]e28e4982009-09-25 20:51:45237 def update(self, options, args, file_list):
238 """Runs git to update or transparently checkout the working copy.
239
240 All updated files will be appended to file_list.
241
242 Raises:
243 Error: if can't get URL for relative path.
244 """
[email protected]e28e4982009-09-25 20:51:45245 if args:
246 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
247
[email protected]ece406f2010-02-23 17:29:15248 self._CheckMinVersion("1.6.6")
[email protected]923a0372009-12-11 20:42:43249
[email protected]d90ba3f2010-02-23 14:42:57250 default_rev = "refs/heads/master"
[email protected]7080e942010-03-15 15:06:16251 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
[email protected]ac915bb2009-11-13 17:03:01252 rev_str = ""
[email protected]7080e942010-03-15 15:06:16253 revision = deps_revision
[email protected]eb2756d2011-09-20 20:17:51254 managed = True
[email protected]e28e4982009-09-25 20:51:45255 if options.revision:
[email protected]ac915bb2009-11-13 17:03:01256 # Override the revision number.
257 revision = str(options.revision)
[email protected]eb2756d2011-09-20 20:17:51258 if revision == 'unmanaged':
259 revision = None
260 managed = False
[email protected]d90ba3f2010-02-23 14:42:57261 if not revision:
262 revision = default_rev
[email protected]e28e4982009-09-25 20:51:45263
[email protected]eaab7842011-04-28 09:07:58264 if gclient_utils.IsDateRevision(revision):
265 # Date-revisions only work on git-repositories if the reflog hasn't
266 # expired yet. Use rev-list to get the corresponding revision.
267 # git rev-list -n 1 --before='time-stamp' branchname
268 if options.transitive:
269 print('Warning: --transitive only works for SVN repositories.')
270 revision = default_rev
271
[email protected]d90ba3f2010-02-23 14:42:57272 rev_str = ' at %s' % revision
273 files = []
274
275 printed_path = False
276 verbose = []
[email protected]b1a22bf2009-11-07 02:33:50277 if options.verbose:
[email protected]77e4eca2010-09-21 13:23:07278 print('\n_____ %s%s' % (self.relpath, rev_str))
[email protected]d90ba3f2010-02-23 14:42:57279 verbose = ['--verbose']
280 printed_path = True
281
282 if revision.startswith('refs/heads/'):
283 rev_type = "branch"
284 elif revision.startswith('origin/'):
285 # For compatability with old naming, translate 'origin' to 'refs/heads'
286 revision = revision.replace('origin/', 'refs/heads/')
287 rev_type = "branch"
288 else:
289 # hash is also a tag, only make a distinction at checkout
290 rev_type = "hash"
291
[email protected]873e6672012-03-13 18:53:36292 if not os.path.exists(self.checkout_path) or (
293 os.path.isdir(self.checkout_path) and
294 not os.listdir(self.checkout_path)):
[email protected]6c48a302011-10-20 23:44:20295 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
[email protected]f5d37bf2010-09-02 00:50:34296 self._Clone(revision, url, options)
[email protected]d4af6622012-06-04 22:13:55297 self.UpdateSubmoduleConfig()
[email protected]858d6452011-03-24 17:59:20298 files = self._Capture(['ls-files']).splitlines()
[email protected]e28e4982009-09-25 20:51:45299 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
[email protected]d90ba3f2010-02-23 14:42:57300 if not verbose:
301 # Make the output a little prettier. It's nice to have some whitespace
302 # between projects when cloning.
[email protected]77e4eca2010-09-21 13:23:07303 print('')
[email protected]e28e4982009-09-25 20:51:45304 return
305
[email protected]eb2756d2011-09-20 20:17:51306 if not managed:
[email protected]96833fa2013-04-17 03:26:37307 self._UpdateBranchHeads(options, fetch=False)
[email protected]f5cc4272012-06-21 22:38:07308 self.UpdateSubmoduleConfig()
[email protected]eb2756d2011-09-20 20:17:51309 print ('________ unmanaged solution; skipping %s' % self.relpath)
310 return
311
[email protected]e4af1ab2010-01-13 21:26:09312 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
313 raise gclient_utils.Error('\n____ %s%s\n'
314 '\tPath is not a git repo. No .git dir.\n'
315 '\tTo resolve:\n'
316 '\t\trm -rf %s\n'
317 '\tAnd run gclient sync again\n'
318 % (self.relpath, rev_str, self.relpath))
319
[email protected]d6f89d82011-03-25 20:41:58320 # See if the url has changed (the unittests use git://foo for the url, let
321 # that through).
[email protected]668667c2011-03-24 18:27:24322 current_url = self._Capture(['config', 'remote.origin.url'])
[email protected]d6f89d82011-03-25 20:41:58323 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
324 # unit test pass. (and update the comment above)
[email protected]6bb0c6e2013-05-10 20:52:00325 if (current_url != url and url != 'git://foo' and
326 self._Capture(['config', 'remote.origin.gclient']) != 'getoffmylawn'):
[email protected]668667c2011-03-24 18:27:24327 print('_____ switching %s to a new upstream' % self.relpath)
328 # Make sure it's clean
329 self._CheckClean(rev_str)
330 # Switch over to the new upstream
331 self._Run(['remote', 'set-url', 'origin', url], options)
332 quiet = []
333 if not options.verbose:
334 quiet = ['--quiet']
[email protected]e409df62013-04-16 17:28:57335 self._UpdateBranchHeads(options, fetch=False)
[email protected]668667c2011-03-24 18:27:24336 self._Run(['fetch', 'origin', '--prune'] + quiet, options)
[email protected]610060e2012-11-19 14:11:35337 self._Run(['reset', '--hard', revision] + quiet, options)
[email protected]d4af6622012-06-04 22:13:55338 self.UpdateSubmoduleConfig()
[email protected]668667c2011-03-24 18:27:24339 files = self._Capture(['ls-files']).splitlines()
340 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
341 return
342
[email protected]5bde4852009-12-14 16:47:12343 cur_branch = self._GetCurrentBranch()
344
[email protected]d90ba3f2010-02-23 14:42:57345 # Cases:
[email protected]786fb682010-06-02 15:16:23346 # 0) HEAD is detached. Probably from our initial clone.
347 # - make sure HEAD is contained by a named ref, then update.
348 # Cases 1-4. HEAD is a branch.
349 # 1) current branch is not tracking a remote branch (could be git-svn)
350 # - try to rebase onto the new hash or branch
351 # 2) current branch is tracking a remote branch with local committed
352 # changes, but the DEPS file switched to point to a hash
[email protected]d90ba3f2010-02-23 14:42:57353 # - rebase those changes on top of the hash
[email protected]786fb682010-06-02 15:16:23354 # 3) current branch is tracking a remote branch w/or w/out changes,
355 # no switch
[email protected]d90ba3f2010-02-23 14:42:57356 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
[email protected]786fb682010-06-02 15:16:23357 # 4) current branch is tracking a remote branch, switches to a different
358 # remote branch
[email protected]d90ba3f2010-02-23 14:42:57359 # - exit
360
[email protected]81e012c2010-04-29 16:07:24361 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
362 # a tracking branch
[email protected]d90ba3f2010-02-23 14:42:57363 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
364 # or it returns None if it couldn't find an upstream
[email protected]786fb682010-06-02 15:16:23365 if cur_branch is None:
366 upstream_branch = None
367 current_type = "detached"
368 logging.debug("Detached HEAD")
[email protected]d90ba3f2010-02-23 14:42:57369 else:
[email protected]786fb682010-06-02 15:16:23370 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
371 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
372 current_type = "hash"
373 logging.debug("Current branch is not tracking an upstream (remote)"
374 " branch.")
375 elif upstream_branch.startswith('refs/remotes'):
376 current_type = "branch"
377 else:
378 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
[email protected]d90ba3f2010-02-23 14:42:57379
[email protected]92067382012-06-28 19:58:41380 if (not re.match(r'^[0-9a-fA-F]{40}$', revision) or
381 not scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=revision)):
[email protected]cbd20a42012-06-27 13:49:27382 # Update the remotes first so we have all the refs.
383 backoff_time = 5
384 for _ in range(10):
385 try:
386 remote_output = scm.GIT.Capture(
387 ['remote'] + verbose + ['update'],
388 cwd=self.checkout_path)
389 break
390 except subprocess2.CalledProcessError, e:
391 # Hackish but at that point, git is known to work so just checking for
392 # 502 in stderr should be fine.
393 if '502' in e.stderr:
394 print(str(e))
395 print('Sleeping %.1f seconds and retrying...' % backoff_time)
396 time.sleep(backoff_time)
397 backoff_time *= 1.3
398 continue
399 raise
[email protected]0b1c2462010-03-02 00:48:14400
[email protected]cbd20a42012-06-27 13:49:27401 if verbose:
402 print(remote_output.strip())
[email protected]d90ba3f2010-02-23 14:42:57403
[email protected]e409df62013-04-16 17:28:57404 self._UpdateBranchHeads(options, fetch=True)
405
[email protected]d90ba3f2010-02-23 14:42:57406 # This is a big hammer, debatable if it should even be here...
[email protected]793796d2010-02-19 17:27:41407 if options.force or options.reset:
[email protected]37e89872010-09-07 16:11:33408 self._Run(['reset', '--hard', 'HEAD'], options)
[email protected]d90ba3f2010-02-23 14:42:57409
[email protected]786fb682010-06-02 15:16:23410 if current_type == 'detached':
411 # case 0
412 self._CheckClean(rev_str)
[email protected]f5d37bf2010-09-02 00:50:34413 self._CheckDetachedHead(rev_str, options)
[email protected]f7826d72011-06-02 18:20:14414 self._Capture(['checkout', '--quiet', '%s' % revision])
[email protected]786fb682010-06-02 15:16:23415 if not printed_path:
[email protected]77e4eca2010-09-21 13:23:07416 print('\n_____ %s%s' % (self.relpath, rev_str))
[email protected]786fb682010-06-02 15:16:23417 elif current_type == 'hash':
[email protected]d90ba3f2010-02-23 14:42:57418 # case 1
[email protected]55e724e2010-03-11 19:36:49419 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
[email protected]d90ba3f2010-02-23 14:42:57420 # Our git-svn branch (upstream_branch) is our upstream
[email protected]f5d37bf2010-09-02 00:50:34421 self._AttemptRebase(upstream_branch, files, options,
[email protected]d90ba3f2010-02-23 14:42:57422 newbase=revision, printed_path=printed_path)
423 printed_path = True
424 else:
425 # Can't find a merge-base since we don't know our upstream. That makes
426 # this command VERY likely to produce a rebase failure. For now we
427 # assume origin is our upstream since that's what the old behavior was.
[email protected]3b29de12010-03-08 18:34:28428 upstream_branch = 'origin'
[email protected]7080e942010-03-15 15:06:16429 if options.revision or deps_revision:
[email protected]3b29de12010-03-08 18:34:28430 upstream_branch = revision
[email protected]f5d37bf2010-09-02 00:50:34431 self._AttemptRebase(upstream_branch, files, options,
432 printed_path=printed_path)
[email protected]d90ba3f2010-02-23 14:42:57433 printed_path = True
[email protected]55e724e2010-03-11 19:36:49434 elif rev_type == 'hash':
[email protected]d90ba3f2010-02-23 14:42:57435 # case 2
[email protected]f5d37bf2010-09-02 00:50:34436 self._AttemptRebase(upstream_branch, files, options,
[email protected]d90ba3f2010-02-23 14:42:57437 newbase=revision, printed_path=printed_path)
438 printed_path = True
439 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
440 # case 4
441 new_base = revision.replace('heads', 'remotes/origin')
442 if not printed_path:
[email protected]77e4eca2010-09-21 13:23:07443 print('\n_____ %s%s' % (self.relpath, rev_str))
[email protected]d90ba3f2010-02-23 14:42:57444 switch_error = ("Switching upstream branch from %s to %s\n"
445 % (upstream_branch, new_base) +
446 "Please merge or rebase manually:\n" +
447 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
448 "OR git checkout -b <some new branch> %s" % new_base)
449 raise gclient_utils.Error(switch_error)
450 else:
451 # case 3 - the default case
[email protected]6cafa132010-09-07 14:17:26452 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
[email protected]d90ba3f2010-02-23 14:42:57453 if verbose:
[email protected]77e4eca2010-09-21 13:23:07454 print('Trying fast-forward merge to branch : %s' % upstream_branch)
[email protected]d90ba3f2010-02-23 14:42:57455 try:
[email protected]2aad1b22011-07-22 12:00:41456 merge_args = ['merge']
457 if not options.merge:
458 merge_args.append('--ff-only')
459 merge_args.append(upstream_branch)
460 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
[email protected]18fa4542013-05-21 13:30:46461 except subprocess2.CalledProcessError as e:
[email protected]d90ba3f2010-02-23 14:42:57462 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
463 if not printed_path:
[email protected]77e4eca2010-09-21 13:23:07464 print('\n_____ %s%s' % (self.relpath, rev_str))
[email protected]d90ba3f2010-02-23 14:42:57465 printed_path = True
466 while True:
467 try:
[email protected]90541732011-04-01 17:54:18468 action = ask_for_data(
469 'Cannot fast-forward merge, attempt to rebase? '
[email protected]18fa4542013-05-21 13:30:46470 '(y)es / (q)uit / (s)kip : ', options)
[email protected]d90ba3f2010-02-23 14:42:57471 except ValueError:
[email protected]90541732011-04-01 17:54:18472 raise gclient_utils.Error('Invalid Character')
[email protected]d90ba3f2010-02-23 14:42:57473 if re.match(r'yes|y', action, re.I):
[email protected]f5d37bf2010-09-02 00:50:34474 self._AttemptRebase(upstream_branch, files, options,
[email protected]d90ba3f2010-02-23 14:42:57475 printed_path=printed_path)
476 printed_path = True
477 break
478 elif re.match(r'quit|q', action, re.I):
479 raise gclient_utils.Error("Can't fast-forward, please merge or "
480 "rebase manually.\n"
481 "cd %s && git " % self.checkout_path
482 + "rebase %s" % upstream_branch)
483 elif re.match(r'skip|s', action, re.I):
[email protected]77e4eca2010-09-21 13:23:07484 print('Skipping %s' % self.relpath)
[email protected]d90ba3f2010-02-23 14:42:57485 return
486 else:
[email protected]77e4eca2010-09-21 13:23:07487 print('Input not recognized')
[email protected]d90ba3f2010-02-23 14:42:57488 elif re.match("error: Your local changes to '.*' would be "
489 "overwritten by merge. Aborting.\nPlease, commit your "
490 "changes or stash them before you can merge.\n",
491 e.stderr):
492 if not printed_path:
[email protected]77e4eca2010-09-21 13:23:07493 print('\n_____ %s%s' % (self.relpath, rev_str))
[email protected]d90ba3f2010-02-23 14:42:57494 printed_path = True
495 raise gclient_utils.Error(e.stderr)
496 else:
497 # Some other problem happened with the merge
498 logging.error("Error during fast-forward merge in %s!" % self.relpath)
[email protected]77e4eca2010-09-21 13:23:07499 print(e.stderr)
[email protected]d90ba3f2010-02-23 14:42:57500 raise
501 else:
502 # Fast-forward merge was successful
503 if not re.match('Already up-to-date.', merge_output) or verbose:
504 if not printed_path:
[email protected]77e4eca2010-09-21 13:23:07505 print('\n_____ %s%s' % (self.relpath, rev_str))
[email protected]d90ba3f2010-02-23 14:42:57506 printed_path = True
[email protected]77e4eca2010-09-21 13:23:07507 print(merge_output.strip())
[email protected]d90ba3f2010-02-23 14:42:57508 if not verbose:
509 # Make the output a little prettier. It's nice to have some
510 # whitespace between projects when syncing.
[email protected]77e4eca2010-09-21 13:23:07511 print('')
[email protected]d90ba3f2010-02-23 14:42:57512
[email protected]d4af6622012-06-04 22:13:55513 self.UpdateSubmoduleConfig()
[email protected]d90ba3f2010-02-23 14:42:57514 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
[email protected]5bde4852009-12-14 16:47:12515
516 # If the rebase generated a conflict, abort and ask user to fix
[email protected]786fb682010-06-02 15:16:23517 if self._IsRebasing():
[email protected]5bde4852009-12-14 16:47:12518 raise gclient_utils.Error('\n____ %s%s\n'
519 '\nConflict while rebasing this branch.\n'
520 'Fix the conflict and run gclient again.\n'
521 'See man git-rebase for details.\n'
522 % (self.relpath, rev_str))
523
[email protected]d90ba3f2010-02-23 14:42:57524 if verbose:
[email protected]77e4eca2010-09-21 13:23:07525 print('Checked out revision %s' % self.revinfo(options, (), None))
[email protected]e28e4982009-09-25 20:51:45526
[email protected]98e69452012-02-16 16:36:43527 # If --reset and --delete_unversioned_trees are specified, remove any
528 # untracked directories.
529 if options.reset and options.delete_unversioned_trees:
530 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
531 # merge-base by default), so doesn't include untracked files. So we use
532 # 'git ls-files --directory --others --exclude-standard' here directly.
533 paths = scm.GIT.Capture(
534 ['ls-files', '--directory', '--others', '--exclude-standard'],
535 self.checkout_path)
536 for path in (p for p in paths.splitlines() if p.endswith('/')):
537 full_path = os.path.join(self.checkout_path, path)
538 if not os.path.islink(full_path):
539 print('\n_____ removing unversioned directory %s' % path)
[email protected]dc112ac2013-04-24 13:00:19540 gclient_utils.rmtree(full_path)
[email protected]98e69452012-02-16 16:36:43541
542
[email protected]e28e4982009-09-25 20:51:45543 def revert(self, options, args, file_list):
544 """Reverts local modifications.
545
546 All reverted files will be appended to file_list.
547 """
[email protected]8469bf92010-09-03 19:03:15548 if not os.path.isdir(self.checkout_path):
[email protected]260c6532009-10-28 03:22:35549 # revert won't work if the directory doesn't exist. It needs to
550 # checkout instead.
[email protected]77e4eca2010-09-21 13:23:07551 print('\n_____ %s is missing, synching instead' % self.relpath)
[email protected]260c6532009-10-28 03:22:35552 # Don't reuse the args.
553 return self.update(options, [], file_list)
[email protected]b2b46312010-04-30 20:58:03554
555 default_rev = "refs/heads/master"
[email protected]6e29d572010-06-04 17:32:20556 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
[email protected]b2b46312010-04-30 20:58:03557 if not deps_revision:
558 deps_revision = default_rev
559 if deps_revision.startswith('refs/heads/'):
560 deps_revision = deps_revision.replace('refs/heads/', 'origin/')
561
[email protected]6cafa132010-09-07 14:17:26562 files = self._Capture(['diff', deps_revision, '--name-only']).split()
[email protected]37e89872010-09-07 16:11:33563 self._Run(['reset', '--hard', deps_revision], options)
[email protected]ade83db2012-09-27 14:06:49564 self._Run(['clean', '-f', '-d'], options)
[email protected]e28e4982009-09-25 20:51:45565 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
566
[email protected]0f282062009-11-06 20:14:02567 def revinfo(self, options, args, file_list):
[email protected]6cafa132010-09-07 14:17:26568 """Returns revision"""
569 return self._Capture(['rev-parse', 'HEAD'])
[email protected]0f282062009-11-06 20:14:02570
[email protected]e28e4982009-09-25 20:51:45571 def runhooks(self, options, args, file_list):
572 self.status(options, args, file_list)
573
574 def status(self, options, args, file_list):
575 """Display status information."""
576 if not os.path.isdir(self.checkout_path):
[email protected]77e4eca2010-09-21 13:23:07577 print(('\n________ couldn\'t run status in %s:\n'
578 'The directory does not exist.') % self.checkout_path)
[email protected]e28e4982009-09-25 20:51:45579 else:
[email protected]6cafa132010-09-07 14:17:26580 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
[email protected]37e89872010-09-07 16:11:33581 self._Run(['diff', '--name-status', merge_base], options)
[email protected]6cafa132010-09-07 14:17:26582 files = self._Capture(['diff', '--name-only', merge_base]).split()
[email protected]e28e4982009-09-25 20:51:45583 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
584
[email protected]e5d1e612011-12-19 19:49:19585 def GetUsableRev(self, rev, options):
586 """Finds a useful revision for this repository.
587
588 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
589 will be called on the source."""
590 sha1 = None
[email protected]3830a672013-02-19 20:15:14591 if not os.path.isdir(self.checkout_path):
592 raise gclient_utils.Error(
593 ( 'We could not find a valid hash for safesync_url response "%s".\n'
594 'Safesync URLs with a git checkout currently require the repo to\n'
595 'be cloned without a safesync_url before adding the safesync_url.\n'
596 'For more info, see: '
597 'http://code.google.com/p/chromium/wiki/UsingNewGit'
598 '#Initial_checkout' ) % rev)
599 elif rev.isdigit() and len(rev) < 7:
600 # Handles an SVN rev. As an optimization, only verify an SVN revision as
601 # [0-9]{1,6} for now to avoid making a network request.
602 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
[email protected]051c88b2011-12-22 00:23:03603 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
604 if not local_head or local_head < int(rev):
[email protected]2a75fdb2012-02-15 01:32:57605 try:
606 logging.debug('Looking for git-svn configuration optimizations.')
607 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
608 cwd=self.checkout_path):
609 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
610 except subprocess2.CalledProcessError:
611 logging.debug('git config --get svn-remote.svn.fetch failed, '
612 'ignoring possible optimization.')
[email protected]051c88b2011-12-22 00:23:03613 if options.verbose:
614 print('Running git svn fetch. This might take a while.\n')
615 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
[email protected]312a6a42012-10-11 21:19:42616 try:
[email protected]c51def32012-10-15 18:50:37617 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
618 cwd=self.checkout_path, rev=rev)
[email protected]312a6a42012-10-11 21:19:42619 except gclient_utils.Error, e:
620 sha1 = e.message
621 print('\nWarning: Could not find a git revision with accurate\n'
622 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
623 'the closest sane git revision, which is:\n'
624 ' %s\n' % (rev, e.message))
[email protected]051c88b2011-12-22 00:23:03625 if not sha1:
626 raise gclient_utils.Error(
627 ( 'It appears that either your git-svn remote is incorrectly\n'
628 'configured or the revision in your safesync_url is\n'
629 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
630 'corresponding git hash for SVN rev %s.' ) % rev)
[email protected]3830a672013-02-19 20:15:14631 else:
632 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
633 sha1 = rev
634 else:
635 # May exist in origin, but we don't have it yet, so fetch and look
636 # again.
637 scm.GIT.Capture(['fetch', 'origin'], cwd=self.checkout_path)
638 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
639 sha1 = rev
[email protected]051c88b2011-12-22 00:23:03640
[email protected]e5d1e612011-12-19 19:49:19641 if not sha1:
642 raise gclient_utils.Error(
[email protected]051c88b2011-12-22 00:23:03643 ( 'We could not find a valid hash for safesync_url response "%s".\n'
644 'Safesync URLs with a git checkout currently require a git-svn\n'
645 'remote or a safesync_url that provides git sha1s. Please add a\n'
646 'git-svn remote or change your safesync_url. For more info, see:\n'
[email protected]e5d1e612011-12-19 19:49:19647 'http://code.google.com/p/chromium/wiki/UsingNewGit'
[email protected]051c88b2011-12-22 00:23:03648 '#Initial_checkout' ) % rev)
649
[email protected]e5d1e612011-12-19 19:49:19650 return sha1
651
[email protected]e6f78352010-01-13 17:05:33652 def FullUrlForRelativeUrl(self, url):
653 # Strip from last '/'
654 # Equivalent to unix basename
655 base_url = self.url
656 return base_url[:base_url.rfind('/')] + url
657
[email protected]f5d37bf2010-09-02 00:50:34658 def _Clone(self, revision, url, options):
[email protected]d90ba3f2010-02-23 14:42:57659 """Clone a git repository from the given URL.
660
[email protected]786fb682010-06-02 15:16:23661 Once we've cloned the repo, we checkout a working branch if the specified
662 revision is a branch head. If it is a tag or a specific commit, then we
663 leave HEAD detached as it makes future updates simpler -- in this case the
664 user should first create a new branch or switch to an existing branch before
665 making changes in the repo."""
[email protected]f5d37bf2010-09-02 00:50:34666 if not options.verbose:
[email protected]d90ba3f2010-02-23 14:42:57667 # git clone doesn't seem to insert a newline properly before printing
668 # to stdout
[email protected]77e4eca2010-09-21 13:23:07669 print('')
[email protected]ee10d7d2013-04-24 23:18:20670 clone_cmd = ['clone', '--progress']
[email protected]786fb682010-06-02 15:16:23671 if revision.startswith('refs/heads/'):
672 clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
673 detach_head = False
674 else:
[email protected]786fb682010-06-02 15:16:23675 detach_head = True
[email protected]f5d37bf2010-09-02 00:50:34676 if options.verbose:
[email protected]d90ba3f2010-02-23 14:42:57677 clone_cmd.append('--verbose')
678 clone_cmd.extend([url, self.checkout_path])
679
[email protected]328c3c72011-06-01 20:50:27680 # If the parent directory does not exist, Git clone on Windows will not
681 # create it, so we need to do it manually.
682 parent_dir = os.path.dirname(self.checkout_path)
683 if not os.path.exists(parent_dir):
[email protected]6c48a302011-10-20 23:44:20684 gclient_utils.safe_makedirs(parent_dir)
[email protected]328c3c72011-06-01 20:50:27685
[email protected]85d3e3a2011-10-07 17:12:00686 percent_re = re.compile('.* ([0-9]{1,2})% .*')
687 def _GitFilter(line):
688 # git uses an escape sequence to clear the line; elide it.
689 esc = line.find(unichr(033))
690 if esc > -1:
691 line = line[:esc]
692 match = percent_re.match(line)
693 if not match or not int(match.group(1)) % 10:
694 print '%s' % line
695
[email protected]55e724e2010-03-11 19:36:49696 for _ in range(3):
[email protected]d90ba3f2010-02-23 14:42:57697 try:
[email protected]85d3e3a2011-10-07 17:12:00698 self._Run(clone_cmd, options, cwd=self._root_dir, filter_fn=_GitFilter,
699 print_stdout=False)
[email protected]d90ba3f2010-02-23 14:42:57700 break
[email protected]2a5b6a22011-09-09 14:03:12701 except subprocess2.CalledProcessError, e:
702 # Too bad we don't have access to the actual output yet.
[email protected]d90ba3f2010-02-23 14:42:57703 # We should check for "transfer closed with NNN bytes remaining to
704 # read". In the meantime, just make sure .git exists.
[email protected]2a5b6a22011-09-09 14:03:12705 if (e.returncode == 128 and
[email protected]d90ba3f2010-02-23 14:42:57706 os.path.exists(os.path.join(self.checkout_path, '.git'))):
[email protected]77e4eca2010-09-21 13:23:07707 print(str(e))
708 print('Retrying...')
[email protected]d90ba3f2010-02-23 14:42:57709 continue
710 raise e
711
[email protected]e409df62013-04-16 17:28:57712 # Update the "branch-heads" remote-tracking branches, since we might need it
713 # to checkout a specific revision below.
714 self._UpdateBranchHeads(options, fetch=True)
[email protected]059cc452013-03-11 15:14:35715
[email protected]786fb682010-06-02 15:16:23716 if detach_head:
717 # Squelch git's very verbose detached HEAD warning and use our own
[email protected]f7826d72011-06-02 18:20:14718 self._Capture(['checkout', '--quiet', '%s' % revision])
[email protected]77e4eca2010-09-21 13:23:07719 print(
[email protected]f5d37bf2010-09-02 00:50:34720 ('Checked out %s to a detached HEAD. Before making any commits\n'
721 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
722 'an existing branch or use \'git checkout origin -b <branch>\' to\n'
723 'create a new branch for your work.') % revision)
[email protected]d90ba3f2010-02-23 14:42:57724
[email protected]f5d37bf2010-09-02 00:50:34725 def _AttemptRebase(self, upstream, files, options, newbase=None,
[email protected]d90ba3f2010-02-23 14:42:57726 branch=None, printed_path=False):
727 """Attempt to rebase onto either upstream or, if specified, newbase."""
[email protected]6cafa132010-09-07 14:17:26728 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
[email protected]d90ba3f2010-02-23 14:42:57729 revision = upstream
730 if newbase:
731 revision = newbase
732 if not printed_path:
[email protected]77e4eca2010-09-21 13:23:07733 print('\n_____ %s : Attempting rebase onto %s...' % (
[email protected]f5d37bf2010-09-02 00:50:34734 self.relpath, revision))
[email protected]d90ba3f2010-02-23 14:42:57735 printed_path = True
736 else:
[email protected]77e4eca2010-09-21 13:23:07737 print('Attempting rebase onto %s...' % revision)
[email protected]d90ba3f2010-02-23 14:42:57738
739 # Build the rebase command here using the args
740 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
741 rebase_cmd = ['rebase']
[email protected]f5d37bf2010-09-02 00:50:34742 if options.verbose:
[email protected]d90ba3f2010-02-23 14:42:57743 rebase_cmd.append('--verbose')
744 if newbase:
745 rebase_cmd.extend(['--onto', newbase])
746 rebase_cmd.append(upstream)
747 if branch:
748 rebase_cmd.append(branch)
749
750 try:
[email protected]ad80e3b2010-09-09 14:18:28751 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:22752 except subprocess2.CalledProcessError, e:
[email protected]ad80e3b2010-09-09 14:18:28753 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
754 re.match(r'cannot rebase: your index contains uncommitted changes',
755 e.stderr)):
[email protected]d90ba3f2010-02-23 14:42:57756 while True:
[email protected]90541732011-04-01 17:54:18757 rebase_action = ask_for_data(
758 'Cannot rebase because of unstaged changes.\n'
759 '\'git reset --hard HEAD\' ?\n'
760 'WARNING: destroys any uncommitted work in your current branch!'
[email protected]18fa4542013-05-21 13:30:46761 ' (y)es / (q)uit / (s)how : ', options)
[email protected]d90ba3f2010-02-23 14:42:57762 if re.match(r'yes|y', rebase_action, re.I):
[email protected]37e89872010-09-07 16:11:33763 self._Run(['reset', '--hard', 'HEAD'], options)
[email protected]d90ba3f2010-02-23 14:42:57764 # Should this be recursive?
[email protected]ad80e3b2010-09-09 14:18:28765 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
[email protected]d90ba3f2010-02-23 14:42:57766 break
767 elif re.match(r'quit|q', rebase_action, re.I):
768 raise gclient_utils.Error("Please merge or rebase manually\n"
769 "cd %s && git " % self.checkout_path
770 + "%s" % ' '.join(rebase_cmd))
771 elif re.match(r'show|s', rebase_action, re.I):
[email protected]77e4eca2010-09-21 13:23:07772 print('\n%s' % e.stderr.strip())
[email protected]d90ba3f2010-02-23 14:42:57773 continue
774 else:
775 gclient_utils.Error("Input not recognized")
776 continue
777 elif re.search(r'^CONFLICT', e.stdout, re.M):
778 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
779 "Fix the conflict and run gclient again.\n"
780 "See 'man git-rebase' for details.\n")
781 else:
[email protected]77e4eca2010-09-21 13:23:07782 print(e.stdout.strip())
783 print('Rebase produced error output:\n%s' % e.stderr.strip())
[email protected]d90ba3f2010-02-23 14:42:57784 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
785 "manually.\ncd %s && git " %
786 self.checkout_path
787 + "%s" % ' '.join(rebase_cmd))
788
[email protected]77e4eca2010-09-21 13:23:07789 print(rebase_output.strip())
[email protected]f5d37bf2010-09-02 00:50:34790 if not options.verbose:
[email protected]d90ba3f2010-02-23 14:42:57791 # Make the output a little prettier. It's nice to have some
792 # whitespace between projects when syncing.
[email protected]77e4eca2010-09-21 13:23:07793 print('')
[email protected]d90ba3f2010-02-23 14:42:57794
[email protected]6e29d572010-06-04 17:32:20795 @staticmethod
796 def _CheckMinVersion(min_version):
[email protected]d0f854a2010-03-11 19:35:53797 (ok, current_version) = scm.GIT.AssertVersion(min_version)
798 if not ok:
799 raise gclient_utils.Error('git version %s < minimum required %s' %
800 (current_version, min_version))
[email protected]923a0372009-12-11 20:42:43801
[email protected]786fb682010-06-02 15:16:23802 def _IsRebasing(self):
803 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
804 # have a plumbing command to determine whether a rebase is in progress, so
805 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
806 g = os.path.join(self.checkout_path, '.git')
807 return (
808 os.path.isdir(os.path.join(g, "rebase-merge")) or
809 os.path.isdir(os.path.join(g, "rebase-apply")))
810
811 def _CheckClean(self, rev_str):
812 # Make sure the tree is clean; see git-rebase.sh for reference
813 try:
814 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
[email protected]ad80e3b2010-09-09 14:18:28815 cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:22816 except subprocess2.CalledProcessError:
[email protected]6e29d572010-06-04 17:32:20817 raise gclient_utils.Error('\n____ %s%s\n'
818 '\tYou have unstaged changes.\n'
819 '\tPlease commit, stash, or reset.\n'
820 % (self.relpath, rev_str))
[email protected]786fb682010-06-02 15:16:23821 try:
822 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
[email protected]ad80e3b2010-09-09 14:18:28823 '--ignore-submodules', 'HEAD', '--'],
824 cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:22825 except subprocess2.CalledProcessError:
[email protected]6e29d572010-06-04 17:32:20826 raise gclient_utils.Error('\n____ %s%s\n'
827 '\tYour index contains uncommitted changes\n'
828 '\tPlease commit, stash, or reset.\n'
829 % (self.relpath, rev_str))
[email protected]786fb682010-06-02 15:16:23830
[email protected]f5d37bf2010-09-02 00:50:34831 def _CheckDetachedHead(self, rev_str, options):
[email protected]786fb682010-06-02 15:16:23832 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
833 # reference by a commit). If not, error out -- most likely a rebase is
834 # in progress, try to detect so we can give a better error.
835 try:
[email protected]ad80e3b2010-09-09 14:18:28836 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
837 cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:22838 except subprocess2.CalledProcessError:
[email protected]786fb682010-06-02 15:16:23839 # Commit is not contained by any rev. See if the user is rebasing:
840 if self._IsRebasing():
841 # Punt to the user
842 raise gclient_utils.Error('\n____ %s%s\n'
843 '\tAlready in a conflict, i.e. (no branch).\n'
844 '\tFix the conflict and run gclient again.\n'
845 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
846 '\tSee man git-rebase for details.\n'
847 % (self.relpath, rev_str))
848 # Let's just save off the commit so we can proceed.
[email protected]6cafa132010-09-07 14:17:26849 name = ('saved-by-gclient-' +
850 self._Capture(['rev-parse', '--short', 'HEAD']))
851 self._Capture(['branch', name])
[email protected]77e4eca2010-09-21 13:23:07852 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
[email protected]f5d37bf2010-09-02 00:50:34853 name)
[email protected]786fb682010-06-02 15:16:23854
[email protected]5bde4852009-12-14 16:47:12855 def _GetCurrentBranch(self):
[email protected]786fb682010-06-02 15:16:23856 # Returns name of current branch or None for detached HEAD
[email protected]6cafa132010-09-07 14:17:26857 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
[email protected]786fb682010-06-02 15:16:23858 if branch == 'HEAD':
[email protected]5bde4852009-12-14 16:47:12859 return None
860 return branch
861
[email protected]6cafa132010-09-07 14:17:26862 def _Capture(self, args):
[email protected]bffad372011-09-08 17:54:22863 return subprocess2.check_output(
[email protected]87e6d332011-09-09 19:01:28864 ['git'] + args,
865 stderr=subprocess2.PIPE,
[email protected]12b07e72013-05-03 22:06:34866 nag_timer=self.nag_timer,
867 nag_max=self.nag_max,
[email protected]87e6d332011-09-09 19:01:28868 cwd=self.checkout_path).strip()
[email protected]6cafa132010-09-07 14:17:26869
[email protected]e409df62013-04-16 17:28:57870 def _UpdateBranchHeads(self, options, fetch=False):
871 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
872 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
873 backoff_time = 5
874 for _ in range(3):
875 try:
876 config_cmd = ['config', 'remote.origin.fetch',
877 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
878 '^\\+refs/branch-heads/\\*:.*$']
879 self._Run(config_cmd, options)
880 if fetch:
881 fetch_cmd = ['fetch', 'origin']
882 if options.verbose:
883 fetch_cmd.append('--verbose')
884 self._Run(fetch_cmd, options)
885 break
886 except subprocess2.CalledProcessError, e:
887 print(str(e))
888 print('Retrying in %.1f seconds...' % backoff_time)
889 time.sleep(backoff_time)
890 backoff_time *= 1.3
891
[email protected]37e89872010-09-07 16:11:33892 def _Run(self, args, options, **kwargs):
[email protected]6cafa132010-09-07 14:17:26893 kwargs.setdefault('cwd', self.checkout_path)
[email protected]85d3e3a2011-10-07 17:12:00894 kwargs.setdefault('print_stdout', True)
[email protected]12b07e72013-05-03 22:06:34895 kwargs.setdefault('nag_timer', self.nag_timer)
896 kwargs.setdefault('nag_max', self.nag_max)
[email protected]85d3e3a2011-10-07 17:12:00897 stdout = kwargs.get('stdout', sys.stdout)
898 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
899 ' '.join(args), kwargs['cwd']))
900 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
[email protected]e28e4982009-09-25 20:51:45901
902
[email protected]55e724e2010-03-11 19:36:49903class SVNWrapper(SCMWrapper):
[email protected]cb5442b2009-09-22 16:51:24904 """ Wrapper for SVN """
[email protected]5f3eee32009-09-17 00:34:30905
[email protected]9e3e82c2012-04-18 12:55:43906 @staticmethod
907 def BinaryExists():
908 """Returns true if the command exists."""
909 try:
910 result, version = scm.SVN.AssertVersion('1.4')
911 if not result:
912 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
913 return result
914 except OSError:
915 return False
916
[email protected]eaab7842011-04-28 09:07:58917 def GetRevisionDate(self, revision):
918 """Returns the given revision's date in ISO-8601 format (which contains the
919 time zone)."""
[email protected]d579fcf2011-12-13 20:36:03920 date = scm.SVN.Capture(
921 ['propget', '--revprop', 'svn:date', '-r', revision],
922 os.path.join(self.checkout_path, '.'))
[email protected]eaab7842011-04-28 09:07:58923 return date.strip()
924
[email protected]5f3eee32009-09-17 00:34:30925 def cleanup(self, options, args, file_list):
926 """Cleanup working copy."""
[email protected]669600d2010-09-01 19:06:31927 self._Run(['cleanup'] + args, options)
[email protected]5f3eee32009-09-17 00:34:30928
929 def diff(self, options, args, file_list):
930 # NOTE: This function does not currently modify file_list.
[email protected]8469bf92010-09-03 19:03:15931 if not os.path.isdir(self.checkout_path):
932 raise gclient_utils.Error('Directory %s is not present.' %
933 self.checkout_path)
[email protected]669600d2010-09-01 19:06:31934 self._Run(['diff'] + args, options)
[email protected]5f3eee32009-09-17 00:34:30935
[email protected]ee4071d2009-12-22 22:25:37936 def pack(self, options, args, file_list):
937 """Generates a patch file which can be applied to the root of the
938 repository."""
[email protected]8469bf92010-09-03 19:03:15939 if not os.path.isdir(self.checkout_path):
940 raise gclient_utils.Error('Directory %s is not present.' %
941 self.checkout_path)
942 gclient_utils.CheckCallAndFilter(
943 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
944 cwd=self.checkout_path,
945 print_stdout=False,
[email protected]12b07e72013-05-03 22:06:34946 nag_timer=self.nag_timer,
947 nag_max=self.nag_max,
[email protected]306080c2012-05-04 13:11:29948 filter_fn=SvnDiffFilterer(self.relpath).Filter)
[email protected]ee4071d2009-12-22 22:25:37949
[email protected]5f3eee32009-09-17 00:34:30950 def update(self, options, args, file_list):
[email protected]d6504212010-01-13 17:34:31951 """Runs svn to update or transparently checkout the working copy.
[email protected]5f3eee32009-09-17 00:34:30952
953 All updated files will be appended to file_list.
954
955 Raises:
956 Error: if can't get URL for relative path.
957 """
[email protected]21dca0e2010-10-05 00:55:12958 # Only update if git or hg is not controlling the directory.
[email protected]8469bf92010-09-03 19:03:15959 git_path = os.path.join(self.checkout_path, '.git')
[email protected]5f3eee32009-09-17 00:34:30960 if os.path.exists(git_path):
[email protected]77e4eca2010-09-21 13:23:07961 print('________ found .git directory; skipping %s' % self.relpath)
[email protected]5f3eee32009-09-17 00:34:30962 return
963
[email protected]21dca0e2010-10-05 00:55:12964 hg_path = os.path.join(self.checkout_path, '.hg')
965 if os.path.exists(hg_path):
966 print('________ found .hg directory; skipping %s' % self.relpath)
967 return
968
[email protected]5f3eee32009-09-17 00:34:30969 if args:
970 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
971
[email protected]8e0e9262010-08-17 19:20:27972 # revision is the revision to match. It is None if no revision is specified,
973 # i.e. the 'deps ain't pinned'.
[email protected]ac915bb2009-11-13 17:03:01974 url, revision = gclient_utils.SplitUrlRevision(self.url)
[email protected]8e0e9262010-08-17 19:20:27975 # Keep the original unpinned url for reference in case the repo is switched.
[email protected]ac915bb2009-11-13 17:03:01976 base_url = url
[email protected]eb2756d2011-09-20 20:17:51977 managed = True
[email protected]5f3eee32009-09-17 00:34:30978 if options.revision:
979 # Override the revision number.
[email protected]ac915bb2009-11-13 17:03:01980 revision = str(options.revision)
[email protected]5f3eee32009-09-17 00:34:30981 if revision:
[email protected]eb2756d2011-09-20 20:17:51982 if revision != 'unmanaged':
983 forced_revision = True
984 # Reconstruct the url.
985 url = '%s@%s' % (url, revision)
986 rev_str = ' at %s' % revision
987 else:
988 managed = False
989 revision = None
[email protected]8e0e9262010-08-17 19:20:27990 else:
991 forced_revision = False
992 rev_str = ''
[email protected]5f3eee32009-09-17 00:34:30993
[email protected]13349e22012-11-15 17:11:28994 # Get the existing scm url and the revision number of the current checkout.
995 exists = os.path.exists(self.checkout_path)
996 if exists and managed:
997 try:
998 from_info = scm.SVN.CaptureLocalInfo(
999 [], os.path.join(self.checkout_path, '.'))
1000 except (gclient_utils.Error, subprocess2.CalledProcessError):
1001 if options.reset and options.delete_unversioned_trees:
1002 print 'Removing troublesome path %s' % self.checkout_path
1003 gclient_utils.rmtree(self.checkout_path)
1004 exists = False
1005 else:
1006 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1007 'present. Delete the directory and try again.')
1008 raise gclient_utils.Error(msg % self.checkout_path)
1009
1010 if not exists:
[email protected]6c48a302011-10-20 23:44:201011 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
[email protected]5f3eee32009-09-17 00:34:301012 # We need to checkout.
[email protected]8469bf92010-09-03 19:03:151013 command = ['checkout', url, self.checkout_path]
[email protected]8e0e9262010-08-17 19:20:271014 command = self._AddAdditionalUpdateFlags(command, options, revision)
[email protected]669600d2010-09-01 19:06:311015 self._RunAndGetFileList(command, options, file_list, self._root_dir)
[email protected]5f3eee32009-09-17 00:34:301016 return
1017
[email protected]eb2756d2011-09-20 20:17:511018 if not managed:
1019 print ('________ unmanaged solution; skipping %s' % self.relpath)
1020 return
1021
[email protected]49fcb0c2011-09-23 14:34:381022 if 'URL' not in from_info:
1023 raise gclient_utils.Error(
1024 ('gclient is confused. Couldn\'t get the url for %s.\n'
1025 'Try using @unmanaged.\n%s') % (
1026 self.checkout_path, from_info))
1027
[email protected]e407c9a2010-08-09 19:11:371028 # Look for locked directories.
[email protected]d579fcf2011-12-13 20:36:031029 dir_info = scm.SVN.CaptureStatus(
1030 None, os.path.join(self.checkout_path, '.'))
[email protected]d558c4b2011-09-22 18:56:241031 if any(d[0][2] == 'L' for d in dir_info):
1032 try:
1033 self._Run(['cleanup', self.checkout_path], options)
1034 except subprocess2.CalledProcessError, e:
1035 # Get the status again, svn cleanup may have cleaned up at least
1036 # something.
[email protected]d579fcf2011-12-13 20:36:031037 dir_info = scm.SVN.CaptureStatus(
1038 None, os.path.join(self.checkout_path, '.'))
[email protected]d558c4b2011-09-22 18:56:241039
1040 # Try to fix the failures by removing troublesome files.
1041 for d in dir_info:
1042 if d[0][2] == 'L':
1043 if d[0][0] == '!' and options.force:
1044 print 'Removing troublesome path %s' % d[1]
1045 gclient_utils.rmtree(d[1])
1046 else:
1047 print 'Not removing troublesome path %s automatically.' % d[1]
1048 if d[0][0] == '!':
1049 print 'You can pass --force to enable automatic removal.'
1050 raise e
[email protected]e407c9a2010-08-09 19:11:371051
[email protected]8e0e9262010-08-17 19:20:271052 # Retrieve the current HEAD version because svn is slow at null updates.
1053 if options.manually_grab_svn_rev and not revision:
[email protected]d579fcf2011-12-13 20:36:031054 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
[email protected]8e0e9262010-08-17 19:20:271055 revision = str(from_info_live['Revision'])
1056 rev_str = ' at %s' % revision
[email protected]5f3eee32009-09-17 00:34:301057
[email protected]ac915bb2009-11-13 17:03:011058 if from_info['URL'] != base_url:
[email protected]8e0e9262010-08-17 19:20:271059 # The repository url changed, need to switch.
[email protected]54019f32010-09-09 13:50:111060 try:
[email protected]d579fcf2011-12-13 20:36:031061 to_info = scm.SVN.CaptureRemoteInfo(url)
[email protected]31cb48a2011-04-04 18:01:361062 except (gclient_utils.Error, subprocess2.CalledProcessError):
[email protected]e2ce0c72009-09-23 16:14:181063 # The url is invalid or the server is not accessible, it's safer to bail
1064 # out right now.
1065 raise gclient_utils.Error('This url is unreachable: %s' % url)
[email protected]5f3eee32009-09-17 00:34:301066 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1067 and (from_info['UUID'] == to_info['UUID']))
1068 if can_switch:
[email protected]77e4eca2010-09-21 13:23:071069 print('\n_____ relocating %s to a new checkout' % self.relpath)
[email protected]5f3eee32009-09-17 00:34:301070 # We have different roots, so check if we can switch --relocate.
1071 # Subversion only permits this if the repository UUIDs match.
1072 # Perform the switch --relocate, then rewrite the from_url
1073 # to reflect where we "are now." (This is the same way that
1074 # Subversion itself handles the metadata when switch --relocate
1075 # is used.) This makes the checks below for whether we
1076 # can update to a revision or have to switch to a different
1077 # branch work as expected.
1078 # TODO(maruel): TEST ME !
[email protected]8e0e9262010-08-17 19:20:271079 command = ['switch', '--relocate',
[email protected]5f3eee32009-09-17 00:34:301080 from_info['Repository Root'],
1081 to_info['Repository Root'],
1082 self.relpath]
[email protected]669600d2010-09-01 19:06:311083 self._Run(command, options, cwd=self._root_dir)
[email protected]5f3eee32009-09-17 00:34:301084 from_info['URL'] = from_info['URL'].replace(
1085 from_info['Repository Root'],
1086 to_info['Repository Root'])
1087 else:
[email protected]3294f522010-08-18 19:54:571088 if not options.force and not options.reset:
[email protected]86f0f952010-08-10 17:17:191089 # Look for local modifications but ignore unversioned files.
[email protected]d579fcf2011-12-13 20:36:031090 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
[email protected]98e69452012-02-16 16:36:431091 if status[0][0] != '?':
[email protected]86f0f952010-08-10 17:17:191092 raise gclient_utils.Error(
1093 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1094 'there is local changes in %s. Delete the directory and '
[email protected]8469bf92010-09-03 19:03:151095 'try again.') % (url, self.checkout_path))
[email protected]5f3eee32009-09-17 00:34:301096 # Ok delete it.
[email protected]77e4eca2010-09-21 13:23:071097 print('\n_____ switching %s to a new checkout' % self.relpath)
[email protected]dc112ac2013-04-24 13:00:191098 gclient_utils.rmtree(self.checkout_path)
[email protected]5f3eee32009-09-17 00:34:301099 # We need to checkout.
[email protected]8469bf92010-09-03 19:03:151100 command = ['checkout', url, self.checkout_path]
[email protected]8e0e9262010-08-17 19:20:271101 command = self._AddAdditionalUpdateFlags(command, options, revision)
[email protected]669600d2010-09-01 19:06:311102 self._RunAndGetFileList(command, options, file_list, self._root_dir)
[email protected]5f3eee32009-09-17 00:34:301103 return
1104
[email protected]5f3eee32009-09-17 00:34:301105 # If the provided url has a revision number that matches the revision
1106 # number of the existing directory, then we don't need to bother updating.
[email protected]2e0c6852009-09-24 00:02:071107 if not options.force and str(from_info['Revision']) == revision:
[email protected]5f3eee32009-09-17 00:34:301108 if options.verbose or not forced_revision:
[email protected]77e4eca2010-09-21 13:23:071109 print('\n_____ %s%s' % (self.relpath, rev_str))
[email protected]98e69452012-02-16 16:36:431110 else:
1111 command = ['update', self.checkout_path]
1112 command = self._AddAdditionalUpdateFlags(command, options, revision)
1113 self._RunAndGetFileList(command, options, file_list, self._root_dir)
[email protected]5f3eee32009-09-17 00:34:301114
[email protected]98e69452012-02-16 16:36:431115 # If --reset and --delete_unversioned_trees are specified, remove any
1116 # untracked files and directories.
1117 if options.reset and options.delete_unversioned_trees:
1118 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1119 full_path = os.path.join(self.checkout_path, status[1])
1120 if (status[0][0] == '?'
1121 and os.path.isdir(full_path)
1122 and not os.path.islink(full_path)):
1123 print('\n_____ removing unversioned directory %s' % status[1])
[email protected]dc112ac2013-04-24 13:00:191124 gclient_utils.rmtree(full_path)
[email protected]5f3eee32009-09-17 00:34:301125
[email protected]4b5b1772010-04-08 01:52:561126 def updatesingle(self, options, args, file_list):
[email protected]4b5b1772010-04-08 01:52:561127 filename = args.pop()
[email protected]57564662010-04-14 02:35:121128 if scm.SVN.AssertVersion("1.5")[0]:
[email protected]8469bf92010-09-03 19:03:151129 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
[email protected]57564662010-04-14 02:35:121130 # Create an empty checkout and then update the one file we want. Future
1131 # operations will only apply to the one file we checked out.
[email protected]8469bf92010-09-03 19:03:151132 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
[email protected]669600d2010-09-01 19:06:311133 self._Run(command, options, cwd=self._root_dir)
[email protected]8469bf92010-09-03 19:03:151134 if os.path.exists(os.path.join(self.checkout_path, filename)):
1135 os.remove(os.path.join(self.checkout_path, filename))
[email protected]57564662010-04-14 02:35:121136 command = ["update", filename]
[email protected]669600d2010-09-01 19:06:311137 self._RunAndGetFileList(command, options, file_list)
[email protected]57564662010-04-14 02:35:121138 # After the initial checkout, we can use update as if it were any other
1139 # dep.
1140 self.update(options, args, file_list)
1141 else:
1142 # If the installed version of SVN doesn't support --depth, fallback to
1143 # just exporting the file. This has the downside that revision
1144 # information is not stored next to the file, so we will have to
1145 # re-export the file every time we sync.
[email protected]8469bf92010-09-03 19:03:151146 if not os.path.exists(self.checkout_path):
[email protected]6c48a302011-10-20 23:44:201147 gclient_utils.safe_makedirs(self.checkout_path)
[email protected]57564662010-04-14 02:35:121148 command = ["export", os.path.join(self.url, filename),
[email protected]8469bf92010-09-03 19:03:151149 os.path.join(self.checkout_path, filename)]
[email protected]8e0e9262010-08-17 19:20:271150 command = self._AddAdditionalUpdateFlags(command, options,
1151 options.revision)
[email protected]669600d2010-09-01 19:06:311152 self._Run(command, options, cwd=self._root_dir)
[email protected]4b5b1772010-04-08 01:52:561153
[email protected]5f3eee32009-09-17 00:34:301154 def revert(self, options, args, file_list):
1155 """Reverts local modifications. Subversion specific.
1156
1157 All reverted files will be appended to file_list, even if Subversion
1158 doesn't know about them.
1159 """
[email protected]8469bf92010-09-03 19:03:151160 if not os.path.isdir(self.checkout_path):
[email protected]c0cc0872011-10-12 17:02:411161 if os.path.exists(self.checkout_path):
1162 gclient_utils.rmtree(self.checkout_path)
[email protected]5f3eee32009-09-17 00:34:301163 # svn revert won't work if the directory doesn't exist. It needs to
1164 # checkout instead.
[email protected]77e4eca2010-09-21 13:23:071165 print('\n_____ %s is missing, synching instead' % self.relpath)
[email protected]5f3eee32009-09-17 00:34:301166 # Don't reuse the args.
1167 return self.update(options, [], file_list)
1168
[email protected]c0cc0872011-10-12 17:02:411169 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
1170 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1171 print('________ found .git directory; skipping %s' % self.relpath)
1172 return
1173 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1174 print('________ found .hg directory; skipping %s' % self.relpath)
1175 return
1176 if not options.force:
1177 raise gclient_utils.Error('Invalid checkout path, aborting')
1178 print(
1179 '\n_____ %s is not a valid svn checkout, synching instead' %
1180 self.relpath)
1181 gclient_utils.rmtree(self.checkout_path)
1182 # Don't reuse the args.
1183 return self.update(options, [], file_list)
1184
[email protected]07ab60e2011-02-08 21:54:001185 def printcb(file_status):
1186 file_list.append(file_status[1])
[email protected]aa3dd472009-09-21 19:02:481187 if logging.getLogger().isEnabledFor(logging.INFO):
[email protected]07ab60e2011-02-08 21:54:001188 logging.info('%s%s' % (file_status[0], file_status[1]))
[email protected]aa3dd472009-09-21 19:02:481189 else:
[email protected]07ab60e2011-02-08 21:54:001190 print(os.path.join(self.checkout_path, file_status[1]))
1191 scm.SVN.Revert(self.checkout_path, callback=printcb)
[email protected]aa3dd472009-09-21 19:02:481192
[email protected]8b322b32011-11-01 19:05:501193 # Revert() may delete the directory altogether.
1194 if not os.path.isdir(self.checkout_path):
1195 # Don't reuse the args.
1196 return self.update(options, [], file_list)
1197
[email protected]810a50b2009-10-05 23:03:181198 try:
1199 # svn revert is so broken we don't even use it. Using
1200 # "svn up --revision BASE" achieve the same effect.
[email protected]07ab60e2011-02-08 21:54:001201 # file_list will contain duplicates.
[email protected]669600d2010-09-01 19:06:311202 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1203 file_list)
[email protected]810a50b2009-10-05 23:03:181204 except OSError, e:
[email protected]07ab60e2011-02-08 21:54:001205 # Maybe the directory disapeared meanwhile. Do not throw an exception.
[email protected]810a50b2009-10-05 23:03:181206 logging.error('Failed to update:\n%s' % str(e))
[email protected]5f3eee32009-09-17 00:34:301207
[email protected]0f282062009-11-06 20:14:021208 def revinfo(self, options, args, file_list):
1209 """Display revision"""
[email protected]54019f32010-09-09 13:50:111210 try:
1211 return scm.SVN.CaptureRevision(self.checkout_path)
[email protected]31cb48a2011-04-04 18:01:361212 except (gclient_utils.Error, subprocess2.CalledProcessError):
[email protected]54019f32010-09-09 13:50:111213 return None
[email protected]0f282062009-11-06 20:14:021214
[email protected]cb5442b2009-09-22 16:51:241215 def runhooks(self, options, args, file_list):
1216 self.status(options, args, file_list)
1217
[email protected]5f3eee32009-09-17 00:34:301218 def status(self, options, args, file_list):
1219 """Display status information."""
[email protected]669600d2010-09-01 19:06:311220 command = ['status'] + args
[email protected]8469bf92010-09-03 19:03:151221 if not os.path.isdir(self.checkout_path):
[email protected]5f3eee32009-09-17 00:34:301222 # svn status won't work if the directory doesn't exist.
[email protected]77e4eca2010-09-21 13:23:071223 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1224 'The directory does not exist.') %
1225 (' '.join(command), self.checkout_path))
[email protected]5f3eee32009-09-17 00:34:301226 # There's no file list to retrieve.
1227 else:
[email protected]669600d2010-09-01 19:06:311228 self._RunAndGetFileList(command, options, file_list)
[email protected]e6f78352010-01-13 17:05:331229
[email protected]e5d1e612011-12-19 19:49:191230 def GetUsableRev(self, rev, options):
1231 """Verifies the validity of the revision for this repository."""
1232 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1233 raise gclient_utils.Error(
1234 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1235 'correct.') % rev)
1236 return rev
1237
[email protected]e6f78352010-01-13 17:05:331238 def FullUrlForRelativeUrl(self, url):
1239 # Find the forth '/' and strip from there. A bit hackish.
1240 return '/'.join(self.url.split('/')[:4]) + url
[email protected]99828122010-06-04 01:41:021241
[email protected]669600d2010-09-01 19:06:311242 def _Run(self, args, options, **kwargs):
1243 """Runs a commands that goes to stdout."""
[email protected]8469bf92010-09-03 19:03:151244 kwargs.setdefault('cwd', self.checkout_path)
[email protected]12b07e72013-05-03 22:06:341245 kwargs.setdefault('nag_timer', self.nag_timer)
1246 kwargs.setdefault('nag_max', self.nag_max)
[email protected]669600d2010-09-01 19:06:311247 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
[email protected]77e4eca2010-09-21 13:23:071248 always=options.verbose, **kwargs)
[email protected]669600d2010-09-01 19:06:311249
1250 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1251 """Runs a commands that goes to stdout and grabs the file listed."""
[email protected]8469bf92010-09-03 19:03:151252 cwd = cwd or self.checkout_path
[email protected]ce117f62011-01-17 20:04:251253 scm.SVN.RunAndGetFileList(
1254 options.verbose,
1255 args + ['--ignore-externals'],
1256 cwd=cwd,
[email protected]77e4eca2010-09-21 13:23:071257 file_list=file_list)
[email protected]669600d2010-09-01 19:06:311258
[email protected]6e29d572010-06-04 17:32:201259 @staticmethod
[email protected]8e0e9262010-08-17 19:20:271260 def _AddAdditionalUpdateFlags(command, options, revision):
[email protected]99828122010-06-04 01:41:021261 """Add additional flags to command depending on what options are set.
1262 command should be a list of strings that represents an svn command.
1263
1264 This method returns a new list to be used as a command."""
1265 new_command = command[:]
1266 if revision:
1267 new_command.extend(['--revision', str(revision).strip()])
[email protected]36ac2392011-10-12 16:36:111268 # We don't want interaction when jobs are used.
1269 if options.jobs > 1:
1270 new_command.append('--non-interactive')
[email protected]99828122010-06-04 01:41:021271 # --force was added to 'svn update' in svn 1.5.
[email protected]36ac2392011-10-12 16:36:111272 # --accept was added to 'svn update' in svn 1.6.
1273 if not scm.SVN.AssertVersion('1.5')[0]:
1274 return new_command
1275
1276 # It's annoying to have it block in the middle of a sync, just sensible
1277 # defaults.
1278 if options.force:
[email protected]99828122010-06-04 01:41:021279 new_command.append('--force')
[email protected]36ac2392011-10-12 16:36:111280 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1281 new_command.extend(('--accept', 'theirs-conflict'))
1282 elif options.manually_grab_svn_rev:
1283 new_command.append('--force')
1284 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1285 new_command.extend(('--accept', 'postpone'))
1286 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1287 new_command.extend(('--accept', 'postpone'))
[email protected]99828122010-06-04 01:41:021288 return new_command