blob: 238122fce653903fd38b9ab28d93d1030dc0fed7 [file] [log] [blame]
steveblock@chromium.org93567042012-02-15 01:02:26 +00001# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00004
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00005"""Gclient-specific SCM-specific operations."""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00006
maruel@chromium.org754960e2009-09-21 12:31:05 +00007import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00008import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00009import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000010import re
maruel@chromium.org90541732011-04-01 17:54:18 +000011import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000012import tempfile
zty@chromium.org6279e8a2014-02-13 01:45:25 +000013import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000014import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000015
hinoka@google.com2f2ca142014-01-07 03:59:18 +000016import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000017import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000018import scm
19import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000020
21
szager@chromium.org71cbb502013-04-19 23:30:15 +000022THIS_FILE_PATH = os.path.abspath(__file__)
23
hinoka@google.com2f2ca142014-01-07 03:59:18 +000024GSUTIL_DEFAULT_PATH = os.path.join(
25 os.path.dirname(os.path.abspath(__file__)),
26 'third_party', 'gsutil', 'gsutil')
27
szager@chromium.org71cbb502013-04-19 23:30:15 +000028
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000029class DiffFiltererWrapper(object):
30 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000031 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000032 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000033 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000034 original_prefix = "--- "
35 working_prefix = "+++ "
36
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000037 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000038 # Note that we always use '/' as the path separator to be
39 # consistent with svn's cygwin-style output on Windows
40 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000041 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000042
maruel@chromium.org6e29d572010-06-04 17:32:20 +000043 def SetCurrentFile(self, current_file):
44 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000045
iannucci@chromium.org3830a672013-02-19 20:15:14 +000046 @property
47 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000048 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000049
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000050 def _Replace(self, line):
51 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000052
53 def Filter(self, line):
54 if (line.startswith(self.index_string)):
55 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000056 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000057 else:
58 if (line.startswith(self.original_prefix) or
59 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000060 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000061 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000062
63
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000064class SvnDiffFilterer(DiffFiltererWrapper):
65 index_string = "Index: "
66
67
68class GitDiffFilterer(DiffFiltererWrapper):
69 index_string = "diff --git "
70
71 def SetCurrentFile(self, current_file):
72 # Get filename by parsing "a/<filename> b/<filename>"
73 self._current_file = current_file[:(len(current_file)/2)][2:]
74
75 def _Replace(self, line):
76 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
77
78
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000079### SCM abstraction layer
80
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000081# Factory Method for SCM wrapper creation
82
maruel@chromium.org9eda4112010-06-11 18:56:10 +000083def GetScmName(url):
84 if url:
85 url, _ = gclient_utils.SplitUrlRevision(url)
86 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000087 url.startswith('git+http://') or url.startswith('git+https://') or
mariakhomenko@chromium.orga2ede5c2014-02-05 22:05:17 +000088 url.endswith('.git') or url.startswith('sso://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000089 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000090 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000091 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000092 return 'svn'
93 return None
94
95
96def CreateSCM(url, root_dir=None, relpath=None):
97 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000098 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +000099 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000100 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000101
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000102 scm_name = GetScmName(url)
103 if not scm_name in SCM_MAP:
104 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000105 scm_class = SCM_MAP[scm_name]
106 if not scm_class.BinaryExists():
107 raise gclient_utils.Error('%s command not found' % scm_name)
108 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000109
110
111# SCMWrapper base class
112
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000113class SCMWrapper(object):
114 """Add necessary glue between all the supported SCM.
115
msb@chromium.orgd6504212010-01-13 17:34:31 +0000116 This is the abstraction layer to bind to different SCM.
117 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000118 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000119 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000120 self._root_dir = root_dir
121 if self._root_dir:
122 self._root_dir = self._root_dir.replace('/', os.sep)
123 self.relpath = relpath
124 if self.relpath:
125 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000126 if self.relpath and self._root_dir:
127 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000128
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000129 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000130 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000131 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000132
133 if not command in commands:
134 raise gclient_utils.Error('Unknown command %s' % command)
135
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000136 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000137 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000138 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000139
140 return getattr(self, command)(options, args, file_list)
141
142
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000143class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000144 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000145 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000146 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000147
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000148 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000149
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000150 def __init__(self, url=None, root_dir=None, relpath=None):
151 """Removes 'git+' fake prefix from git URL."""
152 if url.startswith('git+http://') or url.startswith('git+https://'):
153 url = url[4:]
154 SCMWrapper.__init__(self, url, root_dir, relpath)
155
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000156 @staticmethod
157 def BinaryExists():
158 """Returns true if the command exists."""
159 try:
160 # We assume git is newer than 1.7. See: crbug.com/114483
161 result, version = scm.GIT.AssertVersion('1.7')
162 if not result:
163 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
164 return result
165 except OSError:
166 return False
167
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000168 def GetCheckoutRoot(self):
169 return scm.GIT.GetCheckoutRoot(self.checkout_path)
170
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000171 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000172 """Returns the given revision's date in ISO-8601 format (which contains the
173 time zone)."""
174 # TODO(floitsch): get the time-stamp of the given revision and not just the
175 # time-stamp of the currently checked out revision.
176 return self._Capture(['log', '-n', '1', '--format=%ai'])
177
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000178 @staticmethod
179 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000180 """'Cleanup' the repo.
181
182 There's no real git equivalent for the svn cleanup command, do a no-op.
183 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000184
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000185 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000186 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000187 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000188
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000189 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000190 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000191 repository.
192
193 The patch file is generated from a diff of the merge base of HEAD and
194 its upstream branch.
195 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000196 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000197 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000198 ['git', 'diff', merge_base],
199 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000200 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000201
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000202 def UpdateSubmoduleConfig(self):
203 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000204 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000205 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000206 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000207 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000208 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000209 kwargs = {'cwd': self.checkout_path,
210 'print_stdout': False,
211 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000212 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000213 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
214 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000215 except subprocess2.CalledProcessError:
216 # Not a fatal error, or even very interesting in a non-git-submodule
217 # world. So just keep it quiet.
218 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000219 try:
220 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
221 except subprocess2.CalledProcessError:
222 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000223
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000224 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
225
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000226 def _FetchAndReset(self, revision, file_list, options):
227 """Equivalent to git fetch; git reset."""
228 quiet = []
229 if not options.verbose:
230 quiet = ['--quiet']
231 self._UpdateBranchHeads(options, fetch=False)
232
233 fetch_cmd = [
234 '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote, '--prune']
235 self._Run(fetch_cmd + quiet, options, retry=True)
236 self._Run(['reset', '--hard', revision] + quiet, options)
237 self.UpdateSubmoduleConfig()
238 if file_list is not None:
239 files = self._Capture(['ls-files']).splitlines()
240 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
241
msb@chromium.orge28e4982009-09-25 20:51:45 +0000242 def update(self, options, args, file_list):
243 """Runs git to update or transparently checkout the working copy.
244
245 All updated files will be appended to file_list.
246
247 Raises:
248 Error: if can't get URL for relative path.
249 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000250 if args:
251 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
252
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000253 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000254
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000255 # If a dependency is not pinned, track the default remote branch.
256 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000257 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000258 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000259 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000260 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000261 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000262 # Override the revision number.
263 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000264 if revision == 'unmanaged':
265 revision = None
266 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000267 if not revision:
268 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000269
floitsch@google.comeaab7842011-04-28 09:07:58 +0000270 if gclient_utils.IsDateRevision(revision):
271 # Date-revisions only work on git-repositories if the reflog hasn't
272 # expired yet. Use rev-list to get the corresponding revision.
273 # git rev-list -n 1 --before='time-stamp' branchname
274 if options.transitive:
275 print('Warning: --transitive only works for SVN repositories.')
276 revision = default_rev
277
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000278 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000279 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000280
281 printed_path = False
282 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000283 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000284 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000285 verbose = ['--verbose']
286 printed_path = True
287
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000288 url = self._CreateOrUpdateCache(url, options)
289
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000290 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000291 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000292 elif revision.startswith(self.remote + '/'):
293 # For compatibility with old naming, translate 'origin' to 'refs/heads'
294 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000295 rev_type = "branch"
296 else:
297 # hash is also a tag, only make a distinction at checkout
298 rev_type = "hash"
299
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000300 if (not os.path.exists(self.checkout_path) or
301 (os.path.isdir(self.checkout_path) and
302 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000303 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000304 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000305 if file_list is not None:
306 files = self._Capture(['ls-files']).splitlines()
307 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000308 if not verbose:
309 # Make the output a little prettier. It's nice to have some whitespace
310 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000311 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000312 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000313
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000314 if not managed:
315 self._UpdateBranchHeads(options, fetch=False)
316 self.UpdateSubmoduleConfig()
317 print ('________ unmanaged solution; skipping %s' % self.relpath)
318 return self._Capture(['rev-parse', '--verify', 'HEAD'])
319
320 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
321 raise gclient_utils.Error('\n____ %s%s\n'
322 '\tPath is not a git repo. No .git dir.\n'
323 '\tTo resolve:\n'
324 '\t\trm -rf %s\n'
325 '\tAnd run gclient sync again\n'
326 % (self.relpath, rev_str, self.relpath))
327
328 # See if the url has changed (the unittests use git://foo for the url, let
329 # that through).
330 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
331 return_early = False
332 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
333 # unit test pass. (and update the comment above)
334 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
335 # This allows devs to use experimental repos which have a different url
336 # but whose branch(s) are the same as official repos.
337 if (current_url != url and
338 url != 'git://foo' and
339 subprocess2.capture(
340 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
341 cwd=self.checkout_path).strip() != 'False'):
342 print('_____ switching %s to a new upstream' % self.relpath)
343 # Make sure it's clean
344 self._CheckClean(rev_str)
345 # Switch over to the new upstream
346 self._Run(['remote', 'set-url', self.remote, url], options)
347 self._FetchAndReset(revision, file_list, options)
348 return_early = True
349
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000350 if return_early:
351 return self._Capture(['rev-parse', '--verify', 'HEAD'])
352
msb@chromium.org5bde4852009-12-14 16:47:12 +0000353 cur_branch = self._GetCurrentBranch()
354
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000355 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000356 # 0) HEAD is detached. Probably from our initial clone.
357 # - make sure HEAD is contained by a named ref, then update.
358 # Cases 1-4. HEAD is a branch.
359 # 1) current branch is not tracking a remote branch (could be git-svn)
360 # - try to rebase onto the new hash or branch
361 # 2) current branch is tracking a remote branch with local committed
362 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000363 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000364 # 3) current branch is tracking a remote branch w/or w/out changes,
365 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000366 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000367 # 4) current branch is tracking a remote branch, switches to a different
368 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000369 # - exit
370
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000371 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
372 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000373 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
374 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000375 if cur_branch is None:
376 upstream_branch = None
377 current_type = "detached"
378 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000379 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000380 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
381 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
382 current_type = "hash"
383 logging.debug("Current branch is not tracking an upstream (remote)"
384 " branch.")
385 elif upstream_branch.startswith('refs/remotes'):
386 current_type = "branch"
387 else:
388 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000389
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000390 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000391 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000392 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000393 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000394 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000395 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000396
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000397 self._UpdateBranchHeads(options, fetch=True)
398
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000399 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000400 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000401 target = 'HEAD'
402 if options.upstream and upstream_branch:
403 target = upstream_branch
404 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000405
msb@chromium.org786fb682010-06-02 15:16:23 +0000406 if current_type == 'detached':
407 # case 0
408 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000409 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000410 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000411 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000412 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000413 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000414 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000415 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000416 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000417 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000418 newbase=revision, printed_path=printed_path,
419 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000420 printed_path = True
421 else:
422 # Can't find a merge-base since we don't know our upstream. That makes
423 # this command VERY likely to produce a rebase failure. For now we
424 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000425 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000426 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000427 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000428 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000429 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000430 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000431 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000432 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000433 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000434 newbase=revision, printed_path=printed_path,
435 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000436 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000437 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000438 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000439 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000440 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000441 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000442 switch_error = ("Switching upstream branch from %s to %s\n"
443 % (upstream_branch, new_base) +
444 "Please merge or rebase manually:\n" +
445 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
446 "OR git checkout -b <some new branch> %s" % new_base)
447 raise gclient_utils.Error(switch_error)
448 else:
449 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000450 if files is not None:
451 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000452 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000453 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000454 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000455 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000456 if options.merge:
457 merge_args.append('--ff')
458 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000459 merge_args.append('--ff-only')
460 merge_args.append(upstream_branch)
461 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000462 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000463 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000464 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000465 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000466 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000467 printed_path = True
468 while True:
469 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000470 action = self._AskForData(
471 'Cannot %s, attempt to rebase? '
472 '(y)es / (q)uit / (s)kip : ' %
473 ('merge' if options.merge else 'fast-forward merge'),
474 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000475 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000476 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000477 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000478 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000479 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000480 printed_path = True
481 break
482 elif re.match(r'quit|q', action, re.I):
483 raise gclient_utils.Error("Can't fast-forward, please merge or "
484 "rebase manually.\n"
485 "cd %s && git " % self.checkout_path
486 + "rebase %s" % upstream_branch)
487 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000488 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000489 return
490 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000491 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 elif re.match("error: Your local changes to '.*' would be "
493 "overwritten by merge. Aborting.\nPlease, commit your "
494 "changes or stash them before you can merge.\n",
495 e.stderr):
496 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000497 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 printed_path = True
499 raise gclient_utils.Error(e.stderr)
500 else:
501 # Some other problem happened with the merge
502 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000503 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000504 raise
505 else:
506 # Fast-forward merge was successful
507 if not re.match('Already up-to-date.', merge_output) or verbose:
508 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000509 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000511 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000512 if not verbose:
513 # Make the output a little prettier. It's nice to have some
514 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000515 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000516
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000517 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000518 if file_list is not None:
519 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000520
521 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000522 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000523 raise gclient_utils.Error('\n____ %s%s\n'
524 '\nConflict while rebasing this branch.\n'
525 'Fix the conflict and run gclient again.\n'
526 'See man git-rebase for details.\n'
527 % (self.relpath, rev_str))
528
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000529 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000530 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000531
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000532 # If --reset and --delete_unversioned_trees are specified, remove any
533 # untracked directories.
534 if options.reset and options.delete_unversioned_trees:
535 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
536 # merge-base by default), so doesn't include untracked files. So we use
537 # 'git ls-files --directory --others --exclude-standard' here directly.
538 paths = scm.GIT.Capture(
539 ['ls-files', '--directory', '--others', '--exclude-standard'],
540 self.checkout_path)
541 for path in (p for p in paths.splitlines() if p.endswith('/')):
542 full_path = os.path.join(self.checkout_path, path)
543 if not os.path.islink(full_path):
544 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000545 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000546
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000547 return self._Capture(['rev-parse', '--verify', 'HEAD'])
548
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000549
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000550 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000551 """Reverts local modifications.
552
553 All reverted files will be appended to file_list.
554 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000555 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000556 # revert won't work if the directory doesn't exist. It needs to
557 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000558 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000559 # Don't reuse the args.
560 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000561
562 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000563 if options.upstream:
564 if self._GetCurrentBranch():
565 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
566 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000567 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000568 if not deps_revision:
569 deps_revision = default_rev
570 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000571 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000572 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000573
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000574 if file_list is not None:
575 files = self._Capture(['diff', deps_revision, '--name-only']).split()
576
maruel@chromium.org37e89872010-09-07 16:11:33 +0000577 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000578 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000579
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000580 if file_list is not None:
581 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
582
583 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000584 """Returns revision"""
585 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000586
msb@chromium.orge28e4982009-09-25 20:51:45 +0000587 def runhooks(self, options, args, file_list):
588 self.status(options, args, file_list)
589
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000590 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000591 """Display status information."""
592 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000593 print(('\n________ couldn\'t run status in %s:\n'
594 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000595 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000596 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000597 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000598 if file_list is not None:
599 files = self._Capture(['diff', '--name-only', merge_base]).split()
600 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000601
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000602 def GetUsableRev(self, rev, options):
603 """Finds a useful revision for this repository.
604
605 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
606 will be called on the source."""
607 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000608 if not os.path.isdir(self.checkout_path):
609 raise gclient_utils.Error(
610 ( 'We could not find a valid hash for safesync_url response "%s".\n'
611 'Safesync URLs with a git checkout currently require the repo to\n'
612 'be cloned without a safesync_url before adding the safesync_url.\n'
613 'For more info, see: '
614 'http://code.google.com/p/chromium/wiki/UsingNewGit'
615 '#Initial_checkout' ) % rev)
616 elif rev.isdigit() and len(rev) < 7:
617 # Handles an SVN rev. As an optimization, only verify an SVN revision as
618 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000619 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000620 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
621 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000622 try:
623 logging.debug('Looking for git-svn configuration optimizations.')
624 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
625 cwd=self.checkout_path):
626 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
627 except subprocess2.CalledProcessError:
628 logging.debug('git config --get svn-remote.svn.fetch failed, '
629 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000630 if options.verbose:
631 print('Running git svn fetch. This might take a while.\n')
632 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000633 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000634 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
635 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000636 except gclient_utils.Error, e:
637 sha1 = e.message
638 print('\nWarning: Could not find a git revision with accurate\n'
639 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
640 'the closest sane git revision, which is:\n'
641 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000642 if not sha1:
643 raise gclient_utils.Error(
644 ( 'It appears that either your git-svn remote is incorrectly\n'
645 'configured or the revision in your safesync_url is\n'
646 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
647 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000648 else:
649 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
650 sha1 = rev
651 else:
652 # May exist in origin, but we don't have it yet, so fetch and look
653 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000654 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000655 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
656 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000657
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000658 if not sha1:
659 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000660 ( 'We could not find a valid hash for safesync_url response "%s".\n'
661 'Safesync URLs with a git checkout currently require a git-svn\n'
662 'remote or a safesync_url that provides git sha1s. Please add a\n'
663 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000664 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000665 '#Initial_checkout' ) % rev)
666
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000667 return sha1
668
msb@chromium.orge6f78352010-01-13 17:05:33 +0000669 def FullUrlForRelativeUrl(self, url):
670 # Strip from last '/'
671 # Equivalent to unix basename
672 base_url = self.url
673 return base_url[:base_url.rfind('/')] + url
674
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000675 def _CreateOrUpdateCache(self, url, options):
676 """Make a new git mirror or update existing mirror for |url|, and return the
677 mirror URI to clone from.
678
679 If no cache-dir is specified, just return |url| unchanged.
680 """
681 if not self.cache_dir:
682 return url
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000683 v = ['-v'] if options.verbose else []
hinoka@google.com267f33e2014-02-28 22:02:32 +0000684 self._Run(['cache', 'populate'] + v +
685 ['--shallow', '--cache-dir', self.cache_dir, url],
686 options, cwd=self._root_dir, retry=True)
687 return self._Run(['cache', 'exists', '--cache-dir', self.cache_dir, url],
688 options).strip()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000689
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000690 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000691 """Clone a git repository from the given URL.
692
msb@chromium.org786fb682010-06-02 15:16:23 +0000693 Once we've cloned the repo, we checkout a working branch if the specified
694 revision is a branch head. If it is a tag or a specific commit, then we
695 leave HEAD detached as it makes future updates simpler -- in this case the
696 user should first create a new branch or switch to an existing branch before
697 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000698 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000699 # git clone doesn't seem to insert a newline properly before printing
700 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000701 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000702 template_path = os.path.join(
703 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000704 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
705 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000706 if self.cache_dir:
707 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000708 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000709 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000710 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000711 # If the parent directory does not exist, Git clone on Windows will not
712 # create it, so we need to do it manually.
713 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000714 gclient_utils.safe_makedirs(parent_dir)
715 tmp_dir = tempfile.mkdtemp(
716 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
717 dir=parent_dir)
718 try:
719 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000720 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000721 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000722 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
723 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000724 except:
725 traceback.print_exc(file=sys.stderr)
726 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000727 finally:
728 if os.listdir(tmp_dir):
729 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
730 gclient_utils.rmtree(tmp_dir)
731 if revision.startswith('refs/heads/'):
732 self._Run(
733 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
734 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000735 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000736 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000737 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000738 ('Checked out %s to a detached HEAD. Before making any commits\n'
739 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000740 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
741 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000742
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000743 @staticmethod
744 def _AskForData(prompt, options):
745 if options.jobs > 1:
746 raise gclient_utils.Error("Background task requires input. Rerun "
747 "gclient with --jobs=1 so that\n"
748 "interaction is possible.")
749 try:
750 return raw_input(prompt)
751 except KeyboardInterrupt:
752 # Hide the exception.
753 sys.exit(1)
754
755
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000756 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000757 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000758 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000759 if files is not None:
760 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000761 revision = upstream
762 if newbase:
763 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000764 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000765 if not printed_path:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000766 print('\n_____ %s : Attempting %s onto %s...' % (
767 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000768 printed_path = True
769 else:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000770 print('Attempting %s onto %s...' % (action, revision))
771
772 if merge:
773 merge_output = self._Capture(['merge', revision])
774 if options.verbose:
775 print(merge_output)
776 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000777
778 # Build the rebase command here using the args
779 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
780 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000781 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000782 rebase_cmd.append('--verbose')
783 if newbase:
784 rebase_cmd.extend(['--onto', newbase])
785 rebase_cmd.append(upstream)
786 if branch:
787 rebase_cmd.append(branch)
788
789 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000790 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000791 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000792 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
793 re.match(r'cannot rebase: your index contains uncommitted changes',
794 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000795 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000796 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000797 'Cannot rebase because of unstaged changes.\n'
798 '\'git reset --hard HEAD\' ?\n'
799 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000800 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000801 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000802 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000803 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000804 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000805 break
806 elif re.match(r'quit|q', rebase_action, re.I):
807 raise gclient_utils.Error("Please merge or rebase manually\n"
808 "cd %s && git " % self.checkout_path
809 + "%s" % ' '.join(rebase_cmd))
810 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000811 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000812 continue
813 else:
814 gclient_utils.Error("Input not recognized")
815 continue
816 elif re.search(r'^CONFLICT', e.stdout, re.M):
817 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
818 "Fix the conflict and run gclient again.\n"
819 "See 'man git-rebase' for details.\n")
820 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000821 print(e.stdout.strip())
822 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000823 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
824 "manually.\ncd %s && git " %
825 self.checkout_path
826 + "%s" % ' '.join(rebase_cmd))
827
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000828 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000829 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000830 # Make the output a little prettier. It's nice to have some
831 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000832 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000833
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000834 @staticmethod
835 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000836 (ok, current_version) = scm.GIT.AssertVersion(min_version)
837 if not ok:
838 raise gclient_utils.Error('git version %s < minimum required %s' %
839 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000840
msb@chromium.org786fb682010-06-02 15:16:23 +0000841 def _IsRebasing(self):
842 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
843 # have a plumbing command to determine whether a rebase is in progress, so
844 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
845 g = os.path.join(self.checkout_path, '.git')
846 return (
847 os.path.isdir(os.path.join(g, "rebase-merge")) or
848 os.path.isdir(os.path.join(g, "rebase-apply")))
849
850 def _CheckClean(self, rev_str):
851 # Make sure the tree is clean; see git-rebase.sh for reference
852 try:
853 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000854 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000855 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000856 raise gclient_utils.Error('\n____ %s%s\n'
857 '\tYou have unstaged changes.\n'
858 '\tPlease commit, stash, or reset.\n'
859 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000860 try:
861 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000862 '--ignore-submodules', 'HEAD', '--'],
863 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000864 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000865 raise gclient_utils.Error('\n____ %s%s\n'
866 '\tYour index contains uncommitted changes\n'
867 '\tPlease commit, stash, or reset.\n'
868 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000869
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000870 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000871 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
872 # reference by a commit). If not, error out -- most likely a rebase is
873 # in progress, try to detect so we can give a better error.
874 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000875 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
876 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000877 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000878 # Commit is not contained by any rev. See if the user is rebasing:
879 if self._IsRebasing():
880 # Punt to the user
881 raise gclient_utils.Error('\n____ %s%s\n'
882 '\tAlready in a conflict, i.e. (no branch).\n'
883 '\tFix the conflict and run gclient again.\n'
884 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
885 '\tSee man git-rebase for details.\n'
886 % (self.relpath, rev_str))
887 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000888 name = ('saved-by-gclient-' +
889 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000890 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000891 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000892 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000893
msb@chromium.org5bde4852009-12-14 16:47:12 +0000894 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000895 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000896 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000897 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000898 return None
899 return branch
900
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000901 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000902 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +0000903 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000904 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000905 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000906
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000907 def _UpdateBranchHeads(self, options, fetch=False):
908 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
909 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000910 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000911 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
912 '^\\+refs/branch-heads/\\*:.*$']
913 self._Run(config_cmd, options)
914 if fetch:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000915 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000916 if options.verbose:
917 fetch_cmd.append('--verbose')
918 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000919
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000920 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000921 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000922 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000923 if git_filter:
agable@chromium.org5a306a22014-02-24 22:13:59 +0000924 kwargs['filter_fn'] = gclient_utils.GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000925 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +0000926 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +0000927 # By default, git will use an interactive terminal prompt when a username/
928 # password is needed. That shouldn't happen in the chromium workflow,
929 # and if it does, then gclient may hide the prompt in the midst of a flood
930 # of terminal spew. The only indication that something has gone wrong
931 # will be when gclient hangs unresponsively. Instead, we disable the
932 # password prompt and simply allow git to fail noisily. The error
933 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +0000934 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
935 env.setdefault('GIT_ASKPASS', 'true')
936 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000937 else:
938 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +0000939 stdout = kwargs.get('stdout', sys.stdout)
940 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
941 ' '.join(args), kwargs['cwd']))
hinoka@google.com267f33e2014-02-28 22:02:32 +0000942 return gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000943
944
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000945class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000946 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000947 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000948
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000949 @staticmethod
950 def BinaryExists():
951 """Returns true if the command exists."""
952 try:
953 result, version = scm.SVN.AssertVersion('1.4')
954 if not result:
955 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
956 return result
957 except OSError:
958 return False
959
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000960 def GetCheckoutRoot(self):
961 return scm.SVN.GetCheckoutRoot(self.checkout_path)
962
floitsch@google.comeaab7842011-04-28 09:07:58 +0000963 def GetRevisionDate(self, revision):
964 """Returns the given revision's date in ISO-8601 format (which contains the
965 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000966 date = scm.SVN.Capture(
967 ['propget', '--revprop', 'svn:date', '-r', revision],
968 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +0000969 return date.strip()
970
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000971 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000972 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000973 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000974
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000975 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000976 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000977 if not os.path.isdir(self.checkout_path):
978 raise gclient_utils.Error('Directory %s is not present.' %
979 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000980 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000981
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000982 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000983 """Generates a patch file which can be applied to the root of the
984 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000985 if not os.path.isdir(self.checkout_path):
986 raise gclient_utils.Error('Directory %s is not present.' %
987 self.checkout_path)
988 gclient_utils.CheckCallAndFilter(
989 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
990 cwd=self.checkout_path,
991 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000992 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000993
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000994 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000995 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000996
997 All updated files will be appended to file_list.
998
999 Raises:
1000 Error: if can't get URL for relative path.
1001 """
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001002 # Only update if git or hg is not controlling the directory.
1003 git_path = os.path.join(self.checkout_path, '.git')
1004 if os.path.exists(git_path):
1005 print('________ found .git directory; skipping %s' % self.relpath)
1006 return
1007
1008 hg_path = os.path.join(self.checkout_path, '.hg')
1009 if os.path.exists(hg_path):
1010 print('________ found .hg directory; skipping %s' % self.relpath)
1011 return
1012
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001013 if args:
1014 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1015
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001016 # revision is the revision to match. It is None if no revision is specified,
1017 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001018 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001019 # Keep the original unpinned url for reference in case the repo is switched.
1020 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001021 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001022 if options.revision:
1023 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001024 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001025 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001026 if revision != 'unmanaged':
1027 forced_revision = True
1028 # Reconstruct the url.
1029 url = '%s@%s' % (url, revision)
1030 rev_str = ' at %s' % revision
1031 else:
1032 managed = False
1033 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001034 else:
1035 forced_revision = False
1036 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001037
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001038 # Get the existing scm url and the revision number of the current checkout.
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001039 exists = os.path.exists(self.checkout_path)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001040 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001041 try:
1042 from_info = scm.SVN.CaptureLocalInfo(
1043 [], os.path.join(self.checkout_path, '.'))
1044 except (gclient_utils.Error, subprocess2.CalledProcessError):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001045 if options.reset and options.delete_unversioned_trees:
1046 print 'Removing troublesome path %s' % self.checkout_path
1047 gclient_utils.rmtree(self.checkout_path)
1048 exists = False
1049 else:
1050 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1051 'present. Delete the directory and try again.')
1052 raise gclient_utils.Error(msg % self.checkout_path)
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001053
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001054 BASE_URLS = {
1055 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1056 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1057 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001058 WHITELISTED_ROOTS = [
1059 'svn://svn.chromium.org',
1060 'svn://svn-mirror.golo.chromium.org',
1061 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001062 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001063 try:
1064 # Split out the revision number since it's not useful for us.
1065 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001066 # Check to see if we're on a whitelisted root. We do this because
1067 # only some svn servers have matching UUIDs.
1068 local_parsed = urlparse.urlparse(url)
1069 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001070 if ('CHROME_HEADLESS' in os.environ
1071 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001072 and base_path in BASE_URLS
1073 and local_root in WHITELISTED_ROOTS):
1074
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001075 # Use a tarball for initial sync if we are on a bot.
1076 # Get an unauthenticated gsutil instance.
1077 gsutil = download_from_google_storage.Gsutil(
1078 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1079
1080 gs_path = BASE_URLS[base_path]
1081 _, out, _ = gsutil.check_call('ls', gs_path)
1082 # So that we can get the most recent revision.
1083 sorted_items = sorted(out.splitlines())
1084 latest_checkout = sorted_items[-1]
1085
1086 tempdir = tempfile.mkdtemp()
1087 print 'Downloading %s...' % latest_checkout
1088 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1089 if code:
1090 print '%s\n%s' % (out, err)
1091 raise Exception()
1092 filename = latest_checkout.split('/')[-1]
1093 tarball = os.path.join(tempdir, filename)
1094 print 'Unpacking into %s...' % self.checkout_path
1095 gclient_utils.safe_makedirs(self.checkout_path)
1096 # TODO(hinoka): Use 7z for windows.
1097 cmd = ['tar', '--extract', '--ungzip',
1098 '--directory', self.checkout_path,
1099 '--file', tarball]
1100 gclient_utils.CheckCallAndFilter(
1101 cmd, stdout=sys.stdout, print_stdout=True)
1102
1103 print 'Deleting temp file'
1104 gclient_utils.rmtree(tempdir)
1105
1106 # Rewrite the repository root to match.
1107 tarball_url = scm.SVN.CaptureLocalInfo(
1108 ['.'], self.checkout_path)['Repository Root']
1109 tarball_parsed = urlparse.urlparse(tarball_url)
1110 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1111 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001112
1113 if tarball_root != local_root:
1114 print 'Switching repository root to %s' % local_root
1115 self._Run(['switch', '--relocate', tarball_root,
1116 local_root, self.checkout_path],
1117 options)
1118 except Exception as e:
1119 print 'We tried to get a source tarball but failed.'
1120 print 'Resuming normal operations.'
1121 print str(e)
1122
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001123 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001124 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001125 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001126 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001127 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001128 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001129
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001130 if not managed:
1131 print ('________ unmanaged solution; skipping %s' % self.relpath)
1132 return self.Svnversion()
1133
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001134 if 'URL' not in from_info:
1135 raise gclient_utils.Error(
1136 ('gclient is confused. Couldn\'t get the url for %s.\n'
1137 'Try using @unmanaged.\n%s') % (
1138 self.checkout_path, from_info))
1139
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001140 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001141 dir_info = scm.SVN.CaptureStatus(
1142 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001143 if any(d[0][2] == 'L' for d in dir_info):
1144 try:
1145 self._Run(['cleanup', self.checkout_path], options)
1146 except subprocess2.CalledProcessError, e:
1147 # Get the status again, svn cleanup may have cleaned up at least
1148 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001149 dir_info = scm.SVN.CaptureStatus(
1150 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001151
1152 # Try to fix the failures by removing troublesome files.
1153 for d in dir_info:
1154 if d[0][2] == 'L':
1155 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001156 # We don't pass any files/directories to CaptureStatus and set
1157 # cwd=self.checkout_path, so we should get relative paths here.
1158 assert not os.path.isabs(d[1])
1159 path_to_remove = os.path.normpath(
1160 os.path.join(self.checkout_path, d[1]))
1161 print 'Removing troublesome path %s' % path_to_remove
1162 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001163 else:
1164 print 'Not removing troublesome path %s automatically.' % d[1]
1165 if d[0][0] == '!':
1166 print 'You can pass --force to enable automatic removal.'
1167 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001168
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001169 # Retrieve the current HEAD version because svn is slow at null updates.
1170 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001171 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001172 revision = str(from_info_live['Revision'])
1173 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001174
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001175 if from_info['URL'] != base_url:
1176 # The repository url changed, need to switch.
1177 try:
1178 to_info = scm.SVN.CaptureRemoteInfo(url)
1179 except (gclient_utils.Error, subprocess2.CalledProcessError):
1180 # The url is invalid or the server is not accessible, it's safer to bail
1181 # out right now.
1182 raise gclient_utils.Error('This url is unreachable: %s' % url)
1183 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1184 and (from_info['UUID'] == to_info['UUID']))
1185 if can_switch:
1186 print('\n_____ relocating %s to a new checkout' % self.relpath)
1187 # We have different roots, so check if we can switch --relocate.
1188 # Subversion only permits this if the repository UUIDs match.
1189 # Perform the switch --relocate, then rewrite the from_url
1190 # to reflect where we "are now." (This is the same way that
1191 # Subversion itself handles the metadata when switch --relocate
1192 # is used.) This makes the checks below for whether we
1193 # can update to a revision or have to switch to a different
1194 # branch work as expected.
1195 # TODO(maruel): TEST ME !
1196 command = ['switch', '--relocate',
1197 from_info['Repository Root'],
1198 to_info['Repository Root'],
1199 self.relpath]
1200 self._Run(command, options, cwd=self._root_dir)
1201 from_info['URL'] = from_info['URL'].replace(
1202 from_info['Repository Root'],
1203 to_info['Repository Root'])
1204 else:
1205 if not options.force and not options.reset:
1206 # Look for local modifications but ignore unversioned files.
1207 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1208 if status[0][0] != '?':
1209 raise gclient_utils.Error(
1210 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1211 'there is local changes in %s. Delete the directory and '
1212 'try again.') % (url, self.checkout_path))
1213 # Ok delete it.
1214 print('\n_____ switching %s to a new checkout' % self.relpath)
1215 gclient_utils.rmtree(self.checkout_path)
1216 # We need to checkout.
1217 command = ['checkout', url, self.checkout_path]
1218 command = self._AddAdditionalUpdateFlags(command, options, revision)
1219 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1220 return self.Svnversion()
1221
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001222 # If the provided url has a revision number that matches the revision
1223 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001224 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001225 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001226 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001227 else:
1228 command = ['update', self.checkout_path]
1229 command = self._AddAdditionalUpdateFlags(command, options, revision)
1230 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001231
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001232 # If --reset and --delete_unversioned_trees are specified, remove any
1233 # untracked files and directories.
1234 if options.reset and options.delete_unversioned_trees:
1235 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1236 full_path = os.path.join(self.checkout_path, status[1])
1237 if (status[0][0] == '?'
1238 and os.path.isdir(full_path)
1239 and not os.path.islink(full_path)):
1240 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001241 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001242 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001243
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001244 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001245 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001246 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001247 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001248 # Create an empty checkout and then update the one file we want. Future
1249 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001250 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001251 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001252 if os.path.exists(os.path.join(self.checkout_path, filename)):
1253 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001254 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001255 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001256 # After the initial checkout, we can use update as if it were any other
1257 # dep.
1258 self.update(options, args, file_list)
1259 else:
1260 # If the installed version of SVN doesn't support --depth, fallback to
1261 # just exporting the file. This has the downside that revision
1262 # information is not stored next to the file, so we will have to
1263 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001264 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001265 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001266 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001267 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001268 command = self._AddAdditionalUpdateFlags(command, options,
1269 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001270 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001271
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001272 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001273 """Reverts local modifications. Subversion specific.
1274
1275 All reverted files will be appended to file_list, even if Subversion
1276 doesn't know about them.
1277 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001278 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001279 if os.path.exists(self.checkout_path):
1280 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001281 # svn revert won't work if the directory doesn't exist. It needs to
1282 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001283 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001284 # Don't reuse the args.
1285 return self.update(options, [], file_list)
1286
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001287 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001288 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1289 print('________ found .git directory; skipping %s' % self.relpath)
1290 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001291 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1292 print('________ found .hg directory; skipping %s' % self.relpath)
1293 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001294 if not options.force:
1295 raise gclient_utils.Error('Invalid checkout path, aborting')
1296 print(
1297 '\n_____ %s is not a valid svn checkout, synching instead' %
1298 self.relpath)
1299 gclient_utils.rmtree(self.checkout_path)
1300 # Don't reuse the args.
1301 return self.update(options, [], file_list)
1302
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001303 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001304 if file_list is not None:
1305 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001306 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001307 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001308 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001309 print(os.path.join(self.checkout_path, file_status[1]))
1310 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001311
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001312 # Revert() may delete the directory altogether.
1313 if not os.path.isdir(self.checkout_path):
1314 # Don't reuse the args.
1315 return self.update(options, [], file_list)
1316
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001317 try:
1318 # svn revert is so broken we don't even use it. Using
1319 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001320 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001321 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1322 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001323 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001324 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001325 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001326
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001327 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001328 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001329 try:
1330 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001331 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001332 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001333
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001334 def runhooks(self, options, args, file_list):
1335 self.status(options, args, file_list)
1336
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001337 def status(self, options, args, file_list):
1338 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001339 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001340 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001341 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001342 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1343 'The directory does not exist.') %
1344 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001345 # There's no file list to retrieve.
1346 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001347 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001348
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001349 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001350 """Verifies the validity of the revision for this repository."""
1351 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1352 raise gclient_utils.Error(
1353 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1354 'correct.') % rev)
1355 return rev
1356
msb@chromium.orge6f78352010-01-13 17:05:33 +00001357 def FullUrlForRelativeUrl(self, url):
1358 # Find the forth '/' and strip from there. A bit hackish.
1359 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001360
maruel@chromium.org669600d2010-09-01 19:06:31 +00001361 def _Run(self, args, options, **kwargs):
1362 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001363 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001364 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001365 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001366
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001367 def Svnversion(self):
1368 """Runs the lowest checked out revision in the current project."""
1369 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1370 return info['Revision']
1371
maruel@chromium.org669600d2010-09-01 19:06:31 +00001372 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1373 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001374 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001375 scm.SVN.RunAndGetFileList(
1376 options.verbose,
1377 args + ['--ignore-externals'],
1378 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001379 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001380
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001381 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001382 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001383 """Add additional flags to command depending on what options are set.
1384 command should be a list of strings that represents an svn command.
1385
1386 This method returns a new list to be used as a command."""
1387 new_command = command[:]
1388 if revision:
1389 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001390 # We don't want interaction when jobs are used.
1391 if options.jobs > 1:
1392 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001393 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001394 # --accept was added to 'svn update' in svn 1.6.
1395 if not scm.SVN.AssertVersion('1.5')[0]:
1396 return new_command
1397
1398 # It's annoying to have it block in the middle of a sync, just sensible
1399 # defaults.
1400 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001401 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001402 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1403 new_command.extend(('--accept', 'theirs-conflict'))
1404 elif options.manually_grab_svn_rev:
1405 new_command.append('--force')
1406 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1407 new_command.extend(('--accept', 'postpone'))
1408 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1409 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001410 return new_command