blob: 79fb6ea58f2fa9d34d9e6b1c08ea97e3aadf5c41 [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
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00007from __future__ import print_function
8
borenet@google.comb2256212014-05-07 20:57:28 +00009import errno
maruel@chromium.org754960e2009-09-21 12:31:05 +000010import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000011import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000012import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000013import re
maruel@chromium.org90541732011-04-01 17:54:18 +000014import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000015import tempfile
zty@chromium.org6279e8a2014-02-13 01:45:25 +000016import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000017import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000018
hinoka@google.com2f2ca142014-01-07 03:59:18 +000019import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000020import gclient_utils
szager@chromium.org848fd492014-04-09 19:06:44 +000021import git_cache
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000022import scm
borenet@google.comb2256212014-05-07 20:57:28 +000023import shutil
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000024import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000025
26
szager@chromium.org71cbb502013-04-19 23:30:15 +000027THIS_FILE_PATH = os.path.abspath(__file__)
28
hinoka@google.com2f2ca142014-01-07 03:59:18 +000029GSUTIL_DEFAULT_PATH = os.path.join(
hinoka@chromium.orgb091aa52014-12-20 01:47:31 +000030 os.path.dirname(os.path.abspath(__file__)), 'gsutil.py')
hinoka@google.com2f2ca142014-01-07 03:59:18 +000031
maruel@chromium.org79d62372015-06-01 18:50:55 +000032
tandrii@chromium.orgef141922015-08-12 17:36:27 +000033class NoUsableRevError(gclient_utils.Error):
34 """Raised if requested revision isn't found in checkout."""
35
36
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000037class DiffFiltererWrapper(object):
38 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000039 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000040 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000041 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000042 original_prefix = "--- "
43 working_prefix = "+++ "
44
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000045 def __init__(self, relpath, print_func):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000046 # Note that we always use '/' as the path separator to be
47 # consistent with svn's cygwin-style output on Windows
48 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000049 self._current_file = None
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000050 self._print_func = print_func
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000051
maruel@chromium.org6e29d572010-06-04 17:32:20 +000052 def SetCurrentFile(self, current_file):
53 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000054
iannucci@chromium.org3830a672013-02-19 20:15:14 +000055 @property
56 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000057 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000058
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000059 def _Replace(self, line):
60 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000061
62 def Filter(self, line):
63 if (line.startswith(self.index_string)):
64 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000065 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000066 else:
67 if (line.startswith(self.original_prefix) or
68 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000069 line = self._Replace(line)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000070 self._print_func(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000071
72
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000073class SvnDiffFilterer(DiffFiltererWrapper):
74 index_string = "Index: "
75
76
77class GitDiffFilterer(DiffFiltererWrapper):
78 index_string = "diff --git "
79
80 def SetCurrentFile(self, current_file):
81 # Get filename by parsing "a/<filename> b/<filename>"
82 self._current_file = current_file[:(len(current_file)/2)][2:]
83
84 def _Replace(self, line):
85 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
86
87
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000088### SCM abstraction layer
89
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000090# Factory Method for SCM wrapper creation
91
maruel@chromium.org9eda4112010-06-11 18:56:10 +000092def GetScmName(url):
93 if url:
94 url, _ = gclient_utils.SplitUrlRevision(url)
95 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000096 url.startswith('git+http://') or url.startswith('git+https://') or
borenet@google.coma2aec972014-04-22 21:35:15 +000097 url.endswith('.git') or url.startswith('sso://') or
98 'googlesource' in url):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000099 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +0000100 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +0000101 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000102 return 'svn'
agable@chromium.org44ae4fb2014-10-23 08:28:30 +0000103 elif url.startswith('file://'):
104 if url.endswith('.git'):
105 return 'git'
106 return 'svn'
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000107 return None
108
109
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000110def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000111 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000112 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000113 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000114 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000115
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000116 scm_name = GetScmName(url)
117 if not scm_name in SCM_MAP:
118 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000119 scm_class = SCM_MAP[scm_name]
120 if not scm_class.BinaryExists():
121 raise gclient_utils.Error('%s command not found' % scm_name)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000122 return scm_class(url, root_dir, relpath, out_fh, out_cb)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000123
124
125# SCMWrapper base class
126
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000127class SCMWrapper(object):
128 """Add necessary glue between all the supported SCM.
129
msb@chromium.orgd6504212010-01-13 17:34:31 +0000130 This is the abstraction layer to bind to different SCM.
131 """
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000132
133 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
134 out_cb=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000135 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000136 self._root_dir = root_dir
137 if self._root_dir:
138 self._root_dir = self._root_dir.replace('/', os.sep)
139 self.relpath = relpath
140 if self.relpath:
141 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000142 if self.relpath and self._root_dir:
143 self.checkout_path = os.path.join(self._root_dir, self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000144 if out_fh is None:
145 out_fh = sys.stdout
146 self.out_fh = out_fh
147 self.out_cb = out_cb
148
149 def Print(self, *args, **kwargs):
150 kwargs.setdefault('file', self.out_fh)
151 if kwargs.pop('timestamp', True):
152 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
153 print(*args, **kwargs)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000154
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000155 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000156 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000157 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000158
159 if not command in commands:
160 raise gclient_utils.Error('Unknown command %s' % command)
161
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000162 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000163 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000164 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000165
166 return getattr(self, command)(options, args, file_list)
167
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000168 @staticmethod
169 def _get_first_remote_url(checkout_path):
170 log = scm.GIT.Capture(
171 ['config', '--local', '--get-regexp', r'remote.*.url'],
172 cwd=checkout_path)
173 # Get the second token of the first line of the log.
174 return log.splitlines()[0].split(' ', 1)[1]
175
smut@google.comd33eab32014-07-07 19:35:18 +0000176 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000177 """Attempt to determine the remote URL for this SCMWrapper."""
smut@google.comd33eab32014-07-07 19:35:18 +0000178 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000179 if os.path.exists(os.path.join(self.checkout_path, '.git')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000180 actual_remote_url = self._get_first_remote_url(self.checkout_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000181
182 # If a cache_dir is used, obtain the actual remote URL from the cache.
183 if getattr(self, 'cache_dir', None):
borenet@google.com46d09f62014-04-10 18:50:23 +0000184 url, _ = gclient_utils.SplitUrlRevision(self.url)
185 mirror = git_cache.Mirror(url)
szager@chromium.org848fd492014-04-09 19:06:44 +0000186 if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
borenet@google.com4e9be262014-04-08 19:40:30 +0000187 actual_remote_url.replace('\\', '/')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000188 actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000189 return actual_remote_url
190
191 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000192 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000193 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000194 return None
195
borenet@google.com4e9be262014-04-08 19:40:30 +0000196 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000197 """Determine whether the remote URL of this checkout is the expected URL."""
198 if not os.path.exists(self.checkout_path):
199 # A checkout which doesn't exist can't be broken.
200 return True
201
smut@google.comd33eab32014-07-07 19:35:18 +0000202 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000203 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000204 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
205 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000206 else:
207 # This may occur if the self.checkout_path exists but does not contain a
208 # valid git or svn checkout.
209 return False
210
borenet@google.comb09097a2014-04-09 19:09:08 +0000211 def _DeleteOrMove(self, force):
212 """Delete the checkout directory or move it out of the way.
213
214 Args:
215 force: bool; if True, delete the directory. Otherwise, just move it.
216 """
borenet@google.comb2256212014-05-07 20:57:28 +0000217 if force and os.environ.get('CHROME_HEADLESS') == '1':
218 self.Print('_____ Conflicting directory found in %s. Removing.'
219 % self.checkout_path)
220 gclient_utils.AddWarning('Conflicting directory %s deleted.'
221 % self.checkout_path)
222 gclient_utils.rmtree(self.checkout_path)
223 else:
224 bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
225 os.path.dirname(self.relpath))
226
227 try:
228 os.makedirs(bad_scm_dir)
229 except OSError as e:
230 if e.errno != errno.EEXIST:
231 raise
232
233 dest_path = tempfile.mkdtemp(
234 prefix=os.path.basename(self.relpath),
235 dir=bad_scm_dir)
236 self.Print('_____ Conflicting directory found in %s. Moving to %s.'
237 % (self.checkout_path, dest_path))
238 gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
239 % (self.checkout_path, dest_path))
240 shutil.move(self.checkout_path, dest_path)
borenet@google.comb09097a2014-04-09 19:09:08 +0000241
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000242
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000243class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000244 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000245 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000246 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000247
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000248 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000249
szager@chromium.org848fd492014-04-09 19:06:44 +0000250 def __init__(self, url=None, *args):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000251 """Removes 'git+' fake prefix from git URL."""
252 if url.startswith('git+http://') or url.startswith('git+https://'):
253 url = url[4:]
szager@chromium.org848fd492014-04-09 19:06:44 +0000254 SCMWrapper.__init__(self, url, *args)
255 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
256 if self.out_cb:
257 filter_kwargs['predicate'] = self.out_cb
258 self.filter = gclient_utils.GitFilter(**filter_kwargs)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000259
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000260 @staticmethod
261 def BinaryExists():
262 """Returns true if the command exists."""
263 try:
264 # We assume git is newer than 1.7. See: crbug.com/114483
265 result, version = scm.GIT.AssertVersion('1.7')
266 if not result:
267 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
268 return result
269 except OSError:
270 return False
271
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000272 def GetCheckoutRoot(self):
273 return scm.GIT.GetCheckoutRoot(self.checkout_path)
274
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000275 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000276 """Returns the given revision's date in ISO-8601 format (which contains the
277 time zone)."""
278 # TODO(floitsch): get the time-stamp of the given revision and not just the
279 # time-stamp of the currently checked out revision.
280 return self._Capture(['log', '-n', '1', '--format=%ai'])
281
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000282 @staticmethod
283 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000284 """'Cleanup' the repo.
285
286 There's no real git equivalent for the svn cleanup command, do a no-op.
287 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000288
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000289 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000290 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000291 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000292
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000293 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000294 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000295 repository.
296
297 The patch file is generated from a diff of the merge base of HEAD and
298 its upstream branch.
299 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000300 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000301 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000302 ['git', 'diff', merge_base],
303 cwd=self.checkout_path,
avakulenko@google.com255f2be2014-12-05 22:19:55 +0000304 filter_fn=GitDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000305
smut@google.comd33eab32014-07-07 19:35:18 +0000306 def _FetchAndReset(self, revision, file_list, options):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000307 """Equivalent to git fetch; git reset."""
308 quiet = []
309 if not options.verbose:
310 quiet = ['--quiet']
311 self._UpdateBranchHeads(options, fetch=False)
312
dnj@chromium.org680f2172014-06-25 00:39:32 +0000313 self._Fetch(options, prune=True, quiet=options.verbose)
smut@google.comd33eab32014-07-07 19:35:18 +0000314 self._Run(['reset', '--hard', revision] + quiet, options)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000315 if file_list is not None:
316 files = self._Capture(['ls-files']).splitlines()
317 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
318
szager@chromium.org8a139702014-06-20 15:55:01 +0000319 def _DisableHooks(self):
320 hook_dir = os.path.join(self.checkout_path, '.git', 'hooks')
321 if not os.path.isdir(hook_dir):
322 return
323 for f in os.listdir(hook_dir):
324 if not f.endswith('.sample') and not f.endswith('.disabled'):
primiano@chromium.org41265562015-04-08 09:14:46 +0000325 disabled_hook_path = os.path.join(hook_dir, f + '.disabled')
326 if os.path.exists(disabled_hook_path):
327 os.remove(disabled_hook_path)
328 os.rename(os.path.join(hook_dir, f), disabled_hook_path)
szager@chromium.org8a139702014-06-20 15:55:01 +0000329
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000330 def _maybe_break_locks(self, options):
331 """This removes all .lock files from this repo's .git directory, if the
332 user passed the --break_repo_locks command line flag.
333
334 In particular, this will cleanup index.lock files, as well as ref lock
335 files.
336 """
337 if options.break_repo_locks:
338 git_dir = os.path.join(self.checkout_path, '.git')
339 for path, _, filenames in os.walk(git_dir):
340 for filename in filenames:
341 if filename.endswith('.lock'):
342 to_break = os.path.join(path, filename)
343 self.Print('breaking lock: %s' % (to_break,))
344 try:
345 os.remove(to_break)
346 except OSError as ex:
347 self.Print('FAILED to break lock: %s: %s' % (to_break, ex))
348 raise
349
350
msb@chromium.orge28e4982009-09-25 20:51:45 +0000351 def update(self, options, args, file_list):
352 """Runs git to update or transparently checkout the working copy.
353
354 All updated files will be appended to file_list.
355
356 Raises:
357 Error: if can't get URL for relative path.
358 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000359 if args:
360 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
361
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000362 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000363
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000364 # If a dependency is not pinned, track the default remote branch.
smut@google.comd33eab32014-07-07 19:35:18 +0000365 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000366 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000367 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000368 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000369 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000370 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000371 # Override the revision number.
372 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000373 if revision == 'unmanaged':
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000374 # Check again for a revision in case an initial ref was specified
375 # in the url, for example bla.git@refs/heads/custombranch
376 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000377 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000378 if not revision:
379 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000380
szager@chromium.org8a139702014-06-20 15:55:01 +0000381 if managed:
382 self._DisableHooks()
383
floitsch@google.comeaab7842011-04-28 09:07:58 +0000384 if gclient_utils.IsDateRevision(revision):
385 # Date-revisions only work on git-repositories if the reflog hasn't
386 # expired yet. Use rev-list to get the corresponding revision.
387 # git rev-list -n 1 --before='time-stamp' branchname
388 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000389 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000390 revision = default_rev
391
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000392 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000393 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000394
395 printed_path = False
396 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000397 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000398 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000399 verbose = ['--verbose']
400 printed_path = True
401
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000402 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
403 if remote_ref:
smut@google.comd33eab32014-07-07 19:35:18 +0000404 # Rewrite remote refs to their local equivalents.
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000405 revision = ''.join(remote_ref)
406 rev_type = "branch"
407 elif revision.startswith('refs/'):
408 # Local branch? We probably don't want to support, since DEPS should
409 # always specify branches as they are in the upstream repo.
smut@google.comd33eab32014-07-07 19:35:18 +0000410 rev_type = "branch"
411 else:
412 # hash is also a tag, only make a distinction at checkout
413 rev_type = "hash"
414
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000415 mirror = self._GetMirror(url, options)
416 if mirror:
417 url = mirror.mirror_path
418
primiano@chromium.org1c127382015-02-17 11:15:40 +0000419 # If we are going to introduce a new project, there is a possibility that
420 # we are syncing back to a state where the project was originally a
421 # sub-project rolled by DEPS (realistic case: crossing the Blink merge point
422 # syncing backwards, when Blink was a DEPS entry and not part of src.git).
423 # In such case, we might have a backup of the former .git folder, which can
424 # be used to avoid re-fetching the entire repo again (useful for bisects).
425 backup_dir = self.GetGitBackupDirPath()
426 target_dir = os.path.join(self.checkout_path, '.git')
427 if os.path.exists(backup_dir) and not os.path.exists(target_dir):
428 gclient_utils.safe_makedirs(self.checkout_path)
429 os.rename(backup_dir, target_dir)
430 # Reset to a clean state
431 self._Run(['reset', '--hard', 'HEAD'], options)
432
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000433 if (not os.path.exists(self.checkout_path) or
434 (os.path.isdir(self.checkout_path) and
435 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000436 if mirror:
437 self._UpdateMirror(mirror, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000438 try:
smut@google.comd33eab32014-07-07 19:35:18 +0000439 self._Clone(revision, url, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000440 except subprocess2.CalledProcessError:
441 self._DeleteOrMove(options.force)
smut@google.comd33eab32014-07-07 19:35:18 +0000442 self._Clone(revision, url, options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000443 if file_list is not None:
444 files = self._Capture(['ls-files']).splitlines()
445 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000446 if not verbose:
447 # Make the output a little prettier. It's nice to have some whitespace
448 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000449 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000450 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000451
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000452 if not managed:
453 self._UpdateBranchHeads(options, fetch=False)
454 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
455 return self._Capture(['rev-parse', '--verify', 'HEAD'])
456
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000457 self._maybe_break_locks(options)
458
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000459 if mirror:
460 self._UpdateMirror(mirror, options)
461
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000462 # See if the url has changed (the unittests use git://foo for the url, let
463 # that through).
464 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
465 return_early = False
466 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
467 # unit test pass. (and update the comment above)
468 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
469 # This allows devs to use experimental repos which have a different url
470 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000471 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000472 url != 'git://foo' and
473 subprocess2.capture(
474 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
475 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000476 self.Print('_____ switching %s to a new upstream' % self.relpath)
iannucci@chromium.org78514212014-08-20 23:08:00 +0000477 if not (options.force or options.reset):
478 # Make sure it's clean
479 self._CheckClean(rev_str)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000480 # Switch over to the new upstream
481 self._Run(['remote', 'set-url', self.remote, url], options)
szager@chromium.org8dd35462015-06-08 22:56:05 +0000482 if mirror:
483 with open(os.path.join(
484 self.checkout_path, '.git', 'objects', 'info', 'alternates'),
485 'w') as fh:
486 fh.write(os.path.join(url, 'objects'))
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000487 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
smut@google.comd33eab32014-07-07 19:35:18 +0000488 self._FetchAndReset(revision, file_list, options)
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000489
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000490 return_early = True
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000491 else:
492 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000493
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000494 if return_early:
495 return self._Capture(['rev-parse', '--verify', 'HEAD'])
496
msb@chromium.org5bde4852009-12-14 16:47:12 +0000497 cur_branch = self._GetCurrentBranch()
498
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000499 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000500 # 0) HEAD is detached. Probably from our initial clone.
501 # - make sure HEAD is contained by a named ref, then update.
502 # Cases 1-4. HEAD is a branch.
503 # 1) current branch is not tracking a remote branch (could be git-svn)
504 # - try to rebase onto the new hash or branch
505 # 2) current branch is tracking a remote branch with local committed
506 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000507 # - rebase those changes on top of the hash
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000508 # 3) current branch is tracking a remote branch w/or w/out changes, and
509 # no DEPS switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000511 # 4) current branch is tracking a remote branch, but DEPS switches to a
512 # different remote branch, and
513 # a) current branch has no local changes, and --force:
514 # - checkout new branch
515 # b) current branch has local changes, and --force and --reset:
516 # - checkout new branch
517 # c) otherwise exit
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000518
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000519 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
520 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
522 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000523 if cur_branch is None:
524 upstream_branch = None
525 current_type = "detached"
526 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000527 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000528 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
529 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
530 current_type = "hash"
531 logging.debug("Current branch is not tracking an upstream (remote)"
532 " branch.")
533 elif upstream_branch.startswith('refs/remotes'):
534 current_type = "branch"
535 else:
536 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000537
smut@google.comd33eab32014-07-07 19:35:18 +0000538 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000539 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000540 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000541 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000542 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000543 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000544
mmoss@chromium.org37ac0e32015-08-18 18:14:38 +0000545 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000546
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000547 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000548 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000549 target = 'HEAD'
550 if options.upstream and upstream_branch:
551 target = upstream_branch
552 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000553
msb@chromium.org786fb682010-06-02 15:16:23 +0000554 if current_type == 'detached':
555 # case 0
hinoka@chromium.org3f0dacf2016-04-25 22:06:53 +0000556 if not options.force:
557 # Don't do this check if nuclear option is on.
558 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000559 self._CheckDetachedHead(rev_str, options)
smut@google.comd33eab32014-07-07 19:35:18 +0000560 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
szager@chromium.org848fd492014-04-09 19:06:44 +0000561 self.Print('Up-to-date; skipping checkout.')
562 else:
vadimsh@chromium.org2b7d3ed2014-06-20 18:15:37 +0000563 # 'git checkout' may need to overwrite existing untracked files. Allow
564 # it only when nuclear options are enabled.
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000565 self._Checkout(
566 options,
567 revision,
hinoka@chromium.org3f0dacf2016-04-25 22:06:53 +0000568 force=(options.force or options.delete_unversioned_trees),
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000569 quiet=True,
570 )
msb@chromium.org786fb682010-06-02 15:16:23 +0000571 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000572 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000573 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000574 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000575 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000576 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000577 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000578 newbase=revision, printed_path=printed_path,
579 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000580 printed_path = True
581 else:
582 # Can't find a merge-base since we don't know our upstream. That makes
583 # this command VERY likely to produce a rebase failure. For now we
584 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000585 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000586 if options.revision or deps_revision:
smut@google.comd33eab32014-07-07 19:35:18 +0000587 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000588 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000589 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000590 printed_path = True
smut@google.comd33eab32014-07-07 19:35:18 +0000591 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000592 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000593 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000594 newbase=revision, printed_path=printed_path,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000595 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000596 printed_path = True
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000597 elif remote_ref and ''.join(remote_ref) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000598 # case 4
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000599 new_base = ''.join(remote_ref)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000600 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000601 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000602 switch_error = ("Could not switch upstream branch from %s to %s\n"
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000603 % (upstream_branch, new_base) +
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000604 "Please use --force or merge or rebase manually:\n" +
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000605 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
606 "OR git checkout -b <some new branch> %s" % new_base)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000607 force_switch = False
608 if options.force:
609 try:
610 self._CheckClean(rev_str)
611 # case 4a
612 force_switch = True
613 except gclient_utils.Error as e:
614 if options.reset:
615 # case 4b
616 force_switch = True
617 else:
618 switch_error = '%s\n%s' % (e.message, switch_error)
619 if force_switch:
620 self.Print("Switching upstream branch from %s to %s" %
621 (upstream_branch, new_base))
622 switch_branch = 'gclient_' + remote_ref[1]
623 self._Capture(['branch', '-f', switch_branch, new_base])
624 self._Checkout(options, switch_branch, force=True, quiet=True)
625 else:
626 # case 4c
627 raise gclient_utils.Error(switch_error)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000628 else:
629 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000630 if files is not None:
631 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000632 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000633 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000634 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000635 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000636 if options.merge:
637 merge_args.append('--ff')
638 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000639 merge_args.append('--ff-only')
640 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000641 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000642 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000643 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000644 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000645 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000646 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000647 printed_path = True
648 while True:
dnj@chromium.org5b23e872015-02-20 21:25:57 +0000649 if not options.auto_rebase:
650 try:
651 action = self._AskForData(
652 'Cannot %s, attempt to rebase? '
653 '(y)es / (q)uit / (s)kip : ' %
654 ('merge' if options.merge else 'fast-forward merge'),
655 options)
656 except ValueError:
657 raise gclient_utils.Error('Invalid Character')
658 if options.auto_rebase or re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000659 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000660 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000661 printed_path = True
662 break
663 elif re.match(r'quit|q', action, re.I):
664 raise gclient_utils.Error("Can't fast-forward, please merge or "
665 "rebase manually.\n"
666 "cd %s && git " % self.checkout_path
667 + "rebase %s" % upstream_branch)
668 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000669 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000670 return
671 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000672 self.Print('Input not recognized')
smut@google.com27c9c8a2014-09-11 19:57:55 +0000673 elif re.match("error: Your local changes to '.*' would be "
674 "overwritten by merge. Aborting.\nPlease, commit your "
675 "changes or stash them before you can merge.\n",
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000676 e.stderr):
677 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000678 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000679 printed_path = True
680 raise gclient_utils.Error(e.stderr)
681 else:
682 # Some other problem happened with the merge
683 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000684 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000685 raise
686 else:
687 # Fast-forward merge was successful
688 if not re.match('Already up-to-date.', merge_output) or verbose:
689 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000690 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000691 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000692 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000693 if not verbose:
694 # Make the output a little prettier. It's nice to have some
695 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000696 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000697
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000698 if file_list is not None:
699 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000700
701 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000702 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000703 raise gclient_utils.Error('\n____ %s%s\n'
704 '\nConflict while rebasing this branch.\n'
705 'Fix the conflict and run gclient again.\n'
706 'See man git-rebase for details.\n'
707 % (self.relpath, rev_str))
708
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000709 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000710 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
711 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000712
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000713 # If --reset and --delete_unversioned_trees are specified, remove any
714 # untracked directories.
715 if options.reset and options.delete_unversioned_trees:
716 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
717 # merge-base by default), so doesn't include untracked files. So we use
718 # 'git ls-files --directory --others --exclude-standard' here directly.
719 paths = scm.GIT.Capture(
720 ['ls-files', '--directory', '--others', '--exclude-standard'],
721 self.checkout_path)
722 for path in (p for p in paths.splitlines() if p.endswith('/')):
723 full_path = os.path.join(self.checkout_path, path)
724 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000725 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000726 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000727
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000728 return self._Capture(['rev-parse', '--verify', 'HEAD'])
729
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000730
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000731 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000732 """Reverts local modifications.
733
734 All reverted files will be appended to file_list.
735 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000736 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000737 # revert won't work if the directory doesn't exist. It needs to
738 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000739 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000740 # Don't reuse the args.
741 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000742
743 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000744 if options.upstream:
745 if self._GetCurrentBranch():
746 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
747 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000748 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000749 if not deps_revision:
750 deps_revision = default_rev
smut@google.comd33eab32014-07-07 19:35:18 +0000751 if deps_revision.startswith('refs/heads/'):
752 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000753 try:
754 deps_revision = self.GetUsableRev(deps_revision, options)
755 except NoUsableRevError as e:
756 # If the DEPS entry's url and hash changed, try to update the origin.
757 # See also http://crbug.com/520067.
758 logging.warn(
759 'Couldn\'t find usable revision, will retrying to update instead: %s',
760 e.message)
761 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000762
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000763 if file_list is not None:
764 files = self._Capture(['diff', deps_revision, '--name-only']).split()
765
maruel@chromium.org37e89872010-09-07 16:11:33 +0000766 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000767 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000768
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000769 if file_list is not None:
770 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
771
772 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000773 """Returns revision"""
774 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000775
msb@chromium.orge28e4982009-09-25 20:51:45 +0000776 def runhooks(self, options, args, file_list):
777 self.status(options, args, file_list)
778
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000779 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000780 """Display status information."""
781 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000782 self.Print('________ couldn\'t run status in %s:\n'
783 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000784 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000785 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000786 self._Run(['diff', '--name-status', merge_base], options,
787 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000788 if file_list is not None:
789 files = self._Capture(['diff', '--name-only', merge_base]).split()
790 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000791
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000792 def GetUsableRev(self, rev, options):
793 """Finds a useful revision for this repository.
794
795 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
796 will be called on the source."""
797 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000798 if not os.path.isdir(self.checkout_path):
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000799 raise NoUsableRevError(
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000800 ( 'We could not find a valid hash for safesync_url response "%s".\n'
801 'Safesync URLs with a git checkout currently require the repo to\n'
802 'be cloned without a safesync_url before adding the safesync_url.\n'
803 'For more info, see: '
804 'http://code.google.com/p/chromium/wiki/UsingNewGit'
805 '#Initial_checkout' ) % rev)
806 elif rev.isdigit() and len(rev) < 7:
807 # Handles an SVN rev. As an optimization, only verify an SVN revision as
808 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000809 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000810 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
811 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000812 try:
813 logging.debug('Looking for git-svn configuration optimizations.')
814 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
815 cwd=self.checkout_path):
dnj@chromium.org680f2172014-06-25 00:39:32 +0000816 self._Fetch(options)
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000817 except subprocess2.CalledProcessError:
818 logging.debug('git config --get svn-remote.svn.fetch failed, '
819 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000820 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000821 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000822 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000823 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000824 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
825 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000826 except gclient_utils.Error, e:
827 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000828 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000829 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
830 'the closest sane git revision, which is:\n'
831 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000832 if not sha1:
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000833 raise NoUsableRevError(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000834 ( 'It appears that either your git-svn remote is incorrectly\n'
835 'configured or the revision in your safesync_url is\n'
836 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
837 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000838 else:
839 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
840 sha1 = rev
841 else:
842 # May exist in origin, but we don't have it yet, so fetch and look
843 # again.
dnj@chromium.org680f2172014-06-25 00:39:32 +0000844 self._Fetch(options)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000845 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
846 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000847
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000848 if not sha1:
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000849 raise NoUsableRevError(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000850 ( 'We could not find a valid hash for safesync_url response "%s".\n'
851 'Safesync URLs with a git checkout currently require a git-svn\n'
852 'remote or a safesync_url that provides git sha1s. Please add a\n'
853 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000854 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000855 '#Initial_checkout' ) % rev)
856
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000857 return sha1
858
msb@chromium.orge6f78352010-01-13 17:05:33 +0000859 def FullUrlForRelativeUrl(self, url):
860 # Strip from last '/'
861 # Equivalent to unix basename
862 base_url = self.url
863 return base_url[:base_url.rfind('/')] + url
864
primiano@chromium.org1c127382015-02-17 11:15:40 +0000865 def GetGitBackupDirPath(self):
866 """Returns the path where the .git folder for the current project can be
867 staged/restored. Use case: subproject moved from DEPS <-> outer project."""
868 return os.path.join(self._root_dir,
869 'old_' + self.relpath.replace(os.sep, '_')) + '.git'
870
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000871 def _GetMirror(self, url, options):
872 """Get a git_cache.Mirror object for the argument url."""
873 if not git_cache.Mirror.GetCachePath():
874 return None
hinoka@google.comb1b54572014-04-16 22:29:23 +0000875 mirror_kwargs = {
876 'print_func': self.filter,
877 'refs': []
878 }
hinoka@google.comb1b54572014-04-16 22:29:23 +0000879 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
880 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org8d3348f2014-08-19 22:49:16 +0000881 if hasattr(options, 'with_tags') and options.with_tags:
882 mirror_kwargs['refs'].append('refs/tags/*')
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000883 return git_cache.Mirror(url, **mirror_kwargs)
884
885 @staticmethod
886 def _UpdateMirror(mirror, options):
887 """Update a git mirror by fetching the latest commits from the remote."""
szager@chromium.org3ec84f62014-08-22 21:00:22 +0000888 if getattr(options, 'shallow', False):
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000889 # HACK(hinoka): These repositories should be super shallow.
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000890 if 'flash' in mirror.url:
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000891 depth = 10
892 else:
893 depth = 10000
894 else:
895 depth = None
e.hakkinen@samsung.come8bc1aa2015-04-08 08:00:37 +0000896 mirror.populate(verbose=options.verbose,
897 bootstrap=not getattr(options, 'no_bootstrap', False),
898 depth=depth,
szager@chromium.orgdbb6f822016-02-02 22:59:30 +0000899 ignore_lock=getattr(options, 'ignore_locks', False),
900 lock_timeout=getattr(options, 'lock_timeout', 0))
szager@chromium.org848fd492014-04-09 19:06:44 +0000901 mirror.unlock()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000902
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000903 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000904 """Clone a git repository from the given URL.
905
msb@chromium.org786fb682010-06-02 15:16:23 +0000906 Once we've cloned the repo, we checkout a working branch if the specified
907 revision is a branch head. If it is a tag or a specific commit, then we
908 leave HEAD detached as it makes future updates simpler -- in this case the
909 user should first create a new branch or switch to an existing branch before
910 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000911 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000912 # git clone doesn't seem to insert a newline properly before printing
913 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000914 self.Print('')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000915 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.org8a139702014-06-20 15:55:01 +0000916 clone_cmd = cfg + ['clone', '--no-checkout', '--progress']
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000917 if self.cache_dir:
918 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000919 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000920 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000921 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000922 # If the parent directory does not exist, Git clone on Windows will not
923 # create it, so we need to do it manually.
924 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000925 gclient_utils.safe_makedirs(parent_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000926
927 template_dir = None
928 if hasattr(options, 'no_history') and options.no_history:
929 if gclient_utils.IsGitSha(revision):
930 # In the case of a subproject, the pinned sha is not necessarily the
931 # head of the remote branch (so we can't just use --depth=N). Instead,
932 # we tell git to fetch all the remote objects from SHA..HEAD by means of
933 # a template git dir which has a 'shallow' file pointing to the sha.
934 template_dir = tempfile.mkdtemp(
935 prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
936 dir=parent_dir)
937 self._Run(['init', '--bare', template_dir], options, cwd=self._root_dir)
938 with open(os.path.join(template_dir, 'shallow'), 'w') as template_file:
939 template_file.write(revision)
940 clone_cmd.append('--template=' + template_dir)
941 else:
942 # Otherwise, we're just interested in the HEAD. Just use --depth.
943 clone_cmd.append('--depth=1')
944
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000945 tmp_dir = tempfile.mkdtemp(
946 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
947 dir=parent_dir)
948 try:
949 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000950 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000951 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000952 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
953 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000954 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000955 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000956 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000957 finally:
958 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000959 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000960 gclient_utils.rmtree(tmp_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000961 if template_dir:
962 gclient_utils.rmtree(template_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000963 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000964 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
965 self._Checkout(options, ''.join(remote_ref or revision), quiet=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000966 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000967 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000968 self.Print(
smut@google.comd33eab32014-07-07 19:35:18 +0000969 ('Checked out %s to a detached HEAD. Before making any commits\n'
970 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
971 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
972 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000973
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000974 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000975 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000976 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000977 raise gclient_utils.Error("Background task requires input. Rerun "
978 "gclient with --jobs=1 so that\n"
979 "interaction is possible.")
980 try:
981 return raw_input(prompt)
982 except KeyboardInterrupt:
983 # Hide the exception.
984 sys.exit(1)
985
986
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000987 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000988 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000989 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000990 if files is not None:
991 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000992 revision = upstream
993 if newbase:
994 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000995 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000996 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000997 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000998 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000999 printed_path = True
1000 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001001 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001002
1003 if merge:
1004 merge_output = self._Capture(['merge', revision])
1005 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001006 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001007 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001008
1009 # Build the rebase command here using the args
1010 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
1011 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001012 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001013 rebase_cmd.append('--verbose')
1014 if newbase:
1015 rebase_cmd.extend(['--onto', newbase])
1016 rebase_cmd.append(upstream)
1017 if branch:
1018 rebase_cmd.append(branch)
1019
1020 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001021 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001022 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001023 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
1024 re.match(r'cannot rebase: your index contains uncommitted changes',
1025 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001026 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001027 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +00001028 'Cannot rebase because of unstaged changes.\n'
1029 '\'git reset --hard HEAD\' ?\n'
1030 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +00001031 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001032 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +00001033 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001034 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001035 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001036 break
1037 elif re.match(r'quit|q', rebase_action, re.I):
1038 raise gclient_utils.Error("Please merge or rebase manually\n"
1039 "cd %s && git " % self.checkout_path
1040 + "%s" % ' '.join(rebase_cmd))
1041 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001042 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001043 continue
1044 else:
1045 gclient_utils.Error("Input not recognized")
1046 continue
1047 elif re.search(r'^CONFLICT', e.stdout, re.M):
1048 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
1049 "Fix the conflict and run gclient again.\n"
1050 "See 'man git-rebase' for details.\n")
1051 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001052 self.Print(e.stdout.strip())
1053 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001054 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
1055 "manually.\ncd %s && git " %
1056 self.checkout_path
1057 + "%s" % ' '.join(rebase_cmd))
1058
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001059 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001060 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001061 # Make the output a little prettier. It's nice to have some
1062 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001063 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001064
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001065 @staticmethod
1066 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +00001067 (ok, current_version) = scm.GIT.AssertVersion(min_version)
1068 if not ok:
1069 raise gclient_utils.Error('git version %s < minimum required %s' %
1070 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +00001071
tandrii@chromium.orgc438c142015-08-24 22:55:55 +00001072 def _EnsureValidHeadObjectOrCheckout(self, revision, options, url):
1073 # Special case handling if all 3 conditions are met:
1074 # * the mirros have recently changed, but deps destination remains same,
1075 # * the git histories of mirrors are conflicting.
1076 # * git cache is used
1077 # This manifests itself in current checkout having invalid HEAD commit on
1078 # most git operations. Since git cache is used, just deleted the .git
1079 # folder, and re-create it by cloning.
1080 try:
1081 self._Capture(['rev-list', '-n', '1', 'HEAD'])
1082 except subprocess2.CalledProcessError as e:
1083 if ('fatal: bad object HEAD' in e.stderr
1084 and self.cache_dir and self.cache_dir in url):
1085 self.Print((
1086 'Likely due to DEPS change with git cache_dir, '
1087 'the current commit points to no longer existing object.\n'
1088 '%s' % e)
1089 )
1090 self._DeleteOrMove(options.force)
1091 self._Clone(revision, url, options)
1092 else:
1093 raise
1094
msb@chromium.org786fb682010-06-02 15:16:23 +00001095 def _IsRebasing(self):
1096 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
1097 # have a plumbing command to determine whether a rebase is in progress, so
1098 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
1099 g = os.path.join(self.checkout_path, '.git')
1100 return (
1101 os.path.isdir(os.path.join(g, "rebase-merge")) or
1102 os.path.isdir(os.path.join(g, "rebase-apply")))
1103
1104 def _CheckClean(self, rev_str):
iannucci@chromium.orgd9b318c2015-12-04 20:03:08 +00001105 lockfile = os.path.join(self.checkout_path, ".git", "index.lock")
1106 if os.path.exists(lockfile):
1107 raise gclient_utils.Error(
1108 '\n____ %s%s\n'
1109 '\tYour repo is locked, possibly due to a concurrent git process.\n'
1110 '\tIf no git executable is running, then clean up %r and try again.\n'
1111 % (self.relpath, rev_str, lockfile))
1112
msb@chromium.org786fb682010-06-02 15:16:23 +00001113 # Make sure the tree is clean; see git-rebase.sh for reference
1114 try:
1115 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001116 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001117 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001118 raise gclient_utils.Error('\n____ %s%s\n'
1119 '\tYou have unstaged changes.\n'
1120 '\tPlease commit, stash, or reset.\n'
1121 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001122 try:
1123 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
smut@google.com27c9c8a2014-09-11 19:57:55 +00001124 '--ignore-submodules', 'HEAD', '--'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001125 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001126 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001127 raise gclient_utils.Error('\n____ %s%s\n'
1128 '\tYour index contains uncommitted changes\n'
1129 '\tPlease commit, stash, or reset.\n'
1130 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001131
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001132 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +00001133 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1134 # reference by a commit). If not, error out -- most likely a rebase is
1135 # in progress, try to detect so we can give a better error.
1136 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001137 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1138 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001139 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001140 # Commit is not contained by any rev. See if the user is rebasing:
1141 if self._IsRebasing():
1142 # Punt to the user
1143 raise gclient_utils.Error('\n____ %s%s\n'
1144 '\tAlready in a conflict, i.e. (no branch).\n'
1145 '\tFix the conflict and run gclient again.\n'
1146 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1147 '\tSee man git-rebase for details.\n'
1148 % (self.relpath, rev_str))
1149 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001150 name = ('saved-by-gclient-' +
1151 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001152 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001153 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001154 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001155
msb@chromium.org5bde4852009-12-14 16:47:12 +00001156 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001157 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001158 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001159 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001160 return None
1161 return branch
1162
borenet@google.comc3e09d22014-04-10 13:58:18 +00001163 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001164 kwargs.setdefault('cwd', self.checkout_path)
1165 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001166 env = scm.GIT.ApplyEnvVars(kwargs)
1167 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001168
dnj@chromium.orgbb424c02014-06-23 22:42:51 +00001169 def _Checkout(self, options, ref, force=False, quiet=None):
1170 """Performs a 'git-checkout' operation.
1171
1172 Args:
1173 options: The configured option set
1174 ref: (str) The branch/commit to checkout
1175 quiet: (bool/None) Whether or not the checkout shoud pass '--quiet'; if
1176 'None', the behavior is inferred from 'options.verbose'.
1177 Returns: (str) The output of the checkout operation
1178 """
1179 if quiet is None:
1180 quiet = (not options.verbose)
1181 checkout_args = ['checkout']
1182 if force:
1183 checkout_args.append('--force')
1184 if quiet:
1185 checkout_args.append('--quiet')
1186 checkout_args.append(ref)
1187 return self._Capture(checkout_args)
1188
dnj@chromium.org680f2172014-06-25 00:39:32 +00001189 def _Fetch(self, options, remote=None, prune=False, quiet=False):
1190 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
1191 fetch_cmd = cfg + [
1192 'fetch',
1193 remote or self.remote,
1194 ]
1195
1196 if prune:
1197 fetch_cmd.append('--prune')
1198 if options.verbose:
1199 fetch_cmd.append('--verbose')
1200 elif quiet:
1201 fetch_cmd.append('--quiet')
1202 self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
1203
1204 # Return the revision that was fetched; this will be stored in 'FETCH_HEAD'
1205 return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])
1206
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001207 def _UpdateBranchHeads(self, options, fetch=False):
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001208 """Adds, and optionally fetches, "branch-heads" and "tags" refspecs
1209 if requested."""
1210 need_fetch = fetch
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001211 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001212 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001213 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1214 '^\\+refs/branch-heads/\\*:.*$']
1215 self._Run(config_cmd, options)
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001216 need_fetch = True
1217 if hasattr(options, 'with_tags') and options.with_tags:
1218 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
1219 '+refs/tags/*:refs/tags/*',
1220 '^\\+refs/tags/\\*:.*$']
1221 self._Run(config_cmd, options)
1222 need_fetch = True
1223 if fetch and need_fetch:
1224 self._Fetch(options)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001225
dnj@chromium.org680f2172014-06-25 00:39:32 +00001226 def _Run(self, args, options, show_header=True, **kwargs):
1227 # Disable 'unused options' warning | pylint: disable=W0613
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001228 kwargs.setdefault('cwd', self.checkout_path)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001229 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001230 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001231 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001232 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001233 cmd = ['git'] + args
dnj@chromium.org680f2172014-06-25 00:39:32 +00001234 if show_header:
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001235 gclient_utils.CheckCallAndFilterAndHeader(cmd, env=env, **kwargs)
1236 else:
1237 gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001238
1239
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001240class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001241 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001242 name = 'svn'
maruel@chromium.org79d62372015-06-01 18:50:55 +00001243 _PRINTED_DEPRECATION = False
1244
1245 _MESSAGE = (
1246 'Oh hai! You are using subversion. Chrome infra is eager to get rid of',
1247 'svn support so please switch to git.',
1248 'Tracking bug: http://crbug.com/475320',
iannucci@chromium.org9e18dee2015-07-28 07:22:21 +00001249 'If you are a project owner, you may request git migration assistance at: ',
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001250 ' https://code.google.com/p/chromium/issues/entry?template=Infra-Git')
maruel@chromium.org79d62372015-06-01 18:50:55 +00001251
1252 def __init__(self, *args, **kwargs):
1253 super(SVNWrapper, self).__init__(*args, **kwargs)
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001254 suppress_deprecated_notice = os.environ.get(
1255 'SUPPRESS_DEPRECATED_SVN_NOTICE', False)
1256 if not SVNWrapper._PRINTED_DEPRECATION and not suppress_deprecated_notice:
maruel@chromium.org79d62372015-06-01 18:50:55 +00001257 SVNWrapper._PRINTED_DEPRECATION = True
1258 sys.stderr.write('\n'.join(self._MESSAGE) + '\n')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001259
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001260 @staticmethod
1261 def BinaryExists():
1262 """Returns true if the command exists."""
1263 try:
1264 result, version = scm.SVN.AssertVersion('1.4')
1265 if not result:
1266 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1267 return result
1268 except OSError:
1269 return False
1270
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001271 def GetCheckoutRoot(self):
1272 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1273
floitsch@google.comeaab7842011-04-28 09:07:58 +00001274 def GetRevisionDate(self, revision):
1275 """Returns the given revision's date in ISO-8601 format (which contains the
1276 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001277 date = scm.SVN.Capture(
1278 ['propget', '--revprop', 'svn:date', '-r', revision],
1279 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001280 return date.strip()
1281
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001282 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001283 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001284 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001285
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001286 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001287 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001288 if not os.path.isdir(self.checkout_path):
1289 raise gclient_utils.Error('Directory %s is not present.' %
1290 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001291 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001292
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001293 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001294 """Generates a patch file which can be applied to the root of the
1295 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001296 if not os.path.isdir(self.checkout_path):
1297 raise gclient_utils.Error('Directory %s is not present.' %
1298 self.checkout_path)
1299 gclient_utils.CheckCallAndFilter(
1300 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1301 cwd=self.checkout_path,
1302 print_stdout=False,
avakulenko@google.com255f2be2014-12-05 22:19:55 +00001303 filter_fn=SvnDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001304
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001305 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001306 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001307
1308 All updated files will be appended to file_list.
1309
1310 Raises:
1311 Error: if can't get URL for relative path.
1312 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001313 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001314 hg_path = os.path.join(self.checkout_path, '.hg')
1315 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001316 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001317 return
1318
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001319 if args:
1320 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1321
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001322 # revision is the revision to match. It is None if no revision is specified,
1323 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001324 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001325 # Keep the original unpinned url for reference in case the repo is switched.
1326 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001327 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001328 if options.revision:
1329 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001330 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001331 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001332 if revision != 'unmanaged':
1333 forced_revision = True
1334 # Reconstruct the url.
1335 url = '%s@%s' % (url, revision)
1336 rev_str = ' at %s' % revision
1337 else:
1338 managed = False
1339 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001340 else:
1341 forced_revision = False
1342 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001343
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001344 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001345 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001346 # Git is only okay if it's a git-svn checkout of the right repo.
1347 if scm.GIT.IsGitSvn(self.checkout_path):
1348 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1349 'svn-remote.svn.url'],
1350 cwd=self.checkout_path).rstrip()
1351 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001352 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1353 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001354 return # TODO(borenet): Get the svn revision number?
1355
1356 # Get the existing scm url and the revision number of the current checkout.
1357 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001358 try:
1359 from_info = scm.SVN.CaptureLocalInfo(
1360 [], os.path.join(self.checkout_path, '.'))
1361 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001362 self._DeleteOrMove(options.force)
1363 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001364
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001365 BASE_URLS = {
1366 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1367 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1368 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001369 WHITELISTED_ROOTS = [
1370 'svn://svn.chromium.org',
1371 'svn://svn-mirror.golo.chromium.org',
1372 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001373 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001374 try:
1375 # Split out the revision number since it's not useful for us.
1376 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001377 # Check to see if we're on a whitelisted root. We do this because
1378 # only some svn servers have matching UUIDs.
1379 local_parsed = urlparse.urlparse(url)
1380 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001381 if ('CHROME_HEADLESS' in os.environ
1382 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001383 and base_path in BASE_URLS
1384 and local_root in WHITELISTED_ROOTS):
1385
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001386 # Use a tarball for initial sync if we are on a bot.
1387 # Get an unauthenticated gsutil instance.
1388 gsutil = download_from_google_storage.Gsutil(
1389 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1390
1391 gs_path = BASE_URLS[base_path]
1392 _, out, _ = gsutil.check_call('ls', gs_path)
1393 # So that we can get the most recent revision.
1394 sorted_items = sorted(out.splitlines())
1395 latest_checkout = sorted_items[-1]
1396
1397 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001398 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001399 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1400 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001401 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001402 raise Exception()
1403 filename = latest_checkout.split('/')[-1]
1404 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001405 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001406 gclient_utils.safe_makedirs(self.checkout_path)
1407 # TODO(hinoka): Use 7z for windows.
1408 cmd = ['tar', '--extract', '--ungzip',
1409 '--directory', self.checkout_path,
1410 '--file', tarball]
1411 gclient_utils.CheckCallAndFilter(
1412 cmd, stdout=sys.stdout, print_stdout=True)
1413
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001414 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001415 gclient_utils.rmtree(tempdir)
1416
1417 # Rewrite the repository root to match.
1418 tarball_url = scm.SVN.CaptureLocalInfo(
1419 ['.'], self.checkout_path)['Repository Root']
1420 tarball_parsed = urlparse.urlparse(tarball_url)
1421 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1422 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001423
1424 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001425 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001426 self._Run(['switch', '--relocate', tarball_root,
1427 local_root, self.checkout_path],
1428 options)
1429 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001430 self.Print('We tried to get a source tarball but failed.')
1431 self.Print('Resuming normal operations.')
1432 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001433
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001434 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001435 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001436 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001437 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001438 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001439 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001440
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001441 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001442 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001443 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1444 return self.Svnversion()
1445 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001446
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001447 if 'URL' not in from_info:
1448 raise gclient_utils.Error(
1449 ('gclient is confused. Couldn\'t get the url for %s.\n'
1450 'Try using @unmanaged.\n%s') % (
1451 self.checkout_path, from_info))
1452
stip@chromium.org3031d732014-04-21 22:18:02 +00001453 # Look for locked directories.
1454 dir_info = scm.SVN.CaptureStatus(
1455 None, os.path.join(self.checkout_path, '.'))
1456 if any(d[0][2] == 'L' for d in dir_info):
1457 try:
1458 self._Run(['cleanup', self.checkout_path], options)
1459 except subprocess2.CalledProcessError, e:
1460 # Get the status again, svn cleanup may have cleaned up at least
1461 # something.
1462 dir_info = scm.SVN.CaptureStatus(
1463 None, os.path.join(self.checkout_path, '.'))
1464
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001465 # Try to fix the failures by removing troublesome files.
1466 for d in dir_info:
1467 if d[0][2] == 'L':
1468 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001469 # We don't pass any files/directories to CaptureStatus and set
1470 # cwd=self.checkout_path, so we should get relative paths here.
1471 assert not os.path.isabs(d[1])
1472 path_to_remove = os.path.normpath(
1473 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001474 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001475 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001476 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001477 self.Print(
1478 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001479 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001480 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001481 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001482
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001483 # Retrieve the current HEAD version because svn is slow at null updates.
1484 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001485 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001486 revision = str(from_info_live['Revision'])
1487 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001488
borenet@google.comb09097a2014-04-09 19:09:08 +00001489 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001490 # The repository url changed, need to switch.
1491 try:
1492 to_info = scm.SVN.CaptureRemoteInfo(url)
1493 except (gclient_utils.Error, subprocess2.CalledProcessError):
1494 # The url is invalid or the server is not accessible, it's safer to bail
1495 # out right now.
1496 raise gclient_utils.Error('This url is unreachable: %s' % url)
1497 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1498 and (from_info['UUID'] == to_info['UUID']))
1499 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001500 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001501 # We have different roots, so check if we can switch --relocate.
1502 # Subversion only permits this if the repository UUIDs match.
1503 # Perform the switch --relocate, then rewrite the from_url
1504 # to reflect where we "are now." (This is the same way that
1505 # Subversion itself handles the metadata when switch --relocate
1506 # is used.) This makes the checks below for whether we
1507 # can update to a revision or have to switch to a different
1508 # branch work as expected.
1509 # TODO(maruel): TEST ME !
1510 command = ['switch', '--relocate',
1511 from_info['Repository Root'],
1512 to_info['Repository Root'],
1513 self.relpath]
1514 self._Run(command, options, cwd=self._root_dir)
1515 from_info['URL'] = from_info['URL'].replace(
1516 from_info['Repository Root'],
1517 to_info['Repository Root'])
1518 else:
1519 if not options.force and not options.reset:
1520 # Look for local modifications but ignore unversioned files.
1521 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1522 if status[0][0] != '?':
1523 raise gclient_utils.Error(
1524 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1525 'there is local changes in %s. Delete the directory and '
1526 'try again.') % (url, self.checkout_path))
1527 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001528 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001529 gclient_utils.rmtree(self.checkout_path)
1530 # We need to checkout.
1531 command = ['checkout', url, self.checkout_path]
1532 command = self._AddAdditionalUpdateFlags(command, options, revision)
1533 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1534 return self.Svnversion()
1535
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001536 # If the provided url has a revision number that matches the revision
1537 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001538 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001539 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001540 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001541 else:
1542 command = ['update', self.checkout_path]
1543 command = self._AddAdditionalUpdateFlags(command, options, revision)
1544 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001545
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001546 # If --reset and --delete_unversioned_trees are specified, remove any
1547 # untracked files and directories.
1548 if options.reset and options.delete_unversioned_trees:
1549 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1550 full_path = os.path.join(self.checkout_path, status[1])
1551 if (status[0][0] == '?'
1552 and os.path.isdir(full_path)
1553 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001554 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001555 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001556 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001557
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001558 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001559 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001560 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001561 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001562 # Create an empty checkout and then update the one file we want. Future
1563 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001564 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001565 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001566 if os.path.exists(os.path.join(self.checkout_path, filename)):
1567 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001568 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001569 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001570 # After the initial checkout, we can use update as if it were any other
1571 # dep.
1572 self.update(options, args, file_list)
1573 else:
1574 # If the installed version of SVN doesn't support --depth, fallback to
1575 # just exporting the file. This has the downside that revision
1576 # information is not stored next to the file, so we will have to
1577 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001578 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001579 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001580 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001581 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001582 command = self._AddAdditionalUpdateFlags(command, options,
1583 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001584 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001585
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001586 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001587 """Reverts local modifications. Subversion specific.
1588
1589 All reverted files will be appended to file_list, even if Subversion
1590 doesn't know about them.
1591 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001592 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001593 if os.path.exists(self.checkout_path):
1594 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001595 # svn revert won't work if the directory doesn't exist. It needs to
1596 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001597 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001598 # Don't reuse the args.
1599 return self.update(options, [], file_list)
1600
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001601 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001602 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001603 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001604 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001605 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001606 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001607 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001608 if not options.force:
1609 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001610 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001611 '\n_____ %s is not a valid svn checkout, synching instead' %
1612 self.relpath)
1613 gclient_utils.rmtree(self.checkout_path)
1614 # Don't reuse the args.
1615 return self.update(options, [], file_list)
1616
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001617 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001618 if file_list is not None:
1619 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001620 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001621 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001622 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001623 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001624 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001625
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001626 # Revert() may delete the directory altogether.
1627 if not os.path.isdir(self.checkout_path):
1628 # Don't reuse the args.
1629 return self.update(options, [], file_list)
1630
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001631 try:
1632 # svn revert is so broken we don't even use it. Using
1633 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001634 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001635 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1636 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001637 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001638 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001639 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001640
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001641 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001642 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001643 try:
1644 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001645 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001646 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001647
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001648 def runhooks(self, options, args, file_list):
1649 self.status(options, args, file_list)
1650
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001651 def status(self, options, args, file_list):
1652 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001653 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001654 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001655 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001656 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001657 'The directory does not exist.') %
1658 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001659 # There's no file list to retrieve.
1660 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001661 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001662
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001663 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001664 """Verifies the validity of the revision for this repository."""
1665 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
tandrii@chromium.orgef141922015-08-12 17:36:27 +00001666 raise NoUsableRevError(
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001667 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1668 'correct.') % rev)
1669 return rev
1670
msb@chromium.orge6f78352010-01-13 17:05:33 +00001671 def FullUrlForRelativeUrl(self, url):
1672 # Find the forth '/' and strip from there. A bit hackish.
1673 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001674
maruel@chromium.org669600d2010-09-01 19:06:31 +00001675 def _Run(self, args, options, **kwargs):
1676 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001677 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001678 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001679 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001680
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001681 def Svnversion(self):
1682 """Runs the lowest checked out revision in the current project."""
1683 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1684 return info['Revision']
1685
maruel@chromium.org669600d2010-09-01 19:06:31 +00001686 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1687 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001688 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001689 scm.SVN.RunAndGetFileList(
1690 options.verbose,
1691 args + ['--ignore-externals'],
1692 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001693 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001694
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001695 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001696 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001697 """Add additional flags to command depending on what options are set.
1698 command should be a list of strings that represents an svn command.
1699
1700 This method returns a new list to be used as a command."""
1701 new_command = command[:]
1702 if revision:
1703 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001704 # We don't want interaction when jobs are used.
1705 if options.jobs > 1:
1706 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001707 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001708 # --accept was added to 'svn update' in svn 1.6.
1709 if not scm.SVN.AssertVersion('1.5')[0]:
1710 return new_command
1711
1712 # It's annoying to have it block in the middle of a sync, just sensible
1713 # defaults.
1714 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001715 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001716 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1717 new_command.extend(('--accept', 'theirs-conflict'))
1718 elif options.manually_grab_svn_rev:
1719 new_command.append('--force')
1720 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1721 new_command.extend(('--accept', 'postpone'))
1722 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1723 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001724 return new_command