blob: fc177567eaea544afe0a9ef2f162a31389f895a0 [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
smutae7ea312016-07-18 11:59:41 -070033class 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
levarum@chromium.org27a6f9a2016-05-28 00:21:49 +0000176 def GetCacheMirror(self):
177 if (getattr(self, 'cache_dir', None)):
178 url, _ = gclient_utils.SplitUrlRevision(self.url)
179 return git_cache.Mirror(url)
180 return None
181
smut@google.comd33eab32014-07-07 19:35:18 +0000182 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000183 """Attempt to determine the remote URL for this SCMWrapper."""
smut@google.comd33eab32014-07-07 19:35:18 +0000184 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000185 if os.path.exists(os.path.join(self.checkout_path, '.git')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000186 actual_remote_url = self._get_first_remote_url(self.checkout_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000187
levarum@chromium.org27a6f9a2016-05-28 00:21:49 +0000188 mirror = self.GetCacheMirror()
189 # If the cache is used, obtain the actual remote URL from there.
190 if (mirror and mirror.exists() and
191 mirror.mirror_path.replace('\\', '/') ==
192 actual_remote_url.replace('\\', '/')):
193 actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000194 return actual_remote_url
195
196 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000197 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000198 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000199 return None
200
borenet@google.com4e9be262014-04-08 19:40:30 +0000201 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000202 """Determine whether the remote URL of this checkout is the expected URL."""
203 if not os.path.exists(self.checkout_path):
204 # A checkout which doesn't exist can't be broken.
205 return True
206
smut@google.comd33eab32014-07-07 19:35:18 +0000207 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000208 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000209 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
210 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000211 else:
212 # This may occur if the self.checkout_path exists but does not contain a
213 # valid git or svn checkout.
214 return False
215
borenet@google.comb09097a2014-04-09 19:09:08 +0000216 def _DeleteOrMove(self, force):
217 """Delete the checkout directory or move it out of the way.
218
219 Args:
220 force: bool; if True, delete the directory. Otherwise, just move it.
221 """
borenet@google.comb2256212014-05-07 20:57:28 +0000222 if force and os.environ.get('CHROME_HEADLESS') == '1':
223 self.Print('_____ Conflicting directory found in %s. Removing.'
224 % self.checkout_path)
225 gclient_utils.AddWarning('Conflicting directory %s deleted.'
226 % self.checkout_path)
227 gclient_utils.rmtree(self.checkout_path)
228 else:
229 bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
230 os.path.dirname(self.relpath))
231
232 try:
233 os.makedirs(bad_scm_dir)
234 except OSError as e:
235 if e.errno != errno.EEXIST:
236 raise
237
238 dest_path = tempfile.mkdtemp(
239 prefix=os.path.basename(self.relpath),
240 dir=bad_scm_dir)
241 self.Print('_____ Conflicting directory found in %s. Moving to %s.'
242 % (self.checkout_path, dest_path))
243 gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
244 % (self.checkout_path, dest_path))
245 shutil.move(self.checkout_path, dest_path)
borenet@google.comb09097a2014-04-09 19:09:08 +0000246
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000247
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000248class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000249 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000250 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000251 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000252
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000253 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000254
szager@chromium.org848fd492014-04-09 19:06:44 +0000255 def __init__(self, url=None, *args):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000256 """Removes 'git+' fake prefix from git URL."""
257 if url.startswith('git+http://') or url.startswith('git+https://'):
258 url = url[4:]
szager@chromium.org848fd492014-04-09 19:06:44 +0000259 SCMWrapper.__init__(self, url, *args)
260 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
261 if self.out_cb:
262 filter_kwargs['predicate'] = self.out_cb
263 self.filter = gclient_utils.GitFilter(**filter_kwargs)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000264
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000265 @staticmethod
266 def BinaryExists():
267 """Returns true if the command exists."""
268 try:
269 # We assume git is newer than 1.7. See: crbug.com/114483
270 result, version = scm.GIT.AssertVersion('1.7')
271 if not result:
272 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
273 return result
274 except OSError:
275 return False
276
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000277 def GetCheckoutRoot(self):
278 return scm.GIT.GetCheckoutRoot(self.checkout_path)
279
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000280 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000281 """Returns the given revision's date in ISO-8601 format (which contains the
282 time zone)."""
283 # TODO(floitsch): get the time-stamp of the given revision and not just the
284 # time-stamp of the currently checked out revision.
285 return self._Capture(['log', '-n', '1', '--format=%ai'])
286
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000287 @staticmethod
288 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000289 """'Cleanup' the repo.
290
291 There's no real git equivalent for the svn cleanup command, do a no-op.
292 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000293
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000294 def diff(self, options, _args, _file_list):
raphael.kubo.da.costa05c83592016-08-04 08:32:41 -0700295 try:
296 merge_base = [self._Capture(['merge-base', 'HEAD', self.remote])]
297 except subprocess2.CalledProcessError:
298 merge_base = []
299 self._Run(['diff'] + merge_base, options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000300
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000301 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000302 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000303 repository.
304
305 The patch file is generated from a diff of the merge base of HEAD and
306 its upstream branch.
307 """
raphael.kubo.da.costa05c83592016-08-04 08:32:41 -0700308 try:
309 merge_base = [self._Capture(['merge-base', 'HEAD', self.remote])]
310 except subprocess2.CalledProcessError:
311 merge_base = []
maruel@chromium.org17d01792010-09-01 18:07:10 +0000312 gclient_utils.CheckCallAndFilter(
raphael.kubo.da.costa05c83592016-08-04 08:32:41 -0700313 ['git', 'diff'] + merge_base,
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000314 cwd=self.checkout_path,
avakulenko@google.com255f2be2014-12-05 22:19:55 +0000315 filter_fn=GitDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000316
smut@google.comd33eab32014-07-07 19:35:18 +0000317 def _FetchAndReset(self, revision, file_list, options):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000318 """Equivalent to git fetch; git reset."""
319 quiet = []
320 if not options.verbose:
321 quiet = ['--quiet']
322 self._UpdateBranchHeads(options, fetch=False)
323
dnj@chromium.org680f2172014-06-25 00:39:32 +0000324 self._Fetch(options, prune=True, quiet=options.verbose)
smut@google.comd33eab32014-07-07 19:35:18 +0000325 self._Run(['reset', '--hard', revision] + quiet, options)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000326 if file_list is not None:
327 files = self._Capture(['ls-files']).splitlines()
328 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
329
szager@chromium.org8a139702014-06-20 15:55:01 +0000330 def _DisableHooks(self):
331 hook_dir = os.path.join(self.checkout_path, '.git', 'hooks')
332 if not os.path.isdir(hook_dir):
333 return
334 for f in os.listdir(hook_dir):
335 if not f.endswith('.sample') and not f.endswith('.disabled'):
primiano@chromium.org41265562015-04-08 09:14:46 +0000336 disabled_hook_path = os.path.join(hook_dir, f + '.disabled')
337 if os.path.exists(disabled_hook_path):
338 os.remove(disabled_hook_path)
339 os.rename(os.path.join(hook_dir, f), disabled_hook_path)
szager@chromium.org8a139702014-06-20 15:55:01 +0000340
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000341 def _maybe_break_locks(self, options):
342 """This removes all .lock files from this repo's .git directory, if the
343 user passed the --break_repo_locks command line flag.
344
345 In particular, this will cleanup index.lock files, as well as ref lock
346 files.
347 """
348 if options.break_repo_locks:
349 git_dir = os.path.join(self.checkout_path, '.git')
350 for path, _, filenames in os.walk(git_dir):
351 for filename in filenames:
352 if filename.endswith('.lock'):
353 to_break = os.path.join(path, filename)
354 self.Print('breaking lock: %s' % (to_break,))
355 try:
356 os.remove(to_break)
357 except OSError as ex:
358 self.Print('FAILED to break lock: %s: %s' % (to_break, ex))
359 raise
360
361
msb@chromium.orge28e4982009-09-25 20:51:45 +0000362 def update(self, options, args, file_list):
363 """Runs git to update or transparently checkout the working copy.
364
365 All updated files will be appended to file_list.
366
367 Raises:
368 Error: if can't get URL for relative path.
369 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000370 if args:
371 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
372
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000373 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000374
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000375 # If a dependency is not pinned, track the default remote branch.
smut@google.comd33eab32014-07-07 19:35:18 +0000376 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000377 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000378 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000379 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000380 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000381 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000382 # Override the revision number.
383 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000384 if revision == 'unmanaged':
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000385 # Check again for a revision in case an initial ref was specified
386 # in the url, for example bla.git@refs/heads/custombranch
387 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000388 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000389 if not revision:
390 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000391
szager@chromium.org8a139702014-06-20 15:55:01 +0000392 if managed:
393 self._DisableHooks()
394
floitsch@google.comeaab7842011-04-28 09:07:58 +0000395 if gclient_utils.IsDateRevision(revision):
396 # Date-revisions only work on git-repositories if the reflog hasn't
397 # expired yet. Use rev-list to get the corresponding revision.
398 # git rev-list -n 1 --before='time-stamp' branchname
399 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000400 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000401 revision = default_rev
402
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000403 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000404 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000405
406 printed_path = False
407 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000408 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000409 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000410 verbose = ['--verbose']
411 printed_path = True
412
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000413 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
414 if remote_ref:
smut@google.comd33eab32014-07-07 19:35:18 +0000415 # Rewrite remote refs to their local equivalents.
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000416 revision = ''.join(remote_ref)
417 rev_type = "branch"
418 elif revision.startswith('refs/'):
419 # Local branch? We probably don't want to support, since DEPS should
420 # always specify branches as they are in the upstream repo.
smut@google.comd33eab32014-07-07 19:35:18 +0000421 rev_type = "branch"
422 else:
423 # hash is also a tag, only make a distinction at checkout
424 rev_type = "hash"
425
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000426 mirror = self._GetMirror(url, options)
427 if mirror:
428 url = mirror.mirror_path
429
primiano@chromium.org1c127382015-02-17 11:15:40 +0000430 # If we are going to introduce a new project, there is a possibility that
431 # we are syncing back to a state where the project was originally a
432 # sub-project rolled by DEPS (realistic case: crossing the Blink merge point
433 # syncing backwards, when Blink was a DEPS entry and not part of src.git).
434 # In such case, we might have a backup of the former .git folder, which can
435 # be used to avoid re-fetching the entire repo again (useful for bisects).
436 backup_dir = self.GetGitBackupDirPath()
437 target_dir = os.path.join(self.checkout_path, '.git')
438 if os.path.exists(backup_dir) and not os.path.exists(target_dir):
439 gclient_utils.safe_makedirs(self.checkout_path)
440 os.rename(backup_dir, target_dir)
441 # Reset to a clean state
442 self._Run(['reset', '--hard', 'HEAD'], options)
443
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000444 if (not os.path.exists(self.checkout_path) or
445 (os.path.isdir(self.checkout_path) and
446 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000447 if mirror:
448 self._UpdateMirror(mirror, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000449 try:
smut@google.comd33eab32014-07-07 19:35:18 +0000450 self._Clone(revision, url, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000451 except subprocess2.CalledProcessError:
452 self._DeleteOrMove(options.force)
smut@google.comd33eab32014-07-07 19:35:18 +0000453 self._Clone(revision, url, options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000454 if file_list is not None:
455 files = self._Capture(['ls-files']).splitlines()
456 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000457 if not verbose:
458 # Make the output a little prettier. It's nice to have some whitespace
459 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000460 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000461 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000462
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000463 if not managed:
464 self._UpdateBranchHeads(options, fetch=False)
465 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
466 return self._Capture(['rev-parse', '--verify', 'HEAD'])
467
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000468 self._maybe_break_locks(options)
469
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000470 if mirror:
471 self._UpdateMirror(mirror, options)
472
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000473 # See if the url has changed (the unittests use git://foo for the url, let
474 # that through).
475 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
476 return_early = False
477 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
478 # unit test pass. (and update the comment above)
479 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
480 # This allows devs to use experimental repos which have a different url
481 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000482 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000483 url != 'git://foo' and
484 subprocess2.capture(
485 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
486 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000487 self.Print('_____ switching %s to a new upstream' % self.relpath)
iannucci@chromium.org78514212014-08-20 23:08:00 +0000488 if not (options.force or options.reset):
489 # Make sure it's clean
490 self._CheckClean(rev_str)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000491 # Switch over to the new upstream
492 self._Run(['remote', 'set-url', self.remote, url], options)
szager@chromium.org8dd35462015-06-08 22:56:05 +0000493 if mirror:
494 with open(os.path.join(
495 self.checkout_path, '.git', 'objects', 'info', 'alternates'),
496 'w') as fh:
497 fh.write(os.path.join(url, 'objects'))
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000498 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
smut@google.comd33eab32014-07-07 19:35:18 +0000499 self._FetchAndReset(revision, file_list, options)
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000500
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000501 return_early = True
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000502 else:
503 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000504
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000505 if return_early:
506 return self._Capture(['rev-parse', '--verify', 'HEAD'])
507
msb@chromium.org5bde4852009-12-14 16:47:12 +0000508 cur_branch = self._GetCurrentBranch()
509
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000511 # 0) HEAD is detached. Probably from our initial clone.
512 # - make sure HEAD is contained by a named ref, then update.
513 # Cases 1-4. HEAD is a branch.
514 # 1) current branch is not tracking a remote branch (could be git-svn)
515 # - try to rebase onto the new hash or branch
516 # 2) current branch is tracking a remote branch with local committed
517 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000518 # - rebase those changes on top of the hash
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000519 # 3) current branch is tracking a remote branch w/or w/out changes, and
520 # no DEPS switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000522 # 4) current branch is tracking a remote branch, but DEPS switches to a
523 # different remote branch, and
524 # a) current branch has no local changes, and --force:
525 # - checkout new branch
526 # b) current branch has local changes, and --force and --reset:
527 # - checkout new branch
528 # c) otherwise exit
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000529
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000530 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
531 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000532 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
533 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000534 if cur_branch is None:
535 upstream_branch = None
536 current_type = "detached"
537 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000538 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000539 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
540 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
541 current_type = "hash"
542 logging.debug("Current branch is not tracking an upstream (remote)"
543 " branch.")
544 elif upstream_branch.startswith('refs/remotes'):
545 current_type = "branch"
546 else:
547 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000548
smut@google.comd33eab32014-07-07 19:35:18 +0000549 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000550 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000551 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000552 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000553 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000554 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000555
mmoss@chromium.org37ac0e32015-08-18 18:14:38 +0000556 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000557
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000558 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000559 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000560 target = 'HEAD'
561 if options.upstream and upstream_branch:
562 target = upstream_branch
563 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000564
msb@chromium.org786fb682010-06-02 15:16:23 +0000565 if current_type == 'detached':
566 # case 0
smut@google.com34b4e982016-05-16 19:06:07 +0000567 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000568 self._CheckDetachedHead(rev_str, options)
smut@google.comd33eab32014-07-07 19:35:18 +0000569 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
szager@chromium.org848fd492014-04-09 19:06:44 +0000570 self.Print('Up-to-date; skipping checkout.')
571 else:
vadimsh@chromium.org2b7d3ed2014-06-20 18:15:37 +0000572 # 'git checkout' may need to overwrite existing untracked files. Allow
573 # it only when nuclear options are enabled.
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000574 self._Checkout(
575 options,
576 revision,
smut@google.com34b4e982016-05-16 19:06:07 +0000577 force=(options.force and options.delete_unversioned_trees),
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000578 quiet=True,
579 )
msb@chromium.org786fb682010-06-02 15:16:23 +0000580 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000581 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000582 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000583 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000584 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000585 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000586 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000587 newbase=revision, printed_path=printed_path,
588 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000589 printed_path = True
590 else:
591 # Can't find a merge-base since we don't know our upstream. That makes
592 # this command VERY likely to produce a rebase failure. For now we
593 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000594 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000595 if options.revision or deps_revision:
smut@google.comd33eab32014-07-07 19:35:18 +0000596 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000597 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000598 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000599 printed_path = True
smut@google.comd33eab32014-07-07 19:35:18 +0000600 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000601 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000602 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000603 newbase=revision, printed_path=printed_path,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000604 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000605 printed_path = True
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000606 elif remote_ref and ''.join(remote_ref) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000607 # case 4
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000608 new_base = ''.join(remote_ref)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000609 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000610 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000611 switch_error = ("Could not switch upstream branch from %s to %s\n"
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000612 % (upstream_branch, new_base) +
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000613 "Please use --force or merge or rebase manually:\n" +
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000614 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
615 "OR git checkout -b <some new branch> %s" % new_base)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000616 force_switch = False
617 if options.force:
618 try:
619 self._CheckClean(rev_str)
620 # case 4a
621 force_switch = True
622 except gclient_utils.Error as e:
623 if options.reset:
624 # case 4b
625 force_switch = True
626 else:
627 switch_error = '%s\n%s' % (e.message, switch_error)
628 if force_switch:
629 self.Print("Switching upstream branch from %s to %s" %
630 (upstream_branch, new_base))
631 switch_branch = 'gclient_' + remote_ref[1]
632 self._Capture(['branch', '-f', switch_branch, new_base])
633 self._Checkout(options, switch_branch, force=True, quiet=True)
634 else:
635 # case 4c
636 raise gclient_utils.Error(switch_error)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000637 else:
638 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000639 if files is not None:
640 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000641 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000642 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000643 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000644 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000645 if options.merge:
646 merge_args.append('--ff')
647 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000648 merge_args.append('--ff-only')
649 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000650 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000651 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000652 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000653 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000654 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000655 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000656 printed_path = True
657 while True:
dnj@chromium.org5b23e872015-02-20 21:25:57 +0000658 if not options.auto_rebase:
659 try:
660 action = self._AskForData(
661 'Cannot %s, attempt to rebase? '
662 '(y)es / (q)uit / (s)kip : ' %
663 ('merge' if options.merge else 'fast-forward merge'),
664 options)
665 except ValueError:
666 raise gclient_utils.Error('Invalid Character')
667 if options.auto_rebase or re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000668 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000669 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000670 printed_path = True
671 break
672 elif re.match(r'quit|q', action, re.I):
673 raise gclient_utils.Error("Can't fast-forward, please merge or "
674 "rebase manually.\n"
675 "cd %s && git " % self.checkout_path
676 + "rebase %s" % upstream_branch)
677 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000678 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000679 return
680 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000681 self.Print('Input not recognized')
smut@google.com27c9c8a2014-09-11 19:57:55 +0000682 elif re.match("error: Your local changes to '.*' would be "
683 "overwritten by merge. Aborting.\nPlease, commit your "
684 "changes or stash them before you can merge.\n",
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000685 e.stderr):
686 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000687 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000688 printed_path = True
689 raise gclient_utils.Error(e.stderr)
690 else:
691 # Some other problem happened with the merge
692 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000693 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000694 raise
695 else:
696 # Fast-forward merge was successful
697 if not re.match('Already up-to-date.', merge_output) or verbose:
698 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000699 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000700 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000701 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000702 if not verbose:
703 # Make the output a little prettier. It's nice to have some
704 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000705 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000706
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000707 if file_list is not None:
708 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000709
710 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000711 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000712 raise gclient_utils.Error('\n____ %s%s\n'
713 '\nConflict while rebasing this branch.\n'
714 'Fix the conflict and run gclient again.\n'
715 'See man git-rebase for details.\n'
716 % (self.relpath, rev_str))
717
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000718 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000719 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
720 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000721
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000722 # If --reset and --delete_unversioned_trees are specified, remove any
723 # untracked directories.
724 if options.reset and options.delete_unversioned_trees:
725 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
726 # merge-base by default), so doesn't include untracked files. So we use
727 # 'git ls-files --directory --others --exclude-standard' here directly.
728 paths = scm.GIT.Capture(
729 ['ls-files', '--directory', '--others', '--exclude-standard'],
730 self.checkout_path)
731 for path in (p for p in paths.splitlines() if p.endswith('/')):
732 full_path = os.path.join(self.checkout_path, path)
733 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000734 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000735 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000736
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000737 return self._Capture(['rev-parse', '--verify', 'HEAD'])
738
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000739
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000740 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000741 """Reverts local modifications.
742
743 All reverted files will be appended to file_list.
744 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000745 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000746 # revert won't work if the directory doesn't exist. It needs to
747 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000748 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000749 # Don't reuse the args.
750 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000751
752 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000753 if options.upstream:
754 if self._GetCurrentBranch():
755 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
756 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000757 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000758 if not deps_revision:
759 deps_revision = default_rev
smut@google.comd33eab32014-07-07 19:35:18 +0000760 if deps_revision.startswith('refs/heads/'):
761 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
smutae7ea312016-07-18 11:59:41 -0700762 try:
763 deps_revision = self.GetUsableRev(deps_revision, options)
764 except NoUsableRevError as e:
765 # If the DEPS entry's url and hash changed, try to update the origin.
766 # See also http://crbug.com/520067.
767 logging.warn(
768 'Couldn\'t find usable revision, will retrying to update instead: %s',
769 e.message)
770 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000771
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000772 if file_list is not None:
773 files = self._Capture(['diff', deps_revision, '--name-only']).split()
774
maruel@chromium.org37e89872010-09-07 16:11:33 +0000775 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000776 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000777
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000778 if file_list is not None:
779 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
780
781 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000782 """Returns revision"""
783 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000784
msb@chromium.orge28e4982009-09-25 20:51:45 +0000785 def runhooks(self, options, args, file_list):
786 self.status(options, args, file_list)
787
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000788 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000789 """Display status information."""
790 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000791 self.Print('________ couldn\'t run status in %s:\n'
792 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000793 else:
raphael.kubo.da.costa05c83592016-08-04 08:32:41 -0700794 try:
795 merge_base = [self._Capture(['merge-base', 'HEAD', self.remote])]
796 except subprocess2.CalledProcessError:
797 merge_base = []
798 self._Run(['diff', '--name-status'] + merge_base, options,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000799 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000800 if file_list is not None:
raphael.kubo.da.costa05c83592016-08-04 08:32:41 -0700801 files = self._Capture(['diff', '--name-only'] + merge_base).split()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000802 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000803
smutae7ea312016-07-18 11:59:41 -0700804 def GetUsableRev(self, rev, options):
805 """Finds a useful revision for this repository.
806
807 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
808 will be called on the source."""
809 sha1 = None
810 if not os.path.isdir(self.checkout_path):
811 raise NoUsableRevError(
812 ( 'We could not find a valid hash for safesync_url response "%s".\n'
813 'Safesync URLs with a git checkout currently require the repo to\n'
814 'be cloned without a safesync_url before adding the safesync_url.\n'
815 'For more info, see: '
816 'http://code.google.com/p/chromium/wiki/UsingNewGit'
817 '#Initial_checkout' ) % rev)
818 elif rev.isdigit() and len(rev) < 7:
819 # Handles an SVN rev. As an optimization, only verify an SVN revision as
820 # [0-9]{1,6} for now to avoid making a network request.
821 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
822 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
823 if not local_head or local_head < int(rev):
824 try:
825 logging.debug('Looking for git-svn configuration optimizations.')
826 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
827 cwd=self.checkout_path):
828 self._Fetch(options)
829 except subprocess2.CalledProcessError:
830 logging.debug('git config --get svn-remote.svn.fetch failed, '
831 'ignoring possible optimization.')
832 if options.verbose:
833 self.Print('Running git svn fetch. This might take a while.\n')
834 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
835 try:
836 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
837 cwd=self.checkout_path, rev=rev)
838 except gclient_utils.Error, e:
839 sha1 = e.message
840 self.Print('Warning: Could not find a git revision with accurate\n'
841 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
842 'the closest sane git revision, which is:\n'
843 ' %s\n' % (rev, e.message))
844 if not sha1:
845 raise NoUsableRevError(
846 ( 'It appears that either your git-svn remote is incorrectly\n'
847 'configured or the revision in your safesync_url is\n'
848 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
849 'corresponding git hash for SVN rev %s.' ) % rev)
850 else:
851 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
852 sha1 = rev
853 else:
854 # May exist in origin, but we don't have it yet, so fetch and look
855 # again.
856 self._Fetch(options)
857 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
858 sha1 = rev
859
860 if not sha1:
861 raise NoUsableRevError(
862 ( 'We could not find a valid hash for safesync_url response "%s".\n'
863 'Safesync URLs with a git checkout currently require a git-svn\n'
864 'remote or a safesync_url that provides git sha1s. Please add a\n'
865 'git-svn remote or change your safesync_url. For more info, see:\n'
866 'http://code.google.com/p/chromium/wiki/UsingNewGit'
867 '#Initial_checkout' ) % rev)
868
869 return sha1
870
msb@chromium.orge6f78352010-01-13 17:05:33 +0000871 def FullUrlForRelativeUrl(self, url):
872 # Strip from last '/'
873 # Equivalent to unix basename
874 base_url = self.url
875 return base_url[:base_url.rfind('/')] + url
876
primiano@chromium.org1c127382015-02-17 11:15:40 +0000877 def GetGitBackupDirPath(self):
878 """Returns the path where the .git folder for the current project can be
879 staged/restored. Use case: subproject moved from DEPS <-> outer project."""
880 return os.path.join(self._root_dir,
881 'old_' + self.relpath.replace(os.sep, '_')) + '.git'
882
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000883 def _GetMirror(self, url, options):
884 """Get a git_cache.Mirror object for the argument url."""
885 if not git_cache.Mirror.GetCachePath():
886 return None
hinoka@google.comb1b54572014-04-16 22:29:23 +0000887 mirror_kwargs = {
888 'print_func': self.filter,
889 'refs': []
890 }
hinoka@google.comb1b54572014-04-16 22:29:23 +0000891 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
892 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org8d3348f2014-08-19 22:49:16 +0000893 if hasattr(options, 'with_tags') and options.with_tags:
894 mirror_kwargs['refs'].append('refs/tags/*')
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000895 return git_cache.Mirror(url, **mirror_kwargs)
896
897 @staticmethod
898 def _UpdateMirror(mirror, options):
899 """Update a git mirror by fetching the latest commits from the remote."""
szager@chromium.org3ec84f62014-08-22 21:00:22 +0000900 if getattr(options, 'shallow', False):
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000901 # HACK(hinoka): These repositories should be super shallow.
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000902 if 'flash' in mirror.url:
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000903 depth = 10
904 else:
905 depth = 10000
906 else:
907 depth = None
e.hakkinen@samsung.come8bc1aa2015-04-08 08:00:37 +0000908 mirror.populate(verbose=options.verbose,
909 bootstrap=not getattr(options, 'no_bootstrap', False),
910 depth=depth,
szager@chromium.orgdbb6f822016-02-02 22:59:30 +0000911 ignore_lock=getattr(options, 'ignore_locks', False),
912 lock_timeout=getattr(options, 'lock_timeout', 0))
szager@chromium.org848fd492014-04-09 19:06:44 +0000913 mirror.unlock()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000914
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000915 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000916 """Clone a git repository from the given URL.
917
msb@chromium.org786fb682010-06-02 15:16:23 +0000918 Once we've cloned the repo, we checkout a working branch if the specified
919 revision is a branch head. If it is a tag or a specific commit, then we
920 leave HEAD detached as it makes future updates simpler -- in this case the
921 user should first create a new branch or switch to an existing branch before
922 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000923 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000924 # git clone doesn't seem to insert a newline properly before printing
925 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000926 self.Print('')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000927 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.org8a139702014-06-20 15:55:01 +0000928 clone_cmd = cfg + ['clone', '--no-checkout', '--progress']
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000929 if self.cache_dir:
930 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000931 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000932 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000933 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000934 # If the parent directory does not exist, Git clone on Windows will not
935 # create it, so we need to do it manually.
936 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000937 gclient_utils.safe_makedirs(parent_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000938
939 template_dir = None
940 if hasattr(options, 'no_history') and options.no_history:
941 if gclient_utils.IsGitSha(revision):
942 # In the case of a subproject, the pinned sha is not necessarily the
943 # head of the remote branch (so we can't just use --depth=N). Instead,
944 # we tell git to fetch all the remote objects from SHA..HEAD by means of
945 # a template git dir which has a 'shallow' file pointing to the sha.
946 template_dir = tempfile.mkdtemp(
947 prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
948 dir=parent_dir)
949 self._Run(['init', '--bare', template_dir], options, cwd=self._root_dir)
950 with open(os.path.join(template_dir, 'shallow'), 'w') as template_file:
951 template_file.write(revision)
952 clone_cmd.append('--template=' + template_dir)
953 else:
954 # Otherwise, we're just interested in the HEAD. Just use --depth.
955 clone_cmd.append('--depth=1')
956
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000957 tmp_dir = tempfile.mkdtemp(
958 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
959 dir=parent_dir)
960 try:
961 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000962 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000963 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000964 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
965 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000966 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000967 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000968 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000969 finally:
970 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000971 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000972 gclient_utils.rmtree(tmp_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000973 if template_dir:
974 gclient_utils.rmtree(template_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000975 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000976 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
977 self._Checkout(options, ''.join(remote_ref or revision), quiet=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000978 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000979 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000980 self.Print(
smut@google.comd33eab32014-07-07 19:35:18 +0000981 ('Checked out %s to a detached HEAD. Before making any commits\n'
982 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
983 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
984 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000985
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000986 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000987 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000988 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000989 raise gclient_utils.Error("Background task requires input. Rerun "
990 "gclient with --jobs=1 so that\n"
991 "interaction is possible.")
992 try:
993 return raw_input(prompt)
994 except KeyboardInterrupt:
995 # Hide the exception.
996 sys.exit(1)
997
998
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000999 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001000 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001001 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001002 if files is not None:
1003 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001004 revision = upstream
1005 if newbase:
1006 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001007 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001008 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001009 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001010 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001011 printed_path = True
1012 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001013 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001014
1015 if merge:
1016 merge_output = self._Capture(['merge', revision])
1017 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001018 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001019 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001020
1021 # Build the rebase command here using the args
1022 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
1023 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001024 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001025 rebase_cmd.append('--verbose')
1026 if newbase:
1027 rebase_cmd.extend(['--onto', newbase])
1028 rebase_cmd.append(upstream)
1029 if branch:
1030 rebase_cmd.append(branch)
1031
1032 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001033 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001034 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001035 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
1036 re.match(r'cannot rebase: your index contains uncommitted changes',
1037 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001038 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001039 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +00001040 'Cannot rebase because of unstaged changes.\n'
1041 '\'git reset --hard HEAD\' ?\n'
1042 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +00001043 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001044 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +00001045 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001046 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001047 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001048 break
1049 elif re.match(r'quit|q', rebase_action, re.I):
1050 raise gclient_utils.Error("Please merge or rebase manually\n"
1051 "cd %s && git " % self.checkout_path
1052 + "%s" % ' '.join(rebase_cmd))
1053 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001054 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001055 continue
1056 else:
1057 gclient_utils.Error("Input not recognized")
1058 continue
1059 elif re.search(r'^CONFLICT', e.stdout, re.M):
1060 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
1061 "Fix the conflict and run gclient again.\n"
1062 "See 'man git-rebase' for details.\n")
1063 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001064 self.Print(e.stdout.strip())
1065 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001066 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
1067 "manually.\ncd %s && git " %
1068 self.checkout_path
1069 + "%s" % ' '.join(rebase_cmd))
1070
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001071 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001072 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001073 # Make the output a little prettier. It's nice to have some
1074 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001075 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001076
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001077 @staticmethod
1078 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +00001079 (ok, current_version) = scm.GIT.AssertVersion(min_version)
1080 if not ok:
1081 raise gclient_utils.Error('git version %s < minimum required %s' %
1082 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +00001083
tandrii@chromium.orgc438c142015-08-24 22:55:55 +00001084 def _EnsureValidHeadObjectOrCheckout(self, revision, options, url):
1085 # Special case handling if all 3 conditions are met:
1086 # * the mirros have recently changed, but deps destination remains same,
1087 # * the git histories of mirrors are conflicting.
1088 # * git cache is used
1089 # This manifests itself in current checkout having invalid HEAD commit on
1090 # most git operations. Since git cache is used, just deleted the .git
1091 # folder, and re-create it by cloning.
1092 try:
1093 self._Capture(['rev-list', '-n', '1', 'HEAD'])
1094 except subprocess2.CalledProcessError as e:
1095 if ('fatal: bad object HEAD' in e.stderr
1096 and self.cache_dir and self.cache_dir in url):
1097 self.Print((
1098 'Likely due to DEPS change with git cache_dir, '
1099 'the current commit points to no longer existing object.\n'
1100 '%s' % e)
1101 )
1102 self._DeleteOrMove(options.force)
1103 self._Clone(revision, url, options)
1104 else:
1105 raise
1106
msb@chromium.org786fb682010-06-02 15:16:23 +00001107 def _IsRebasing(self):
1108 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
1109 # have a plumbing command to determine whether a rebase is in progress, so
1110 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
1111 g = os.path.join(self.checkout_path, '.git')
1112 return (
1113 os.path.isdir(os.path.join(g, "rebase-merge")) or
1114 os.path.isdir(os.path.join(g, "rebase-apply")))
1115
1116 def _CheckClean(self, rev_str):
iannucci@chromium.orgd9b318c2015-12-04 20:03:08 +00001117 lockfile = os.path.join(self.checkout_path, ".git", "index.lock")
1118 if os.path.exists(lockfile):
1119 raise gclient_utils.Error(
1120 '\n____ %s%s\n'
1121 '\tYour repo is locked, possibly due to a concurrent git process.\n'
1122 '\tIf no git executable is running, then clean up %r and try again.\n'
1123 % (self.relpath, rev_str, lockfile))
1124
msb@chromium.org786fb682010-06-02 15:16:23 +00001125 # Make sure the tree is clean; see git-rebase.sh for reference
1126 try:
1127 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001128 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001129 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001130 raise gclient_utils.Error('\n____ %s%s\n'
1131 '\tYou have unstaged changes.\n'
1132 '\tPlease commit, stash, or reset.\n'
1133 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001134 try:
1135 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
smut@google.com27c9c8a2014-09-11 19:57:55 +00001136 '--ignore-submodules', 'HEAD', '--'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001137 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001138 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001139 raise gclient_utils.Error('\n____ %s%s\n'
1140 '\tYour index contains uncommitted changes\n'
1141 '\tPlease commit, stash, or reset.\n'
1142 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001143
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001144 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +00001145 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1146 # reference by a commit). If not, error out -- most likely a rebase is
1147 # in progress, try to detect so we can give a better error.
1148 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001149 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1150 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001151 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001152 # Commit is not contained by any rev. See if the user is rebasing:
1153 if self._IsRebasing():
1154 # Punt to the user
1155 raise gclient_utils.Error('\n____ %s%s\n'
1156 '\tAlready in a conflict, i.e. (no branch).\n'
1157 '\tFix the conflict and run gclient again.\n'
1158 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1159 '\tSee man git-rebase for details.\n'
1160 % (self.relpath, rev_str))
1161 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001162 name = ('saved-by-gclient-' +
1163 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001164 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001165 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001166 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001167
msb@chromium.org5bde4852009-12-14 16:47:12 +00001168 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001169 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001170 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001171 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001172 return None
1173 return branch
1174
borenet@google.comc3e09d22014-04-10 13:58:18 +00001175 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001176 kwargs.setdefault('cwd', self.checkout_path)
1177 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001178 env = scm.GIT.ApplyEnvVars(kwargs)
1179 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001180
dnj@chromium.orgbb424c02014-06-23 22:42:51 +00001181 def _Checkout(self, options, ref, force=False, quiet=None):
1182 """Performs a 'git-checkout' operation.
1183
1184 Args:
1185 options: The configured option set
1186 ref: (str) The branch/commit to checkout
1187 quiet: (bool/None) Whether or not the checkout shoud pass '--quiet'; if
1188 'None', the behavior is inferred from 'options.verbose'.
1189 Returns: (str) The output of the checkout operation
1190 """
1191 if quiet is None:
1192 quiet = (not options.verbose)
1193 checkout_args = ['checkout']
1194 if force:
1195 checkout_args.append('--force')
1196 if quiet:
1197 checkout_args.append('--quiet')
1198 checkout_args.append(ref)
1199 return self._Capture(checkout_args)
1200
dnj@chromium.org680f2172014-06-25 00:39:32 +00001201 def _Fetch(self, options, remote=None, prune=False, quiet=False):
1202 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
1203 fetch_cmd = cfg + [
1204 'fetch',
1205 remote or self.remote,
1206 ]
1207
1208 if prune:
1209 fetch_cmd.append('--prune')
1210 if options.verbose:
1211 fetch_cmd.append('--verbose')
1212 elif quiet:
1213 fetch_cmd.append('--quiet')
1214 self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
1215
1216 # Return the revision that was fetched; this will be stored in 'FETCH_HEAD'
1217 return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])
1218
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001219 def _UpdateBranchHeads(self, options, fetch=False):
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001220 """Adds, and optionally fetches, "branch-heads" and "tags" refspecs
1221 if requested."""
1222 need_fetch = fetch
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001223 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001224 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001225 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1226 '^\\+refs/branch-heads/\\*:.*$']
1227 self._Run(config_cmd, options)
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001228 need_fetch = True
1229 if hasattr(options, 'with_tags') and options.with_tags:
1230 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
1231 '+refs/tags/*:refs/tags/*',
1232 '^\\+refs/tags/\\*:.*$']
1233 self._Run(config_cmd, options)
1234 need_fetch = True
1235 if fetch and need_fetch:
1236 self._Fetch(options)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001237
dnj@chromium.org680f2172014-06-25 00:39:32 +00001238 def _Run(self, args, options, show_header=True, **kwargs):
1239 # Disable 'unused options' warning | pylint: disable=W0613
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001240 kwargs.setdefault('cwd', self.checkout_path)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001241 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001242 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001243 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001244 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001245 cmd = ['git'] + args
dnj@chromium.org680f2172014-06-25 00:39:32 +00001246 if show_header:
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001247 gclient_utils.CheckCallAndFilterAndHeader(cmd, env=env, **kwargs)
1248 else:
1249 gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001250
1251
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001252class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001253 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001254 name = 'svn'
maruel@chromium.org79d62372015-06-01 18:50:55 +00001255 _PRINTED_DEPRECATION = False
1256
1257 _MESSAGE = (
1258 'Oh hai! You are using subversion. Chrome infra is eager to get rid of',
1259 'svn support so please switch to git.',
1260 'Tracking bug: http://crbug.com/475320',
iannucci@chromium.org9e18dee2015-07-28 07:22:21 +00001261 'If you are a project owner, you may request git migration assistance at: ',
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001262 ' https://code.google.com/p/chromium/issues/entry?template=Infra-Git')
maruel@chromium.org79d62372015-06-01 18:50:55 +00001263
1264 def __init__(self, *args, **kwargs):
1265 super(SVNWrapper, self).__init__(*args, **kwargs)
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001266 suppress_deprecated_notice = os.environ.get(
1267 'SUPPRESS_DEPRECATED_SVN_NOTICE', False)
1268 if not SVNWrapper._PRINTED_DEPRECATION and not suppress_deprecated_notice:
maruel@chromium.org79d62372015-06-01 18:50:55 +00001269 SVNWrapper._PRINTED_DEPRECATION = True
1270 sys.stderr.write('\n'.join(self._MESSAGE) + '\n')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001271
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001272 @staticmethod
1273 def BinaryExists():
1274 """Returns true if the command exists."""
1275 try:
1276 result, version = scm.SVN.AssertVersion('1.4')
1277 if not result:
1278 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1279 return result
1280 except OSError:
1281 return False
1282
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001283 def GetCheckoutRoot(self):
1284 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1285
floitsch@google.comeaab7842011-04-28 09:07:58 +00001286 def GetRevisionDate(self, revision):
1287 """Returns the given revision's date in ISO-8601 format (which contains the
1288 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001289 date = scm.SVN.Capture(
1290 ['propget', '--revprop', 'svn:date', '-r', revision],
1291 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001292 return date.strip()
1293
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001294 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001295 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001296 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001297
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001298 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001299 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001300 if not os.path.isdir(self.checkout_path):
1301 raise gclient_utils.Error('Directory %s is not present.' %
1302 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001303 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001304
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001305 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001306 """Generates a patch file which can be applied to the root of the
1307 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001308 if not os.path.isdir(self.checkout_path):
1309 raise gclient_utils.Error('Directory %s is not present.' %
1310 self.checkout_path)
1311 gclient_utils.CheckCallAndFilter(
1312 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1313 cwd=self.checkout_path,
1314 print_stdout=False,
avakulenko@google.com255f2be2014-12-05 22:19:55 +00001315 filter_fn=SvnDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001316
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001317 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001318 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001319
1320 All updated files will be appended to file_list.
1321
1322 Raises:
1323 Error: if can't get URL for relative path.
1324 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001325 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001326 hg_path = os.path.join(self.checkout_path, '.hg')
1327 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001328 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001329 return
1330
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001331 if args:
1332 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1333
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001334 # revision is the revision to match. It is None if no revision is specified,
1335 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001336 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001337 # Keep the original unpinned url for reference in case the repo is switched.
1338 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001339 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001340 if options.revision:
1341 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001342 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001343 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001344 if revision != 'unmanaged':
1345 forced_revision = True
1346 # Reconstruct the url.
1347 url = '%s@%s' % (url, revision)
1348 rev_str = ' at %s' % revision
1349 else:
1350 managed = False
1351 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001352 else:
1353 forced_revision = False
1354 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001355
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001356 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001357 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001358 # Git is only okay if it's a git-svn checkout of the right repo.
1359 if scm.GIT.IsGitSvn(self.checkout_path):
1360 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1361 'svn-remote.svn.url'],
1362 cwd=self.checkout_path).rstrip()
1363 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001364 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1365 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001366 return # TODO(borenet): Get the svn revision number?
1367
1368 # Get the existing scm url and the revision number of the current checkout.
1369 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001370 try:
1371 from_info = scm.SVN.CaptureLocalInfo(
1372 [], os.path.join(self.checkout_path, '.'))
1373 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001374 self._DeleteOrMove(options.force)
1375 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001376
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001377 BASE_URLS = {
1378 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1379 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1380 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001381 WHITELISTED_ROOTS = [
1382 'svn://svn.chromium.org',
1383 'svn://svn-mirror.golo.chromium.org',
1384 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001385 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001386 try:
1387 # Split out the revision number since it's not useful for us.
1388 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001389 # Check to see if we're on a whitelisted root. We do this because
1390 # only some svn servers have matching UUIDs.
1391 local_parsed = urlparse.urlparse(url)
1392 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001393 if ('CHROME_HEADLESS' in os.environ
1394 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001395 and base_path in BASE_URLS
1396 and local_root in WHITELISTED_ROOTS):
1397
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001398 # Use a tarball for initial sync if we are on a bot.
1399 # Get an unauthenticated gsutil instance.
1400 gsutil = download_from_google_storage.Gsutil(
1401 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1402
1403 gs_path = BASE_URLS[base_path]
1404 _, out, _ = gsutil.check_call('ls', gs_path)
1405 # So that we can get the most recent revision.
1406 sorted_items = sorted(out.splitlines())
1407 latest_checkout = sorted_items[-1]
1408
1409 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001410 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001411 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1412 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001413 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001414 raise Exception()
1415 filename = latest_checkout.split('/')[-1]
1416 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001417 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001418 gclient_utils.safe_makedirs(self.checkout_path)
1419 # TODO(hinoka): Use 7z for windows.
1420 cmd = ['tar', '--extract', '--ungzip',
1421 '--directory', self.checkout_path,
1422 '--file', tarball]
1423 gclient_utils.CheckCallAndFilter(
1424 cmd, stdout=sys.stdout, print_stdout=True)
1425
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001426 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001427 gclient_utils.rmtree(tempdir)
1428
1429 # Rewrite the repository root to match.
1430 tarball_url = scm.SVN.CaptureLocalInfo(
1431 ['.'], self.checkout_path)['Repository Root']
1432 tarball_parsed = urlparse.urlparse(tarball_url)
1433 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1434 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001435
1436 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001437 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001438 self._Run(['switch', '--relocate', tarball_root,
1439 local_root, self.checkout_path],
1440 options)
1441 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001442 self.Print('We tried to get a source tarball but failed.')
1443 self.Print('Resuming normal operations.')
1444 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001445
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001446 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001447 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001448 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001449 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001450 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001451 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001452
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001453 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001454 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001455 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1456 return self.Svnversion()
1457 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001458
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001459 if 'URL' not in from_info:
1460 raise gclient_utils.Error(
1461 ('gclient is confused. Couldn\'t get the url for %s.\n'
1462 'Try using @unmanaged.\n%s') % (
1463 self.checkout_path, from_info))
1464
stip@chromium.org3031d732014-04-21 22:18:02 +00001465 # Look for locked directories.
1466 dir_info = scm.SVN.CaptureStatus(
1467 None, os.path.join(self.checkout_path, '.'))
1468 if any(d[0][2] == 'L' for d in dir_info):
1469 try:
1470 self._Run(['cleanup', self.checkout_path], options)
1471 except subprocess2.CalledProcessError, e:
1472 # Get the status again, svn cleanup may have cleaned up at least
1473 # something.
1474 dir_info = scm.SVN.CaptureStatus(
1475 None, os.path.join(self.checkout_path, '.'))
1476
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001477 # Try to fix the failures by removing troublesome files.
1478 for d in dir_info:
1479 if d[0][2] == 'L':
1480 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001481 # We don't pass any files/directories to CaptureStatus and set
1482 # cwd=self.checkout_path, so we should get relative paths here.
1483 assert not os.path.isabs(d[1])
1484 path_to_remove = os.path.normpath(
1485 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001486 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001487 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001488 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001489 self.Print(
1490 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001491 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001492 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001493 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001494
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001495 # Retrieve the current HEAD version because svn is slow at null updates.
1496 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001497 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001498 revision = str(from_info_live['Revision'])
1499 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001500
borenet@google.comb09097a2014-04-09 19:09:08 +00001501 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001502 # The repository url changed, need to switch.
1503 try:
1504 to_info = scm.SVN.CaptureRemoteInfo(url)
1505 except (gclient_utils.Error, subprocess2.CalledProcessError):
1506 # The url is invalid or the server is not accessible, it's safer to bail
1507 # out right now.
1508 raise gclient_utils.Error('This url is unreachable: %s' % url)
1509 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1510 and (from_info['UUID'] == to_info['UUID']))
1511 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001512 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001513 # We have different roots, so check if we can switch --relocate.
1514 # Subversion only permits this if the repository UUIDs match.
1515 # Perform the switch --relocate, then rewrite the from_url
1516 # to reflect where we "are now." (This is the same way that
1517 # Subversion itself handles the metadata when switch --relocate
1518 # is used.) This makes the checks below for whether we
1519 # can update to a revision or have to switch to a different
1520 # branch work as expected.
1521 # TODO(maruel): TEST ME !
1522 command = ['switch', '--relocate',
1523 from_info['Repository Root'],
1524 to_info['Repository Root'],
1525 self.relpath]
1526 self._Run(command, options, cwd=self._root_dir)
1527 from_info['URL'] = from_info['URL'].replace(
1528 from_info['Repository Root'],
1529 to_info['Repository Root'])
1530 else:
1531 if not options.force and not options.reset:
1532 # Look for local modifications but ignore unversioned files.
1533 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1534 if status[0][0] != '?':
1535 raise gclient_utils.Error(
1536 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1537 'there is local changes in %s. Delete the directory and '
1538 'try again.') % (url, self.checkout_path))
1539 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001540 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001541 gclient_utils.rmtree(self.checkout_path)
1542 # We need to checkout.
1543 command = ['checkout', url, self.checkout_path]
1544 command = self._AddAdditionalUpdateFlags(command, options, revision)
1545 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1546 return self.Svnversion()
1547
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001548 # If the provided url has a revision number that matches the revision
1549 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001550 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001551 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001552 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001553 else:
1554 command = ['update', self.checkout_path]
1555 command = self._AddAdditionalUpdateFlags(command, options, revision)
1556 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001557
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001558 # If --reset and --delete_unversioned_trees are specified, remove any
1559 # untracked files and directories.
1560 if options.reset and options.delete_unversioned_trees:
1561 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1562 full_path = os.path.join(self.checkout_path, status[1])
1563 if (status[0][0] == '?'
1564 and os.path.isdir(full_path)
1565 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001566 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001567 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001568 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001569
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001570 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001571 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001572 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001573 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001574 # Create an empty checkout and then update the one file we want. Future
1575 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001576 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001577 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001578 if os.path.exists(os.path.join(self.checkout_path, filename)):
1579 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001580 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001581 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001582 # After the initial checkout, we can use update as if it were any other
1583 # dep.
1584 self.update(options, args, file_list)
1585 else:
1586 # If the installed version of SVN doesn't support --depth, fallback to
1587 # just exporting the file. This has the downside that revision
1588 # information is not stored next to the file, so we will have to
1589 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001590 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001591 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001592 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001593 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001594 command = self._AddAdditionalUpdateFlags(command, options,
1595 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001596 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001597
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001598 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001599 """Reverts local modifications. Subversion specific.
1600
1601 All reverted files will be appended to file_list, even if Subversion
1602 doesn't know about them.
1603 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001604 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001605 if os.path.exists(self.checkout_path):
1606 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001607 # svn revert won't work if the directory doesn't exist. It needs to
1608 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001609 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001610 # Don't reuse the args.
1611 return self.update(options, [], file_list)
1612
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001613 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001614 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001615 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001616 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001617 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001618 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001619 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001620 if not options.force:
1621 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001622 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001623 '\n_____ %s is not a valid svn checkout, synching instead' %
1624 self.relpath)
1625 gclient_utils.rmtree(self.checkout_path)
1626 # Don't reuse the args.
1627 return self.update(options, [], file_list)
1628
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001629 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001630 if file_list is not None:
1631 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001632 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001633 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001634 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001635 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001636 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001637
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001638 # Revert() may delete the directory altogether.
1639 if not os.path.isdir(self.checkout_path):
1640 # Don't reuse the args.
1641 return self.update(options, [], file_list)
1642
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001643 try:
1644 # svn revert is so broken we don't even use it. Using
1645 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001646 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001647 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1648 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001649 except OSError, e:
qyearsley12fa6ff2016-08-24 09:18:40 -07001650 # Maybe the directory disappeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001651 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001652
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001653 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001654 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001655 try:
1656 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001657 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001658 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001659
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001660 def runhooks(self, options, args, file_list):
1661 self.status(options, args, file_list)
1662
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001663 def status(self, options, args, file_list):
1664 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001665 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001666 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001667 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001668 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001669 'The directory does not exist.') %
1670 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001671 # There's no file list to retrieve.
1672 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001673 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001674
smutae7ea312016-07-18 11:59:41 -07001675 def GetUsableRev(self, rev, _options):
1676 """Verifies the validity of the revision for this repository."""
1677 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1678 raise NoUsableRevError(
1679 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1680 'correct.') % rev)
1681 return rev
1682
msb@chromium.orge6f78352010-01-13 17:05:33 +00001683 def FullUrlForRelativeUrl(self, url):
1684 # Find the forth '/' and strip from there. A bit hackish.
1685 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001686
maruel@chromium.org669600d2010-09-01 19:06:31 +00001687 def _Run(self, args, options, **kwargs):
1688 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001689 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001690 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001691 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001692
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001693 def Svnversion(self):
1694 """Runs the lowest checked out revision in the current project."""
1695 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1696 return info['Revision']
1697
maruel@chromium.org669600d2010-09-01 19:06:31 +00001698 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1699 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001700 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001701 scm.SVN.RunAndGetFileList(
1702 options.verbose,
1703 args + ['--ignore-externals'],
1704 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001705 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001706
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001707 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001708 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001709 """Add additional flags to command depending on what options are set.
1710 command should be a list of strings that represents an svn command.
1711
1712 This method returns a new list to be used as a command."""
1713 new_command = command[:]
1714 if revision:
1715 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001716 # We don't want interaction when jobs are used.
1717 if options.jobs > 1:
1718 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001719 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001720 # --accept was added to 'svn update' in svn 1.6.
1721 if not scm.SVN.AssertVersion('1.5')[0]:
1722 return new_command
1723
1724 # It's annoying to have it block in the middle of a sync, just sensible
1725 # defaults.
1726 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001727 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001728 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1729 new_command.extend(('--accept', 'theirs-conflict'))
1730 elif options.manually_grab_svn_rev:
1731 new_command.append('--force')
1732 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1733 new_command.extend(('--accept', 'postpone'))
1734 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1735 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001736 return new_command