blob: 7bf559c5083c71f7223d7f3e5204272afa41a789 [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(
30 os.path.dirname(os.path.abspath(__file__)),
31 'third_party', 'gsutil', 'gsutil')
32
szager@chromium.org848fd492014-04-09 19:06:44 +000033CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src.git'
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000034class DiffFiltererWrapper(object):
35 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000036 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000037 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000038 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000039 original_prefix = "--- "
40 working_prefix = "+++ "
41
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000042 def __init__(self, relpath, print_func):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000043 # Note that we always use '/' as the path separator to be
44 # consistent with svn's cygwin-style output on Windows
45 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000046 self._current_file = None
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000047 self._print_func = print_func
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000048
maruel@chromium.org6e29d572010-06-04 17:32:20 +000049 def SetCurrentFile(self, current_file):
50 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000051
iannucci@chromium.org3830a672013-02-19 20:15:14 +000052 @property
53 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000054 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000055
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000056 def _Replace(self, line):
57 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000058
59 def Filter(self, line):
60 if (line.startswith(self.index_string)):
61 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000062 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000063 else:
64 if (line.startswith(self.original_prefix) or
65 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000066 line = self._Replace(line)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000067 self._print_func(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000068
69
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000070class SvnDiffFilterer(DiffFiltererWrapper):
71 index_string = "Index: "
72
73
74class GitDiffFilterer(DiffFiltererWrapper):
75 index_string = "diff --git "
76
77 def SetCurrentFile(self, current_file):
78 # Get filename by parsing "a/<filename> b/<filename>"
79 self._current_file = current_file[:(len(current_file)/2)][2:]
80
81 def _Replace(self, line):
82 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
83
84
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000085### SCM abstraction layer
86
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000087# Factory Method for SCM wrapper creation
88
maruel@chromium.org9eda4112010-06-11 18:56:10 +000089def GetScmName(url):
90 if url:
91 url, _ = gclient_utils.SplitUrlRevision(url)
92 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000093 url.startswith('git+http://') or url.startswith('git+https://') or
borenet@google.coma2aec972014-04-22 21:35:15 +000094 url.endswith('.git') or url.startswith('sso://') or
95 'googlesource' in url):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000096 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000097 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000098 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000099 return 'svn'
100 return None
101
102
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000103def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000104 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000105 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000106 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000107 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000108
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000109 scm_name = GetScmName(url)
110 if not scm_name in SCM_MAP:
111 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000112 scm_class = SCM_MAP[scm_name]
113 if not scm_class.BinaryExists():
114 raise gclient_utils.Error('%s command not found' % scm_name)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000115 return scm_class(url, root_dir, relpath, out_fh, out_cb)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000116
117
118# SCMWrapper base class
119
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000120class SCMWrapper(object):
121 """Add necessary glue between all the supported SCM.
122
msb@chromium.orgd6504212010-01-13 17:34:31 +0000123 This is the abstraction layer to bind to different SCM.
124 """
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000125
126 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
127 out_cb=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000128 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000129 self._root_dir = root_dir
130 if self._root_dir:
131 self._root_dir = self._root_dir.replace('/', os.sep)
132 self.relpath = relpath
133 if self.relpath:
134 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000135 if self.relpath and self._root_dir:
136 self.checkout_path = os.path.join(self._root_dir, self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000137 if out_fh is None:
138 out_fh = sys.stdout
139 self.out_fh = out_fh
140 self.out_cb = out_cb
141
142 def Print(self, *args, **kwargs):
143 kwargs.setdefault('file', self.out_fh)
144 if kwargs.pop('timestamp', True):
145 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
146 print(*args, **kwargs)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000147
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000148 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000149 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000150 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000151
152 if not command in commands:
153 raise gclient_utils.Error('Unknown command %s' % command)
154
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000155 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000156 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000157 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000158
159 return getattr(self, command)(options, args, file_list)
160
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000161 @staticmethod
162 def _get_first_remote_url(checkout_path):
163 log = scm.GIT.Capture(
164 ['config', '--local', '--get-regexp', r'remote.*.url'],
165 cwd=checkout_path)
166 # Get the second token of the first line of the log.
167 return log.splitlines()[0].split(' ', 1)[1]
168
smut@google.comd33eab32014-07-07 19:35:18 +0000169 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000170 """Attempt to determine the remote URL for this SCMWrapper."""
smut@google.comd33eab32014-07-07 19:35:18 +0000171 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000172 if os.path.exists(os.path.join(self.checkout_path, '.git')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000173 actual_remote_url = self._get_first_remote_url(self.checkout_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000174
175 # If a cache_dir is used, obtain the actual remote URL from the cache.
176 if getattr(self, 'cache_dir', None):
borenet@google.com46d09f62014-04-10 18:50:23 +0000177 url, _ = gclient_utils.SplitUrlRevision(self.url)
178 mirror = git_cache.Mirror(url)
szager@chromium.org848fd492014-04-09 19:06:44 +0000179 if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
borenet@google.com4e9be262014-04-08 19:40:30 +0000180 actual_remote_url.replace('\\', '/')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000181 actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000182 return actual_remote_url
183
184 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000185 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000186 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000187 return None
188
borenet@google.com4e9be262014-04-08 19:40:30 +0000189 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000190 """Determine whether the remote URL of this checkout is the expected URL."""
191 if not os.path.exists(self.checkout_path):
192 # A checkout which doesn't exist can't be broken.
193 return True
194
smut@google.comd33eab32014-07-07 19:35:18 +0000195 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000196 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000197 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
198 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000199 else:
200 # This may occur if the self.checkout_path exists but does not contain a
201 # valid git or svn checkout.
202 return False
203
borenet@google.comb09097a2014-04-09 19:09:08 +0000204 def _DeleteOrMove(self, force):
205 """Delete the checkout directory or move it out of the way.
206
207 Args:
208 force: bool; if True, delete the directory. Otherwise, just move it.
209 """
borenet@google.comb2256212014-05-07 20:57:28 +0000210 if force and os.environ.get('CHROME_HEADLESS') == '1':
211 self.Print('_____ Conflicting directory found in %s. Removing.'
212 % self.checkout_path)
213 gclient_utils.AddWarning('Conflicting directory %s deleted.'
214 % self.checkout_path)
215 gclient_utils.rmtree(self.checkout_path)
216 else:
217 bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
218 os.path.dirname(self.relpath))
219
220 try:
221 os.makedirs(bad_scm_dir)
222 except OSError as e:
223 if e.errno != errno.EEXIST:
224 raise
225
226 dest_path = tempfile.mkdtemp(
227 prefix=os.path.basename(self.relpath),
228 dir=bad_scm_dir)
229 self.Print('_____ Conflicting directory found in %s. Moving to %s.'
230 % (self.checkout_path, dest_path))
231 gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
232 % (self.checkout_path, dest_path))
233 shutil.move(self.checkout_path, dest_path)
borenet@google.comb09097a2014-04-09 19:09:08 +0000234
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000235
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000236class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000237 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000238 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000239 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000240
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000241 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000242
szager@chromium.org848fd492014-04-09 19:06:44 +0000243 def __init__(self, url=None, *args):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000244 """Removes 'git+' fake prefix from git URL."""
245 if url.startswith('git+http://') or url.startswith('git+https://'):
246 url = url[4:]
szager@chromium.org848fd492014-04-09 19:06:44 +0000247 SCMWrapper.__init__(self, url, *args)
248 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
249 if self.out_cb:
250 filter_kwargs['predicate'] = self.out_cb
251 self.filter = gclient_utils.GitFilter(**filter_kwargs)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000252
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000253 @staticmethod
254 def BinaryExists():
255 """Returns true if the command exists."""
256 try:
257 # We assume git is newer than 1.7. See: crbug.com/114483
258 result, version = scm.GIT.AssertVersion('1.7')
259 if not result:
260 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
261 return result
262 except OSError:
263 return False
264
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000265 def GetCheckoutRoot(self):
266 return scm.GIT.GetCheckoutRoot(self.checkout_path)
267
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000268 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000269 """Returns the given revision's date in ISO-8601 format (which contains the
270 time zone)."""
271 # TODO(floitsch): get the time-stamp of the given revision and not just the
272 # time-stamp of the currently checked out revision.
273 return self._Capture(['log', '-n', '1', '--format=%ai'])
274
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000275 @staticmethod
276 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000277 """'Cleanup' the repo.
278
279 There's no real git equivalent for the svn cleanup command, do a no-op.
280 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000281
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000282 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000283 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000284 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000285
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000286 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000287 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000288 repository.
289
290 The patch file is generated from a diff of the merge base of HEAD and
291 its upstream branch.
292 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000293 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000294 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000295 ['git', 'diff', merge_base],
296 cwd=self.checkout_path,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000297 filter_fn=GitDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000298
smut@google.comd33eab32014-07-07 19:35:18 +0000299 def _FetchAndReset(self, revision, file_list, options):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000300 """Equivalent to git fetch; git reset."""
301 quiet = []
302 if not options.verbose:
303 quiet = ['--quiet']
304 self._UpdateBranchHeads(options, fetch=False)
305
dnj@chromium.org680f2172014-06-25 00:39:32 +0000306 self._Fetch(options, prune=True, quiet=options.verbose)
smut@google.comd33eab32014-07-07 19:35:18 +0000307 self._Run(['reset', '--hard', revision] + quiet, options)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000308 if file_list is not None:
309 files = self._Capture(['ls-files']).splitlines()
310 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
311
szager@chromium.org8a139702014-06-20 15:55:01 +0000312 def _DisableHooks(self):
313 hook_dir = os.path.join(self.checkout_path, '.git', 'hooks')
314 if not os.path.isdir(hook_dir):
315 return
316 for f in os.listdir(hook_dir):
317 if not f.endswith('.sample') and not f.endswith('.disabled'):
318 os.rename(os.path.join(hook_dir, f),
319 os.path.join(hook_dir, f + '.disabled'))
320
msb@chromium.orge28e4982009-09-25 20:51:45 +0000321 def update(self, options, args, file_list):
322 """Runs git to update or transparently checkout the working copy.
323
324 All updated files will be appended to file_list.
325
326 Raises:
327 Error: if can't get URL for relative path.
328 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000329 if args:
330 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
331
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000332 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000333
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000334 # If a dependency is not pinned, track the default remote branch.
smut@google.comd33eab32014-07-07 19:35:18 +0000335 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000336 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000337 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000338 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000339 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000340 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000341 # Override the revision number.
342 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000343 if revision == 'unmanaged':
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000344 # Check again for a revision in case an initial ref was specified
345 # in the url, for example bla.git@refs/heads/custombranch
346 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000347 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000348 if not revision:
349 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000350
szager@chromium.org8a139702014-06-20 15:55:01 +0000351 if managed:
352 self._DisableHooks()
353
floitsch@google.comeaab7842011-04-28 09:07:58 +0000354 if gclient_utils.IsDateRevision(revision):
355 # Date-revisions only work on git-repositories if the reflog hasn't
356 # expired yet. Use rev-list to get the corresponding revision.
357 # git rev-list -n 1 --before='time-stamp' branchname
358 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000359 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000360 revision = default_rev
361
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000362 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000363 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000364
365 printed_path = False
366 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000367 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000368 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000369 verbose = ['--verbose']
370 printed_path = True
371
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000372 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
373 if remote_ref:
smut@google.comd33eab32014-07-07 19:35:18 +0000374 # Rewrite remote refs to their local equivalents.
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000375 revision = ''.join(remote_ref)
376 rev_type = "branch"
377 elif revision.startswith('refs/'):
378 # Local branch? We probably don't want to support, since DEPS should
379 # always specify branches as they are in the upstream repo.
smut@google.comd33eab32014-07-07 19:35:18 +0000380 rev_type = "branch"
381 else:
382 # hash is also a tag, only make a distinction at checkout
383 rev_type = "hash"
384
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000385 mirror = self._GetMirror(url, options)
386 if mirror:
387 url = mirror.mirror_path
388
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000389 if (not os.path.exists(self.checkout_path) or
390 (os.path.isdir(self.checkout_path) and
391 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000392 if mirror:
393 self._UpdateMirror(mirror, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000394 try:
smut@google.comd33eab32014-07-07 19:35:18 +0000395 self._Clone(revision, url, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000396 except subprocess2.CalledProcessError:
397 self._DeleteOrMove(options.force)
smut@google.comd33eab32014-07-07 19:35:18 +0000398 self._Clone(revision, url, options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000399 if file_list is not None:
400 files = self._Capture(['ls-files']).splitlines()
401 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000402 if not verbose:
403 # Make the output a little prettier. It's nice to have some whitespace
404 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000405 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000406 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000407
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000408 if not managed:
409 self._UpdateBranchHeads(options, fetch=False)
410 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
411 return self._Capture(['rev-parse', '--verify', 'HEAD'])
412
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000413 if mirror:
414 self._UpdateMirror(mirror, options)
415
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000416 # See if the url has changed (the unittests use git://foo for the url, let
417 # that through).
418 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
419 return_early = False
420 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
421 # unit test pass. (and update the comment above)
422 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
423 # This allows devs to use experimental repos which have a different url
424 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000425 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000426 url != 'git://foo' and
427 subprocess2.capture(
428 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
429 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000430 self.Print('_____ switching %s to a new upstream' % self.relpath)
iannucci@chromium.org78514212014-08-20 23:08:00 +0000431 if not (options.force or options.reset):
432 # Make sure it's clean
433 self._CheckClean(rev_str)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000434 # Switch over to the new upstream
435 self._Run(['remote', 'set-url', self.remote, url], options)
smut@google.comd33eab32014-07-07 19:35:18 +0000436 self._FetchAndReset(revision, file_list, options)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000437 return_early = True
438
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000439 if return_early:
440 return self._Capture(['rev-parse', '--verify', 'HEAD'])
441
msb@chromium.org5bde4852009-12-14 16:47:12 +0000442 cur_branch = self._GetCurrentBranch()
443
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000444 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000445 # 0) HEAD is detached. Probably from our initial clone.
446 # - make sure HEAD is contained by a named ref, then update.
447 # Cases 1-4. HEAD is a branch.
448 # 1) current branch is not tracking a remote branch (could be git-svn)
449 # - try to rebase onto the new hash or branch
450 # 2) current branch is tracking a remote branch with local committed
451 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000452 # - rebase those changes on top of the hash
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000453 # 3) current branch is tracking a remote branch w/or w/out changes, and
454 # no DEPS switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000455 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000456 # 4) current branch is tracking a remote branch, but DEPS switches to a
457 # different remote branch, and
458 # a) current branch has no local changes, and --force:
459 # - checkout new branch
460 # b) current branch has local changes, and --force and --reset:
461 # - checkout new branch
462 # c) otherwise exit
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000463
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000464 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
465 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000466 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
467 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000468 if cur_branch is None:
469 upstream_branch = None
470 current_type = "detached"
471 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000472 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000473 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
474 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
475 current_type = "hash"
476 logging.debug("Current branch is not tracking an upstream (remote)"
477 " branch.")
478 elif upstream_branch.startswith('refs/remotes'):
479 current_type = "branch"
480 else:
481 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000482
smut@google.comd33eab32014-07-07 19:35:18 +0000483 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000484 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000485 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000486 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000487 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000488 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000489
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000490 self._UpdateBranchHeads(options, fetch=True)
491
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000493 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000494 target = 'HEAD'
495 if options.upstream and upstream_branch:
496 target = upstream_branch
497 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498
msb@chromium.org786fb682010-06-02 15:16:23 +0000499 if current_type == 'detached':
500 # case 0
501 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000502 self._CheckDetachedHead(rev_str, options)
smut@google.comd33eab32014-07-07 19:35:18 +0000503 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
szager@chromium.org848fd492014-04-09 19:06:44 +0000504 self.Print('Up-to-date; skipping checkout.')
505 else:
vadimsh@chromium.org2b7d3ed2014-06-20 18:15:37 +0000506 # 'git checkout' may need to overwrite existing untracked files. Allow
507 # it only when nuclear options are enabled.
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000508 self._Checkout(
509 options,
510 revision,
511 force=(options.force and options.delete_unversioned_trees),
512 quiet=True,
513 )
msb@chromium.org786fb682010-06-02 15:16:23 +0000514 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000515 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000516 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000517 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000518 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000519 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000520 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000521 newbase=revision, printed_path=printed_path,
522 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000523 printed_path = True
524 else:
525 # Can't find a merge-base since we don't know our upstream. That makes
526 # this command VERY likely to produce a rebase failure. For now we
527 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000528 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000529 if options.revision or deps_revision:
smut@google.comd33eab32014-07-07 19:35:18 +0000530 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000531 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000532 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000533 printed_path = True
smut@google.comd33eab32014-07-07 19:35:18 +0000534 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000535 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000536 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000537 newbase=revision, printed_path=printed_path,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000538 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000539 printed_path = True
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000540 elif remote_ref and ''.join(remote_ref) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000541 # case 4
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000542 new_base = ''.join(remote_ref)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000543 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000544 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000545 switch_error = ("Could not switch upstream branch from %s to %s\n"
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000546 % (upstream_branch, new_base) +
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000547 "Please use --force or merge or rebase manually:\n" +
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000548 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
549 "OR git checkout -b <some new branch> %s" % new_base)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000550 force_switch = False
551 if options.force:
552 try:
553 self._CheckClean(rev_str)
554 # case 4a
555 force_switch = True
556 except gclient_utils.Error as e:
557 if options.reset:
558 # case 4b
559 force_switch = True
560 else:
561 switch_error = '%s\n%s' % (e.message, switch_error)
562 if force_switch:
563 self.Print("Switching upstream branch from %s to %s" %
564 (upstream_branch, new_base))
565 switch_branch = 'gclient_' + remote_ref[1]
566 self._Capture(['branch', '-f', switch_branch, new_base])
567 self._Checkout(options, switch_branch, force=True, quiet=True)
568 else:
569 # case 4c
570 raise gclient_utils.Error(switch_error)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000571 else:
572 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000573 if files is not None:
574 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000575 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000576 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000577 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000578 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000579 if options.merge:
580 merge_args.append('--ff')
581 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000582 merge_args.append('--ff-only')
583 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000584 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000585 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000586 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000587 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000588 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000589 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000590 printed_path = True
591 while True:
592 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000593 action = self._AskForData(
594 'Cannot %s, attempt to rebase? '
595 '(y)es / (q)uit / (s)kip : ' %
596 ('merge' if options.merge else 'fast-forward merge'),
597 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000598 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000599 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000600 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000601 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000602 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000603 printed_path = True
604 break
605 elif re.match(r'quit|q', action, re.I):
606 raise gclient_utils.Error("Can't fast-forward, please merge or "
607 "rebase manually.\n"
608 "cd %s && git " % self.checkout_path
609 + "rebase %s" % upstream_branch)
610 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000611 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000612 return
613 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000614 self.Print('Input not recognized')
mmoss@chromium.org931b6c62014-09-09 16:57:26 +0000615 elif re.match("error: Your local changes to (')?.*(')? would be "
616 "overwritten by merge(. Aborting)?[:.]\n(.*\n)?Please, "
617 "commit your changes or stash them before you can "
618 "merge.\n",
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000619 e.stderr):
620 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000621 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000622 printed_path = True
623 raise gclient_utils.Error(e.stderr)
624 else:
625 # Some other problem happened with the merge
626 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000627 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000628 raise
629 else:
630 # Fast-forward merge was successful
631 if not re.match('Already up-to-date.', merge_output) or verbose:
632 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000633 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000634 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000635 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000636 if not verbose:
637 # Make the output a little prettier. It's nice to have some
638 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000639 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000640
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000641 if file_list is not None:
642 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000643
644 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000645 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000646 raise gclient_utils.Error('\n____ %s%s\n'
647 '\nConflict while rebasing this branch.\n'
648 'Fix the conflict and run gclient again.\n'
649 'See man git-rebase for details.\n'
650 % (self.relpath, rev_str))
651
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000652 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000653 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
654 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000655
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000656 # If --reset and --delete_unversioned_trees are specified, remove any
657 # untracked directories.
658 if options.reset and options.delete_unversioned_trees:
659 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
660 # merge-base by default), so doesn't include untracked files. So we use
661 # 'git ls-files --directory --others --exclude-standard' here directly.
662 paths = scm.GIT.Capture(
663 ['ls-files', '--directory', '--others', '--exclude-standard'],
664 self.checkout_path)
665 for path in (p for p in paths.splitlines() if p.endswith('/')):
666 full_path = os.path.join(self.checkout_path, path)
667 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000668 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000669 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000670
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000671 return self._Capture(['rev-parse', '--verify', 'HEAD'])
672
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000673
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000674 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000675 """Reverts local modifications.
676
677 All reverted files will be appended to file_list.
678 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000679 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000680 # revert won't work if the directory doesn't exist. It needs to
681 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000682 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000683 # Don't reuse the args.
684 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000685
686 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000687 if options.upstream:
688 if self._GetCurrentBranch():
689 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
690 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000691 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000692 if not deps_revision:
693 deps_revision = default_rev
smut@google.comd33eab32014-07-07 19:35:18 +0000694 if deps_revision.startswith('refs/heads/'):
695 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
696 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000697
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000698 if file_list is not None:
699 files = self._Capture(['diff', deps_revision, '--name-only']).split()
700
maruel@chromium.org37e89872010-09-07 16:11:33 +0000701 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000702 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000703
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000704 if file_list is not None:
705 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
706
707 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000708 """Returns revision"""
709 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000710
msb@chromium.orge28e4982009-09-25 20:51:45 +0000711 def runhooks(self, options, args, file_list):
712 self.status(options, args, file_list)
713
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000714 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000715 """Display status information."""
716 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000717 self.Print('________ couldn\'t run status in %s:\n'
718 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000719 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000720 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000721 self._Run(['diff', '--name-status', merge_base], options,
722 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000723 if file_list is not None:
724 files = self._Capture(['diff', '--name-only', merge_base]).split()
725 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000726
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000727 def GetUsableRev(self, rev, options):
728 """Finds a useful revision for this repository.
729
730 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
731 will be called on the source."""
732 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000733 if not os.path.isdir(self.checkout_path):
734 raise gclient_utils.Error(
735 ( 'We could not find a valid hash for safesync_url response "%s".\n'
736 'Safesync URLs with a git checkout currently require the repo to\n'
737 'be cloned without a safesync_url before adding the safesync_url.\n'
738 'For more info, see: '
739 'http://code.google.com/p/chromium/wiki/UsingNewGit'
740 '#Initial_checkout' ) % rev)
741 elif rev.isdigit() and len(rev) < 7:
742 # Handles an SVN rev. As an optimization, only verify an SVN revision as
743 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000744 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000745 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
746 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000747 try:
748 logging.debug('Looking for git-svn configuration optimizations.')
749 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
750 cwd=self.checkout_path):
dnj@chromium.org680f2172014-06-25 00:39:32 +0000751 self._Fetch(options)
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000752 except subprocess2.CalledProcessError:
753 logging.debug('git config --get svn-remote.svn.fetch failed, '
754 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000755 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000756 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000757 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000758 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000759 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
760 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000761 except gclient_utils.Error, e:
762 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000763 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000764 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
765 'the closest sane git revision, which is:\n'
766 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000767 if not sha1:
768 raise gclient_utils.Error(
769 ( 'It appears that either your git-svn remote is incorrectly\n'
770 'configured or the revision in your safesync_url is\n'
771 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
772 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000773 else:
774 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
775 sha1 = rev
776 else:
777 # May exist in origin, but we don't have it yet, so fetch and look
778 # again.
dnj@chromium.org680f2172014-06-25 00:39:32 +0000779 self._Fetch(options)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000780 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
781 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000782
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000783 if not sha1:
784 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000785 ( 'We could not find a valid hash for safesync_url response "%s".\n'
786 'Safesync URLs with a git checkout currently require a git-svn\n'
787 'remote or a safesync_url that provides git sha1s. Please add a\n'
788 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000789 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000790 '#Initial_checkout' ) % rev)
791
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000792 return sha1
793
msb@chromium.orge6f78352010-01-13 17:05:33 +0000794 def FullUrlForRelativeUrl(self, url):
795 # Strip from last '/'
796 # Equivalent to unix basename
797 base_url = self.url
798 return base_url[:base_url.rfind('/')] + url
799
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000800 def _GetMirror(self, url, options):
801 """Get a git_cache.Mirror object for the argument url."""
802 if not git_cache.Mirror.GetCachePath():
803 return None
hinoka@google.comb1b54572014-04-16 22:29:23 +0000804 mirror_kwargs = {
805 'print_func': self.filter,
806 'refs': []
807 }
hinoka@google.com356cb5f2014-04-25 00:02:21 +0000808 # TODO(hinoka): This currently just fails because lkcr/lkgr are branches
809 # not tags. This also adds 20 seconds to every bot_update
810 # run, so I'm commenting this out until lkcr/lkgr become
811 # tags. (2014/4/24)
812 # if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
813 # mirror_kwargs['refs'].extend(['refs/tags/lkgr', 'refs/tags/lkcr'])
hinoka@google.comb1b54572014-04-16 22:29:23 +0000814 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
815 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org8d3348f2014-08-19 22:49:16 +0000816 if hasattr(options, 'with_tags') and options.with_tags:
817 mirror_kwargs['refs'].append('refs/tags/*')
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000818 return git_cache.Mirror(url, **mirror_kwargs)
819
820 @staticmethod
821 def _UpdateMirror(mirror, options):
822 """Update a git mirror by fetching the latest commits from the remote."""
szager@chromium.org3ec84f62014-08-22 21:00:22 +0000823 if getattr(options, 'shallow', False):
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000824 # HACK(hinoka): These repositories should be super shallow.
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000825 if 'flash' in mirror.url:
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000826 depth = 10
827 else:
828 depth = 10000
829 else:
830 depth = None
hinoka@chromium.org8a10f6d2014-06-23 18:38:57 +0000831 mirror.populate(verbose=options.verbose, bootstrap=True, depth=depth,
vadimsh@chromium.org3fd325b2014-08-22 23:56:49 +0000832 ignore_lock=getattr(options, 'ignore_locks', False))
szager@chromium.org848fd492014-04-09 19:06:44 +0000833 mirror.unlock()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000834
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000835 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000836 """Clone a git repository from the given URL.
837
msb@chromium.org786fb682010-06-02 15:16:23 +0000838 Once we've cloned the repo, we checkout a working branch if the specified
839 revision is a branch head. If it is a tag or a specific commit, then we
840 leave HEAD detached as it makes future updates simpler -- in this case the
841 user should first create a new branch or switch to an existing branch before
842 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000843 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000844 # git clone doesn't seem to insert a newline properly before printing
845 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000846 self.Print('')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000847 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.org8a139702014-06-20 15:55:01 +0000848 clone_cmd = cfg + ['clone', '--no-checkout', '--progress']
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000849 if self.cache_dir:
850 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000851 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000852 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000853 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000854 # If the parent directory does not exist, Git clone on Windows will not
855 # create it, so we need to do it manually.
856 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000857 gclient_utils.safe_makedirs(parent_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000858
859 template_dir = None
860 if hasattr(options, 'no_history') and options.no_history:
861 if gclient_utils.IsGitSha(revision):
862 # In the case of a subproject, the pinned sha is not necessarily the
863 # head of the remote branch (so we can't just use --depth=N). Instead,
864 # we tell git to fetch all the remote objects from SHA..HEAD by means of
865 # a template git dir which has a 'shallow' file pointing to the sha.
866 template_dir = tempfile.mkdtemp(
867 prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
868 dir=parent_dir)
869 self._Run(['init', '--bare', template_dir], options, cwd=self._root_dir)
870 with open(os.path.join(template_dir, 'shallow'), 'w') as template_file:
871 template_file.write(revision)
872 clone_cmd.append('--template=' + template_dir)
873 else:
874 # Otherwise, we're just interested in the HEAD. Just use --depth.
875 clone_cmd.append('--depth=1')
876
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000877 tmp_dir = tempfile.mkdtemp(
878 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
879 dir=parent_dir)
880 try:
881 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000882 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000883 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000884 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
885 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000886 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000887 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000888 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000889 finally:
890 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000891 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000892 gclient_utils.rmtree(tmp_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000893 if template_dir:
894 gclient_utils.rmtree(template_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000895 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000896 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
897 self._Checkout(options, ''.join(remote_ref or revision), quiet=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000898 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000899 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000900 self.Print(
smut@google.comd33eab32014-07-07 19:35:18 +0000901 ('Checked out %s to a detached HEAD. Before making any commits\n'
902 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
903 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
904 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000905
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000906 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000907 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000908 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000909 raise gclient_utils.Error("Background task requires input. Rerun "
910 "gclient with --jobs=1 so that\n"
911 "interaction is possible.")
912 try:
913 return raw_input(prompt)
914 except KeyboardInterrupt:
915 # Hide the exception.
916 sys.exit(1)
917
918
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000919 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000920 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000921 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000922 if files is not None:
923 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000924 revision = upstream
925 if newbase:
926 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000927 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000928 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000929 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000930 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000931 printed_path = True
932 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000933 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000934
935 if merge:
936 merge_output = self._Capture(['merge', revision])
937 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000938 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000939 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000940
941 # Build the rebase command here using the args
942 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
943 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000944 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000945 rebase_cmd.append('--verbose')
946 if newbase:
947 rebase_cmd.extend(['--onto', newbase])
948 rebase_cmd.append(upstream)
949 if branch:
950 rebase_cmd.append(branch)
951
952 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000953 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000954 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000955 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
956 re.match(r'cannot rebase: your index contains uncommitted changes',
957 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000958 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000959 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000960 'Cannot rebase because of unstaged changes.\n'
961 '\'git reset --hard HEAD\' ?\n'
962 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000963 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000964 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000965 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000966 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000967 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000968 break
969 elif re.match(r'quit|q', rebase_action, re.I):
970 raise gclient_utils.Error("Please merge or rebase manually\n"
971 "cd %s && git " % self.checkout_path
972 + "%s" % ' '.join(rebase_cmd))
973 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000974 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000975 continue
976 else:
977 gclient_utils.Error("Input not recognized")
978 continue
979 elif re.search(r'^CONFLICT', e.stdout, re.M):
980 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
981 "Fix the conflict and run gclient again.\n"
982 "See 'man git-rebase' for details.\n")
983 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000984 self.Print(e.stdout.strip())
985 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000986 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
987 "manually.\ncd %s && git " %
988 self.checkout_path
989 + "%s" % ' '.join(rebase_cmd))
990
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000991 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000992 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000993 # Make the output a little prettier. It's nice to have some
994 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000995 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000996
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000997 @staticmethod
998 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000999 (ok, current_version) = scm.GIT.AssertVersion(min_version)
1000 if not ok:
1001 raise gclient_utils.Error('git version %s < minimum required %s' %
1002 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +00001003
msb@chromium.org786fb682010-06-02 15:16:23 +00001004 def _IsRebasing(self):
1005 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
1006 # have a plumbing command to determine whether a rebase is in progress, so
1007 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
1008 g = os.path.join(self.checkout_path, '.git')
1009 return (
1010 os.path.isdir(os.path.join(g, "rebase-merge")) or
1011 os.path.isdir(os.path.join(g, "rebase-apply")))
1012
1013 def _CheckClean(self, rev_str):
1014 # Make sure the tree is clean; see git-rebase.sh for reference
1015 try:
1016 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001017 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001018 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001019 raise gclient_utils.Error('\n____ %s%s\n'
1020 '\tYou have unstaged changes.\n'
1021 '\tPlease commit, stash, or reset.\n'
1022 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001023 try:
1024 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
mmoss@chromium.org931b6c62014-09-09 16:57:26 +00001025 '--ignore-submodules', '--exit-code', 'HEAD', '--'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001026 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001027 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001028 raise gclient_utils.Error('\n____ %s%s\n'
1029 '\tYour index contains uncommitted changes\n'
1030 '\tPlease commit, stash, or reset.\n'
1031 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001032
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001033 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +00001034 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1035 # reference by a commit). If not, error out -- most likely a rebase is
1036 # in progress, try to detect so we can give a better error.
1037 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001038 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1039 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001040 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001041 # Commit is not contained by any rev. See if the user is rebasing:
1042 if self._IsRebasing():
1043 # Punt to the user
1044 raise gclient_utils.Error('\n____ %s%s\n'
1045 '\tAlready in a conflict, i.e. (no branch).\n'
1046 '\tFix the conflict and run gclient again.\n'
1047 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1048 '\tSee man git-rebase for details.\n'
1049 % (self.relpath, rev_str))
1050 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001051 name = ('saved-by-gclient-' +
1052 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001053 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001054 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001055 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001056
msb@chromium.org5bde4852009-12-14 16:47:12 +00001057 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001058 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001059 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001060 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001061 return None
1062 return branch
1063
borenet@google.comc3e09d22014-04-10 13:58:18 +00001064 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001065 kwargs.setdefault('cwd', self.checkout_path)
1066 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001067 env = scm.GIT.ApplyEnvVars(kwargs)
1068 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001069
dnj@chromium.orgbb424c02014-06-23 22:42:51 +00001070 def _Checkout(self, options, ref, force=False, quiet=None):
1071 """Performs a 'git-checkout' operation.
1072
1073 Args:
1074 options: The configured option set
1075 ref: (str) The branch/commit to checkout
1076 quiet: (bool/None) Whether or not the checkout shoud pass '--quiet'; if
1077 'None', the behavior is inferred from 'options.verbose'.
1078 Returns: (str) The output of the checkout operation
1079 """
1080 if quiet is None:
1081 quiet = (not options.verbose)
1082 checkout_args = ['checkout']
1083 if force:
1084 checkout_args.append('--force')
1085 if quiet:
1086 checkout_args.append('--quiet')
1087 checkout_args.append(ref)
1088 return self._Capture(checkout_args)
1089
dnj@chromium.org680f2172014-06-25 00:39:32 +00001090 def _Fetch(self, options, remote=None, prune=False, quiet=False):
1091 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
1092 fetch_cmd = cfg + [
1093 'fetch',
1094 remote or self.remote,
1095 ]
1096
1097 if prune:
1098 fetch_cmd.append('--prune')
1099 if options.verbose:
1100 fetch_cmd.append('--verbose')
1101 elif quiet:
1102 fetch_cmd.append('--quiet')
1103 self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
1104
1105 # Return the revision that was fetched; this will be stored in 'FETCH_HEAD'
1106 return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])
1107
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001108 def _UpdateBranchHeads(self, options, fetch=False):
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001109 """Adds, and optionally fetches, "branch-heads" and "tags" refspecs
1110 if requested."""
1111 need_fetch = fetch
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001112 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001113 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001114 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1115 '^\\+refs/branch-heads/\\*:.*$']
1116 self._Run(config_cmd, options)
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001117 need_fetch = True
1118 if hasattr(options, 'with_tags') and options.with_tags:
1119 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
1120 '+refs/tags/*:refs/tags/*',
1121 '^\\+refs/tags/\\*:.*$']
1122 self._Run(config_cmd, options)
1123 need_fetch = True
1124 if fetch and need_fetch:
1125 self._Fetch(options)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001126
dnj@chromium.org680f2172014-06-25 00:39:32 +00001127 def _Run(self, args, options, show_header=True, **kwargs):
1128 # Disable 'unused options' warning | pylint: disable=W0613
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001129 cwd = kwargs.setdefault('cwd', self.checkout_path)
1130 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001131 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001132 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001133 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001134 cmd = ['git'] + args
dnj@chromium.org680f2172014-06-25 00:39:32 +00001135 if show_header:
1136 header = "running '%s' in '%s'" % (' '.join(cmd), cwd)
1137 self.filter(header)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001138 return gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001139
1140
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001141class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001142 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001143 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001144
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001145 @staticmethod
1146 def BinaryExists():
1147 """Returns true if the command exists."""
1148 try:
1149 result, version = scm.SVN.AssertVersion('1.4')
1150 if not result:
1151 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1152 return result
1153 except OSError:
1154 return False
1155
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001156 def GetCheckoutRoot(self):
1157 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1158
floitsch@google.comeaab7842011-04-28 09:07:58 +00001159 def GetRevisionDate(self, revision):
1160 """Returns the given revision's date in ISO-8601 format (which contains the
1161 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001162 date = scm.SVN.Capture(
1163 ['propget', '--revprop', 'svn:date', '-r', revision],
1164 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001165 return date.strip()
1166
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001167 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001168 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001169 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001170
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001171 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001172 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001173 if not os.path.isdir(self.checkout_path):
1174 raise gclient_utils.Error('Directory %s is not present.' %
1175 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001176 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001177
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001178 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001179 """Generates a patch file which can be applied to the root of the
1180 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001181 if not os.path.isdir(self.checkout_path):
1182 raise gclient_utils.Error('Directory %s is not present.' %
1183 self.checkout_path)
1184 gclient_utils.CheckCallAndFilter(
1185 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1186 cwd=self.checkout_path,
1187 print_stdout=False,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001188 filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001189
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001190 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001191 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001192
1193 All updated files will be appended to file_list.
1194
1195 Raises:
1196 Error: if can't get URL for relative path.
1197 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001198 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001199 hg_path = os.path.join(self.checkout_path, '.hg')
1200 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001201 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001202 return
1203
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001204 if args:
1205 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1206
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001207 # revision is the revision to match. It is None if no revision is specified,
1208 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001209 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001210 # Keep the original unpinned url for reference in case the repo is switched.
1211 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001212 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001213 if options.revision:
1214 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001215 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001216 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001217 if revision != 'unmanaged':
1218 forced_revision = True
1219 # Reconstruct the url.
1220 url = '%s@%s' % (url, revision)
1221 rev_str = ' at %s' % revision
1222 else:
1223 managed = False
1224 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001225 else:
1226 forced_revision = False
1227 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001228
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001229 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001230 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001231 # Git is only okay if it's a git-svn checkout of the right repo.
1232 if scm.GIT.IsGitSvn(self.checkout_path):
1233 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1234 'svn-remote.svn.url'],
1235 cwd=self.checkout_path).rstrip()
1236 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001237 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1238 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001239 return # TODO(borenet): Get the svn revision number?
1240
1241 # Get the existing scm url and the revision number of the current checkout.
1242 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001243 try:
1244 from_info = scm.SVN.CaptureLocalInfo(
1245 [], os.path.join(self.checkout_path, '.'))
1246 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001247 self._DeleteOrMove(options.force)
1248 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001249
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001250 BASE_URLS = {
1251 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1252 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1253 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001254 WHITELISTED_ROOTS = [
1255 'svn://svn.chromium.org',
1256 'svn://svn-mirror.golo.chromium.org',
1257 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001258 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001259 try:
1260 # Split out the revision number since it's not useful for us.
1261 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001262 # Check to see if we're on a whitelisted root. We do this because
1263 # only some svn servers have matching UUIDs.
1264 local_parsed = urlparse.urlparse(url)
1265 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001266 if ('CHROME_HEADLESS' in os.environ
1267 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001268 and base_path in BASE_URLS
1269 and local_root in WHITELISTED_ROOTS):
1270
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001271 # Use a tarball for initial sync if we are on a bot.
1272 # Get an unauthenticated gsutil instance.
1273 gsutil = download_from_google_storage.Gsutil(
1274 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1275
1276 gs_path = BASE_URLS[base_path]
1277 _, out, _ = gsutil.check_call('ls', gs_path)
1278 # So that we can get the most recent revision.
1279 sorted_items = sorted(out.splitlines())
1280 latest_checkout = sorted_items[-1]
1281
1282 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001283 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001284 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1285 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001286 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001287 raise Exception()
1288 filename = latest_checkout.split('/')[-1]
1289 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001290 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001291 gclient_utils.safe_makedirs(self.checkout_path)
1292 # TODO(hinoka): Use 7z for windows.
1293 cmd = ['tar', '--extract', '--ungzip',
1294 '--directory', self.checkout_path,
1295 '--file', tarball]
1296 gclient_utils.CheckCallAndFilter(
1297 cmd, stdout=sys.stdout, print_stdout=True)
1298
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001299 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001300 gclient_utils.rmtree(tempdir)
1301
1302 # Rewrite the repository root to match.
1303 tarball_url = scm.SVN.CaptureLocalInfo(
1304 ['.'], self.checkout_path)['Repository Root']
1305 tarball_parsed = urlparse.urlparse(tarball_url)
1306 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1307 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001308
1309 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001310 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001311 self._Run(['switch', '--relocate', tarball_root,
1312 local_root, self.checkout_path],
1313 options)
1314 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001315 self.Print('We tried to get a source tarball but failed.')
1316 self.Print('Resuming normal operations.')
1317 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001318
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001319 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001320 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001321 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001322 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001323 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001324 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001325
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001326 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001327 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001328 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1329 return self.Svnversion()
1330 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001331
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001332 if 'URL' not in from_info:
1333 raise gclient_utils.Error(
1334 ('gclient is confused. Couldn\'t get the url for %s.\n'
1335 'Try using @unmanaged.\n%s') % (
1336 self.checkout_path, from_info))
1337
stip@chromium.org3031d732014-04-21 22:18:02 +00001338 # Look for locked directories.
1339 dir_info = scm.SVN.CaptureStatus(
1340 None, os.path.join(self.checkout_path, '.'))
1341 if any(d[0][2] == 'L' for d in dir_info):
1342 try:
1343 self._Run(['cleanup', self.checkout_path], options)
1344 except subprocess2.CalledProcessError, e:
1345 # Get the status again, svn cleanup may have cleaned up at least
1346 # something.
1347 dir_info = scm.SVN.CaptureStatus(
1348 None, os.path.join(self.checkout_path, '.'))
1349
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001350 # Try to fix the failures by removing troublesome files.
1351 for d in dir_info:
1352 if d[0][2] == 'L':
1353 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001354 # We don't pass any files/directories to CaptureStatus and set
1355 # cwd=self.checkout_path, so we should get relative paths here.
1356 assert not os.path.isabs(d[1])
1357 path_to_remove = os.path.normpath(
1358 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001359 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001360 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001361 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001362 self.Print(
1363 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001364 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001365 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001366 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001367
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001368 # Retrieve the current HEAD version because svn is slow at null updates.
1369 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001370 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001371 revision = str(from_info_live['Revision'])
1372 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001373
borenet@google.comb09097a2014-04-09 19:09:08 +00001374 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001375 # The repository url changed, need to switch.
1376 try:
1377 to_info = scm.SVN.CaptureRemoteInfo(url)
1378 except (gclient_utils.Error, subprocess2.CalledProcessError):
1379 # The url is invalid or the server is not accessible, it's safer to bail
1380 # out right now.
1381 raise gclient_utils.Error('This url is unreachable: %s' % url)
1382 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1383 and (from_info['UUID'] == to_info['UUID']))
1384 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001385 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001386 # We have different roots, so check if we can switch --relocate.
1387 # Subversion only permits this if the repository UUIDs match.
1388 # Perform the switch --relocate, then rewrite the from_url
1389 # to reflect where we "are now." (This is the same way that
1390 # Subversion itself handles the metadata when switch --relocate
1391 # is used.) This makes the checks below for whether we
1392 # can update to a revision or have to switch to a different
1393 # branch work as expected.
1394 # TODO(maruel): TEST ME !
1395 command = ['switch', '--relocate',
1396 from_info['Repository Root'],
1397 to_info['Repository Root'],
1398 self.relpath]
1399 self._Run(command, options, cwd=self._root_dir)
1400 from_info['URL'] = from_info['URL'].replace(
1401 from_info['Repository Root'],
1402 to_info['Repository Root'])
1403 else:
1404 if not options.force and not options.reset:
1405 # Look for local modifications but ignore unversioned files.
1406 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1407 if status[0][0] != '?':
1408 raise gclient_utils.Error(
1409 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1410 'there is local changes in %s. Delete the directory and '
1411 'try again.') % (url, self.checkout_path))
1412 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001413 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001414 gclient_utils.rmtree(self.checkout_path)
1415 # We need to checkout.
1416 command = ['checkout', url, self.checkout_path]
1417 command = self._AddAdditionalUpdateFlags(command, options, revision)
1418 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1419 return self.Svnversion()
1420
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001421 # If the provided url has a revision number that matches the revision
1422 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001423 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001424 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001425 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001426 else:
1427 command = ['update', self.checkout_path]
1428 command = self._AddAdditionalUpdateFlags(command, options, revision)
1429 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001430
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001431 # If --reset and --delete_unversioned_trees are specified, remove any
1432 # untracked files and directories.
1433 if options.reset and options.delete_unversioned_trees:
1434 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1435 full_path = os.path.join(self.checkout_path, status[1])
1436 if (status[0][0] == '?'
1437 and os.path.isdir(full_path)
1438 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001439 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001440 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001441 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001442
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001443 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001444 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001445 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001446 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001447 # Create an empty checkout and then update the one file we want. Future
1448 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001449 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001450 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001451 if os.path.exists(os.path.join(self.checkout_path, filename)):
1452 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001453 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001454 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001455 # After the initial checkout, we can use update as if it were any other
1456 # dep.
1457 self.update(options, args, file_list)
1458 else:
1459 # If the installed version of SVN doesn't support --depth, fallback to
1460 # just exporting the file. This has the downside that revision
1461 # information is not stored next to the file, so we will have to
1462 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001463 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001464 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001465 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001466 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001467 command = self._AddAdditionalUpdateFlags(command, options,
1468 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001469 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001470
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001471 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001472 """Reverts local modifications. Subversion specific.
1473
1474 All reverted files will be appended to file_list, even if Subversion
1475 doesn't know about them.
1476 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001477 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001478 if os.path.exists(self.checkout_path):
1479 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001480 # svn revert won't work if the directory doesn't exist. It needs to
1481 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001482 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001483 # Don't reuse the args.
1484 return self.update(options, [], file_list)
1485
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001486 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001487 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001488 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001489 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001490 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001491 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001492 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001493 if not options.force:
1494 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001495 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001496 '\n_____ %s is not a valid svn checkout, synching instead' %
1497 self.relpath)
1498 gclient_utils.rmtree(self.checkout_path)
1499 # Don't reuse the args.
1500 return self.update(options, [], file_list)
1501
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001502 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001503 if file_list is not None:
1504 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001505 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001506 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001507 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001508 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001509 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001510
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001511 # Revert() may delete the directory altogether.
1512 if not os.path.isdir(self.checkout_path):
1513 # Don't reuse the args.
1514 return self.update(options, [], file_list)
1515
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001516 try:
1517 # svn revert is so broken we don't even use it. Using
1518 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001519 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001520 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1521 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001522 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001523 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001524 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001525
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001526 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001527 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001528 try:
1529 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001530 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001531 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001532
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001533 def runhooks(self, options, args, file_list):
1534 self.status(options, args, file_list)
1535
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001536 def status(self, options, args, file_list):
1537 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001538 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001539 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001540 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001541 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001542 'The directory does not exist.') %
1543 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001544 # There's no file list to retrieve.
1545 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001546 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001547
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001548 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001549 """Verifies the validity of the revision for this repository."""
1550 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1551 raise gclient_utils.Error(
1552 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1553 'correct.') % rev)
1554 return rev
1555
msb@chromium.orge6f78352010-01-13 17:05:33 +00001556 def FullUrlForRelativeUrl(self, url):
1557 # Find the forth '/' and strip from there. A bit hackish.
1558 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001559
maruel@chromium.org669600d2010-09-01 19:06:31 +00001560 def _Run(self, args, options, **kwargs):
1561 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001562 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001563 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001564 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001565
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001566 def Svnversion(self):
1567 """Runs the lowest checked out revision in the current project."""
1568 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1569 return info['Revision']
1570
maruel@chromium.org669600d2010-09-01 19:06:31 +00001571 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1572 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001573 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001574 scm.SVN.RunAndGetFileList(
1575 options.verbose,
1576 args + ['--ignore-externals'],
1577 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001578 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001579
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001580 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001581 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001582 """Add additional flags to command depending on what options are set.
1583 command should be a list of strings that represents an svn command.
1584
1585 This method returns a new list to be used as a command."""
1586 new_command = command[:]
1587 if revision:
1588 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001589 # We don't want interaction when jobs are used.
1590 if options.jobs > 1:
1591 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001592 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001593 # --accept was added to 'svn update' in svn 1.6.
1594 if not scm.SVN.AssertVersion('1.5')[0]:
1595 return new_command
1596
1597 # It's annoying to have it block in the middle of a sync, just sensible
1598 # defaults.
1599 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001600 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001601 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1602 new_command.extend(('--accept', 'theirs-conflict'))
1603 elif options.manually_grab_svn_rev:
1604 new_command.append('--force')
1605 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1606 new_command.extend(('--accept', 'postpone'))
1607 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1608 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001609 return new_command