blob: 1aeb69dbf7556b2596f15949f775159aa8e30fba [file] [log] [blame]
steveblock@chromium.org93567042012-02-15 01:02:26 +00001# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00004
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00005"""Gclient-specific SCM-specific operations."""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00006
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00007from __future__ import print_function
8
borenet@google.comb2256212014-05-07 20:57:28 +00009import errno
maruel@chromium.org754960e2009-09-21 12:31:05 +000010import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000011import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000012import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000013import re
maruel@chromium.org90541732011-04-01 17:54:18 +000014import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000015import tempfile
zty@chromium.org6279e8a2014-02-13 01:45:25 +000016import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000017import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000018
hinoka@google.com2f2ca142014-01-07 03:59:18 +000019import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000020import gclient_utils
szager@chromium.org848fd492014-04-09 19:06:44 +000021import git_cache
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000022import scm
borenet@google.comb2256212014-05-07 20:57:28 +000023import shutil
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000024import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000025
26
szager@chromium.org71cbb502013-04-19 23:30:15 +000027THIS_FILE_PATH = os.path.abspath(__file__)
28
hinoka@google.com2f2ca142014-01-07 03:59:18 +000029GSUTIL_DEFAULT_PATH = os.path.join(
hinoka@chromium.orgb091aa52014-12-20 01:47:31 +000030 os.path.dirname(os.path.abspath(__file__)), 'gsutil.py')
hinoka@google.com2f2ca142014-01-07 03:59:18 +000031
maruel@chromium.org79d62372015-06-01 18:50:55 +000032
tandrii@chromium.orgef141922015-08-12 17:36:27 +000033class NoUsableRevError(gclient_utils.Error):
34 """Raised if requested revision isn't found in checkout."""
35
36
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000037class DiffFiltererWrapper(object):
38 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000039 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000040 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000041 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000042 original_prefix = "--- "
43 working_prefix = "+++ "
44
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000045 def __init__(self, relpath, print_func):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000046 # Note that we always use '/' as the path separator to be
47 # consistent with svn's cygwin-style output on Windows
48 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000049 self._current_file = None
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000050 self._print_func = print_func
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000051
maruel@chromium.org6e29d572010-06-04 17:32:20 +000052 def SetCurrentFile(self, current_file):
53 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000054
iannucci@chromium.org3830a672013-02-19 20:15:14 +000055 @property
56 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000057 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000058
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000059 def _Replace(self, line):
60 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000061
62 def Filter(self, line):
63 if (line.startswith(self.index_string)):
64 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000065 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000066 else:
67 if (line.startswith(self.original_prefix) or
68 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000069 line = self._Replace(line)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000070 self._print_func(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000071
72
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000073class SvnDiffFilterer(DiffFiltererWrapper):
74 index_string = "Index: "
75
76
77class GitDiffFilterer(DiffFiltererWrapper):
78 index_string = "diff --git "
79
80 def SetCurrentFile(self, current_file):
81 # Get filename by parsing "a/<filename> b/<filename>"
82 self._current_file = current_file[:(len(current_file)/2)][2:]
83
84 def _Replace(self, line):
85 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
86
87
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000088### SCM abstraction layer
89
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000090# Factory Method for SCM wrapper creation
91
maruel@chromium.org9eda4112010-06-11 18:56:10 +000092def GetScmName(url):
93 if url:
94 url, _ = gclient_utils.SplitUrlRevision(url)
95 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000096 url.startswith('git+http://') or url.startswith('git+https://') or
borenet@google.coma2aec972014-04-22 21:35:15 +000097 url.endswith('.git') or url.startswith('sso://') or
98 'googlesource' in url):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000099 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +0000100 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +0000101 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000102 return 'svn'
agable@chromium.org44ae4fb2014-10-23 08:28:30 +0000103 elif url.startswith('file://'):
104 if url.endswith('.git'):
105 return 'git'
106 return 'svn'
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000107 return None
108
109
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000110def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000111 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000112 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000113 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000114 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000115
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000116 scm_name = GetScmName(url)
117 if not scm_name in SCM_MAP:
118 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000119 scm_class = SCM_MAP[scm_name]
120 if not scm_class.BinaryExists():
121 raise gclient_utils.Error('%s command not found' % scm_name)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000122 return scm_class(url, root_dir, relpath, out_fh, out_cb)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000123
124
125# SCMWrapper base class
126
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000127class SCMWrapper(object):
128 """Add necessary glue between all the supported SCM.
129
msb@chromium.orgd6504212010-01-13 17:34:31 +0000130 This is the abstraction layer to bind to different SCM.
131 """
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000132
133 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
134 out_cb=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000135 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000136 self._root_dir = root_dir
137 if self._root_dir:
138 self._root_dir = self._root_dir.replace('/', os.sep)
139 self.relpath = relpath
140 if self.relpath:
141 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000142 if self.relpath and self._root_dir:
143 self.checkout_path = os.path.join(self._root_dir, self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000144 if out_fh is None:
145 out_fh = sys.stdout
146 self.out_fh = out_fh
147 self.out_cb = out_cb
148
149 def Print(self, *args, **kwargs):
150 kwargs.setdefault('file', self.out_fh)
151 if kwargs.pop('timestamp', True):
152 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
153 print(*args, **kwargs)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000154
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000155 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000156 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000157 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000158
159 if not command in commands:
160 raise gclient_utils.Error('Unknown command %s' % command)
161
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000162 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000163 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000164 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000165
166 return getattr(self, command)(options, args, file_list)
167
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000168 @staticmethod
169 def _get_first_remote_url(checkout_path):
170 log = scm.GIT.Capture(
171 ['config', '--local', '--get-regexp', r'remote.*.url'],
172 cwd=checkout_path)
173 # Get the second token of the first line of the log.
174 return log.splitlines()[0].split(' ', 1)[1]
175
smut@google.comd33eab32014-07-07 19:35:18 +0000176 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000177 """Attempt to determine the remote URL for this SCMWrapper."""
smut@google.comd33eab32014-07-07 19:35:18 +0000178 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000179 if os.path.exists(os.path.join(self.checkout_path, '.git')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000180 actual_remote_url = self._get_first_remote_url(self.checkout_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000181
182 # If a cache_dir is used, obtain the actual remote URL from the cache.
183 if getattr(self, 'cache_dir', None):
borenet@google.com46d09f62014-04-10 18:50:23 +0000184 url, _ = gclient_utils.SplitUrlRevision(self.url)
185 mirror = git_cache.Mirror(url)
szager@chromium.org848fd492014-04-09 19:06:44 +0000186 if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
borenet@google.com4e9be262014-04-08 19:40:30 +0000187 actual_remote_url.replace('\\', '/')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000188 actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000189 return actual_remote_url
190
191 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000192 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000193 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000194 return None
195
borenet@google.com4e9be262014-04-08 19:40:30 +0000196 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000197 """Determine whether the remote URL of this checkout is the expected URL."""
198 if not os.path.exists(self.checkout_path):
199 # A checkout which doesn't exist can't be broken.
200 return True
201
smut@google.comd33eab32014-07-07 19:35:18 +0000202 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000203 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000204 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
205 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000206 else:
207 # This may occur if the self.checkout_path exists but does not contain a
208 # valid git or svn checkout.
209 return False
210
borenet@google.comb09097a2014-04-09 19:09:08 +0000211 def _DeleteOrMove(self, force):
212 """Delete the checkout directory or move it out of the way.
213
214 Args:
215 force: bool; if True, delete the directory. Otherwise, just move it.
216 """
borenet@google.comb2256212014-05-07 20:57:28 +0000217 if force and os.environ.get('CHROME_HEADLESS') == '1':
218 self.Print('_____ Conflicting directory found in %s. Removing.'
219 % self.checkout_path)
220 gclient_utils.AddWarning('Conflicting directory %s deleted.'
221 % self.checkout_path)
222 gclient_utils.rmtree(self.checkout_path)
223 else:
224 bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
225 os.path.dirname(self.relpath))
226
227 try:
228 os.makedirs(bad_scm_dir)
229 except OSError as e:
230 if e.errno != errno.EEXIST:
231 raise
232
233 dest_path = tempfile.mkdtemp(
234 prefix=os.path.basename(self.relpath),
235 dir=bad_scm_dir)
236 self.Print('_____ Conflicting directory found in %s. Moving to %s.'
237 % (self.checkout_path, dest_path))
238 gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
239 % (self.checkout_path, dest_path))
240 shutil.move(self.checkout_path, dest_path)
borenet@google.comb09097a2014-04-09 19:09:08 +0000241
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000242
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000243class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000244 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000245 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000246 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000247
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000248 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000249
szager@chromium.org848fd492014-04-09 19:06:44 +0000250 def __init__(self, url=None, *args):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000251 """Removes 'git+' fake prefix from git URL."""
252 if url.startswith('git+http://') or url.startswith('git+https://'):
253 url = url[4:]
szager@chromium.org848fd492014-04-09 19:06:44 +0000254 SCMWrapper.__init__(self, url, *args)
255 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
256 if self.out_cb:
257 filter_kwargs['predicate'] = self.out_cb
258 self.filter = gclient_utils.GitFilter(**filter_kwargs)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000259
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000260 @staticmethod
261 def BinaryExists():
262 """Returns true if the command exists."""
263 try:
264 # We assume git is newer than 1.7. See: crbug.com/114483
265 result, version = scm.GIT.AssertVersion('1.7')
266 if not result:
267 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
268 return result
269 except OSError:
270 return False
271
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000272 def GetCheckoutRoot(self):
273 return scm.GIT.GetCheckoutRoot(self.checkout_path)
274
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000275 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000276 """Returns the given revision's date in ISO-8601 format (which contains the
277 time zone)."""
278 # TODO(floitsch): get the time-stamp of the given revision and not just the
279 # time-stamp of the currently checked out revision.
280 return self._Capture(['log', '-n', '1', '--format=%ai'])
281
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000282 @staticmethod
283 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000284 """'Cleanup' the repo.
285
286 There's no real git equivalent for the svn cleanup command, do a no-op.
287 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000288
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000289 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000290 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000291 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000292
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000293 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000294 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000295 repository.
296
297 The patch file is generated from a diff of the merge base of HEAD and
298 its upstream branch.
299 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000300 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000301 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000302 ['git', 'diff', merge_base],
303 cwd=self.checkout_path,
avakulenko@google.com255f2be2014-12-05 22:19:55 +0000304 filter_fn=GitDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000305
smut@google.comd33eab32014-07-07 19:35:18 +0000306 def _FetchAndReset(self, revision, file_list, options):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000307 """Equivalent to git fetch; git reset."""
308 quiet = []
309 if not options.verbose:
310 quiet = ['--quiet']
311 self._UpdateBranchHeads(options, fetch=False)
312
dnj@chromium.org680f2172014-06-25 00:39:32 +0000313 self._Fetch(options, prune=True, quiet=options.verbose)
smut@google.comd33eab32014-07-07 19:35:18 +0000314 self._Run(['reset', '--hard', revision] + quiet, options)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000315 if file_list is not None:
316 files = self._Capture(['ls-files']).splitlines()
317 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
318
szager@chromium.org8a139702014-06-20 15:55:01 +0000319 def _DisableHooks(self):
320 hook_dir = os.path.join(self.checkout_path, '.git', 'hooks')
321 if not os.path.isdir(hook_dir):
322 return
323 for f in os.listdir(hook_dir):
324 if not f.endswith('.sample') and not f.endswith('.disabled'):
primiano@chromium.org41265562015-04-08 09:14:46 +0000325 disabled_hook_path = os.path.join(hook_dir, f + '.disabled')
326 if os.path.exists(disabled_hook_path):
327 os.remove(disabled_hook_path)
328 os.rename(os.path.join(hook_dir, f), disabled_hook_path)
szager@chromium.org8a139702014-06-20 15:55:01 +0000329
msb@chromium.orge28e4982009-09-25 20:51:45 +0000330 def update(self, options, args, file_list):
331 """Runs git to update or transparently checkout the working copy.
332
333 All updated files will be appended to file_list.
334
335 Raises:
336 Error: if can't get URL for relative path.
337 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000338 if args:
339 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
340
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000341 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000342
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000343 # If a dependency is not pinned, track the default remote branch.
smut@google.comd33eab32014-07-07 19:35:18 +0000344 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000345 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000346 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000347 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000348 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000349 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000350 # Override the revision number.
351 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000352 if revision == 'unmanaged':
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000353 # Check again for a revision in case an initial ref was specified
354 # in the url, for example bla.git@refs/heads/custombranch
355 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000356 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000357 if not revision:
358 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000359
szager@chromium.org8a139702014-06-20 15:55:01 +0000360 if managed:
361 self._DisableHooks()
362
floitsch@google.comeaab7842011-04-28 09:07:58 +0000363 if gclient_utils.IsDateRevision(revision):
364 # Date-revisions only work on git-repositories if the reflog hasn't
365 # expired yet. Use rev-list to get the corresponding revision.
366 # git rev-list -n 1 --before='time-stamp' branchname
367 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000368 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000369 revision = default_rev
370
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000371 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000372 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000373
374 printed_path = False
375 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000376 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000377 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000378 verbose = ['--verbose']
379 printed_path = True
380
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000381 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
382 if remote_ref:
smut@google.comd33eab32014-07-07 19:35:18 +0000383 # Rewrite remote refs to their local equivalents.
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000384 revision = ''.join(remote_ref)
385 rev_type = "branch"
386 elif revision.startswith('refs/'):
387 # Local branch? We probably don't want to support, since DEPS should
388 # always specify branches as they are in the upstream repo.
smut@google.comd33eab32014-07-07 19:35:18 +0000389 rev_type = "branch"
390 else:
391 # hash is also a tag, only make a distinction at checkout
392 rev_type = "hash"
393
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000394 mirror = self._GetMirror(url, options)
395 if mirror:
396 url = mirror.mirror_path
397
primiano@chromium.org1c127382015-02-17 11:15:40 +0000398 # If we are going to introduce a new project, there is a possibility that
399 # we are syncing back to a state where the project was originally a
400 # sub-project rolled by DEPS (realistic case: crossing the Blink merge point
401 # syncing backwards, when Blink was a DEPS entry and not part of src.git).
402 # In such case, we might have a backup of the former .git folder, which can
403 # be used to avoid re-fetching the entire repo again (useful for bisects).
404 backup_dir = self.GetGitBackupDirPath()
405 target_dir = os.path.join(self.checkout_path, '.git')
406 if os.path.exists(backup_dir) and not os.path.exists(target_dir):
407 gclient_utils.safe_makedirs(self.checkout_path)
408 os.rename(backup_dir, target_dir)
409 # Reset to a clean state
410 self._Run(['reset', '--hard', 'HEAD'], options)
411
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000412 if (not os.path.exists(self.checkout_path) or
413 (os.path.isdir(self.checkout_path) and
414 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000415 if mirror:
416 self._UpdateMirror(mirror, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000417 try:
smut@google.comd33eab32014-07-07 19:35:18 +0000418 self._Clone(revision, url, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000419 except subprocess2.CalledProcessError:
420 self._DeleteOrMove(options.force)
smut@google.comd33eab32014-07-07 19:35:18 +0000421 self._Clone(revision, url, options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000422 if file_list is not None:
423 files = self._Capture(['ls-files']).splitlines()
424 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000425 if not verbose:
426 # Make the output a little prettier. It's nice to have some whitespace
427 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000428 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000429 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000430
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000431 if not managed:
432 self._UpdateBranchHeads(options, fetch=False)
433 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
434 return self._Capture(['rev-parse', '--verify', 'HEAD'])
435
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000436 if mirror:
437 self._UpdateMirror(mirror, options)
438
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000439 # See if the url has changed (the unittests use git://foo for the url, let
440 # that through).
441 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
442 return_early = False
443 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
444 # unit test pass. (and update the comment above)
445 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
446 # This allows devs to use experimental repos which have a different url
447 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000448 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000449 url != 'git://foo' and
450 subprocess2.capture(
451 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
452 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000453 self.Print('_____ switching %s to a new upstream' % self.relpath)
iannucci@chromium.org78514212014-08-20 23:08:00 +0000454 if not (options.force or options.reset):
455 # Make sure it's clean
456 self._CheckClean(rev_str)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000457 # Switch over to the new upstream
458 self._Run(['remote', 'set-url', self.remote, url], options)
szager@chromium.org8dd35462015-06-08 22:56:05 +0000459 if mirror:
460 with open(os.path.join(
461 self.checkout_path, '.git', 'objects', 'info', 'alternates'),
462 'w') as fh:
463 fh.write(os.path.join(url, 'objects'))
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000464 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
smut@google.comd33eab32014-07-07 19:35:18 +0000465 self._FetchAndReset(revision, file_list, options)
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000466
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000467 return_early = True
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000468 else:
469 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000470
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000471 if return_early:
472 return self._Capture(['rev-parse', '--verify', 'HEAD'])
473
msb@chromium.org5bde4852009-12-14 16:47:12 +0000474 cur_branch = self._GetCurrentBranch()
475
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000477 # 0) HEAD is detached. Probably from our initial clone.
478 # - make sure HEAD is contained by a named ref, then update.
479 # Cases 1-4. HEAD is a branch.
480 # 1) current branch is not tracking a remote branch (could be git-svn)
481 # - try to rebase onto the new hash or branch
482 # 2) current branch is tracking a remote branch with local committed
483 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000484 # - rebase those changes on top of the hash
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000485 # 3) current branch is tracking a remote branch w/or w/out changes, and
486 # no DEPS switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000487 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000488 # 4) current branch is tracking a remote branch, but DEPS switches to a
489 # different remote branch, and
490 # a) current branch has no local changes, and --force:
491 # - checkout new branch
492 # b) current branch has local changes, and --force and --reset:
493 # - checkout new branch
494 # c) otherwise exit
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000495
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000496 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
497 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
499 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000500 if cur_branch is None:
501 upstream_branch = None
502 current_type = "detached"
503 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000504 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000505 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
506 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
507 current_type = "hash"
508 logging.debug("Current branch is not tracking an upstream (remote)"
509 " branch.")
510 elif upstream_branch.startswith('refs/remotes'):
511 current_type = "branch"
512 else:
513 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000514
smut@google.comd33eab32014-07-07 19:35:18 +0000515 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000516 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000517 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000518 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000519 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000520 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521
mmoss@chromium.org37ac0e32015-08-18 18:14:38 +0000522 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000523
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000524 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000525 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000526 target = 'HEAD'
527 if options.upstream and upstream_branch:
528 target = upstream_branch
529 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000530
msb@chromium.org786fb682010-06-02 15:16:23 +0000531 if current_type == 'detached':
532 # case 0
533 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000534 self._CheckDetachedHead(rev_str, options)
smut@google.comd33eab32014-07-07 19:35:18 +0000535 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
szager@chromium.org848fd492014-04-09 19:06:44 +0000536 self.Print('Up-to-date; skipping checkout.')
537 else:
vadimsh@chromium.org2b7d3ed2014-06-20 18:15:37 +0000538 # 'git checkout' may need to overwrite existing untracked files. Allow
539 # it only when nuclear options are enabled.
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000540 self._Checkout(
541 options,
542 revision,
543 force=(options.force and options.delete_unversioned_trees),
544 quiet=True,
545 )
msb@chromium.org786fb682010-06-02 15:16:23 +0000546 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000547 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000548 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000549 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000550 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000551 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000552 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000553 newbase=revision, printed_path=printed_path,
554 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000555 printed_path = True
556 else:
557 # Can't find a merge-base since we don't know our upstream. That makes
558 # this command VERY likely to produce a rebase failure. For now we
559 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000560 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000561 if options.revision or deps_revision:
smut@google.comd33eab32014-07-07 19:35:18 +0000562 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000563 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000564 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000565 printed_path = True
smut@google.comd33eab32014-07-07 19:35:18 +0000566 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000567 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000568 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000569 newbase=revision, printed_path=printed_path,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000570 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000571 printed_path = True
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000572 elif remote_ref and ''.join(remote_ref) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000573 # case 4
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000574 new_base = ''.join(remote_ref)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000575 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000576 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000577 switch_error = ("Could not switch upstream branch from %s to %s\n"
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000578 % (upstream_branch, new_base) +
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000579 "Please use --force or merge or rebase manually:\n" +
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000580 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
581 "OR git checkout -b <some new branch> %s" % new_base)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000582 force_switch = False
583 if options.force:
584 try:
585 self._CheckClean(rev_str)
586 # case 4a
587 force_switch = True
588 except gclient_utils.Error as e:
589 if options.reset:
590 # case 4b
591 force_switch = True
592 else:
593 switch_error = '%s\n%s' % (e.message, switch_error)
594 if force_switch:
595 self.Print("Switching upstream branch from %s to %s" %
596 (upstream_branch, new_base))
597 switch_branch = 'gclient_' + remote_ref[1]
598 self._Capture(['branch', '-f', switch_branch, new_base])
599 self._Checkout(options, switch_branch, force=True, quiet=True)
600 else:
601 # case 4c
602 raise gclient_utils.Error(switch_error)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000603 else:
604 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000605 if files is not None:
606 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000607 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000608 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000609 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000610 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000611 if options.merge:
612 merge_args.append('--ff')
613 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000614 merge_args.append('--ff-only')
615 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000616 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000617 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000618 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000619 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000620 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 while True:
dnj@chromium.org5b23e872015-02-20 21:25:57 +0000624 if not options.auto_rebase:
625 try:
626 action = self._AskForData(
627 'Cannot %s, attempt to rebase? '
628 '(y)es / (q)uit / (s)kip : ' %
629 ('merge' if options.merge else 'fast-forward merge'),
630 options)
631 except ValueError:
632 raise gclient_utils.Error('Invalid Character')
633 if options.auto_rebase or re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000634 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000635 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000636 printed_path = True
637 break
638 elif re.match(r'quit|q', action, re.I):
639 raise gclient_utils.Error("Can't fast-forward, please merge or "
640 "rebase manually.\n"
641 "cd %s && git " % self.checkout_path
642 + "rebase %s" % upstream_branch)
643 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000644 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000645 return
646 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000647 self.Print('Input not recognized')
smut@google.com27c9c8a2014-09-11 19:57:55 +0000648 elif re.match("error: Your local changes to '.*' would be "
649 "overwritten by merge. Aborting.\nPlease, commit your "
650 "changes or stash them before you can merge.\n",
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000651 e.stderr):
652 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000653 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000654 printed_path = True
655 raise gclient_utils.Error(e.stderr)
656 else:
657 # Some other problem happened with the merge
658 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000659 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000660 raise
661 else:
662 # Fast-forward merge was successful
663 if not re.match('Already up-to-date.', merge_output) or verbose:
664 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000665 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000666 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000667 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000668 if not verbose:
669 # Make the output a little prettier. It's nice to have some
670 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000671 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000672
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000673 if file_list is not None:
674 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000675
676 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000677 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000678 raise gclient_utils.Error('\n____ %s%s\n'
679 '\nConflict while rebasing this branch.\n'
680 'Fix the conflict and run gclient again.\n'
681 'See man git-rebase for details.\n'
682 % (self.relpath, rev_str))
683
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000684 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000685 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
686 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000687
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000688 # If --reset and --delete_unversioned_trees are specified, remove any
689 # untracked directories.
690 if options.reset and options.delete_unversioned_trees:
691 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
692 # merge-base by default), so doesn't include untracked files. So we use
693 # 'git ls-files --directory --others --exclude-standard' here directly.
694 paths = scm.GIT.Capture(
695 ['ls-files', '--directory', '--others', '--exclude-standard'],
696 self.checkout_path)
697 for path in (p for p in paths.splitlines() if p.endswith('/')):
698 full_path = os.path.join(self.checkout_path, path)
699 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000700 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000701 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000702
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000703 return self._Capture(['rev-parse', '--verify', 'HEAD'])
704
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000705
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000706 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000707 """Reverts local modifications.
708
709 All reverted files will be appended to file_list.
710 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000711 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000712 # revert won't work if the directory doesn't exist. It needs to
713 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000714 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000715 # Don't reuse the args.
716 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000717
718 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000719 if options.upstream:
720 if self._GetCurrentBranch():
721 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
722 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000723 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000724 if not deps_revision:
725 deps_revision = default_rev
smut@google.comd33eab32014-07-07 19:35:18 +0000726 if deps_revision.startswith('refs/heads/'):
727 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000728 try:
729 deps_revision = self.GetUsableRev(deps_revision, options)
730 except NoUsableRevError as e:
731 # If the DEPS entry's url and hash changed, try to update the origin.
732 # See also http://crbug.com/520067.
733 logging.warn(
734 'Couldn\'t find usable revision, will retrying to update instead: %s',
735 e.message)
736 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000737
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000738 if file_list is not None:
739 files = self._Capture(['diff', deps_revision, '--name-only']).split()
740
maruel@chromium.org37e89872010-09-07 16:11:33 +0000741 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000742 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000743
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000744 if file_list is not None:
745 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
746
747 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000748 """Returns revision"""
749 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000750
msb@chromium.orge28e4982009-09-25 20:51:45 +0000751 def runhooks(self, options, args, file_list):
752 self.status(options, args, file_list)
753
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000754 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000755 """Display status information."""
756 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000757 self.Print('________ couldn\'t run status in %s:\n'
758 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000759 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000760 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000761 self._Run(['diff', '--name-status', merge_base], options,
762 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000763 if file_list is not None:
764 files = self._Capture(['diff', '--name-only', merge_base]).split()
765 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000766
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000767 def GetUsableRev(self, rev, options):
768 """Finds a useful revision for this repository.
769
770 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
771 will be called on the source."""
772 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000773 if not os.path.isdir(self.checkout_path):
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000774 raise NoUsableRevError(
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000775 ( 'We could not find a valid hash for safesync_url response "%s".\n'
776 'Safesync URLs with a git checkout currently require the repo to\n'
777 'be cloned without a safesync_url before adding the safesync_url.\n'
778 'For more info, see: '
779 'http://code.google.com/p/chromium/wiki/UsingNewGit'
780 '#Initial_checkout' ) % rev)
781 elif rev.isdigit() and len(rev) < 7:
782 # Handles an SVN rev. As an optimization, only verify an SVN revision as
783 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000784 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000785 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
786 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000787 try:
788 logging.debug('Looking for git-svn configuration optimizations.')
789 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
790 cwd=self.checkout_path):
dnj@chromium.org680f2172014-06-25 00:39:32 +0000791 self._Fetch(options)
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000792 except subprocess2.CalledProcessError:
793 logging.debug('git config --get svn-remote.svn.fetch failed, '
794 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000795 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000796 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000797 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000798 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000799 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
800 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000801 except gclient_utils.Error, e:
802 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000803 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000804 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
805 'the closest sane git revision, which is:\n'
806 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000807 if not sha1:
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000808 raise NoUsableRevError(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000809 ( 'It appears that either your git-svn remote is incorrectly\n'
810 'configured or the revision in your safesync_url is\n'
811 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
812 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000813 else:
814 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
815 sha1 = rev
816 else:
817 # May exist in origin, but we don't have it yet, so fetch and look
818 # again.
dnj@chromium.org680f2172014-06-25 00:39:32 +0000819 self._Fetch(options)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000820 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
821 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000822
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000823 if not sha1:
tandrii@chromium.orgef141922015-08-12 17:36:27 +0000824 raise NoUsableRevError(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000825 ( 'We could not find a valid hash for safesync_url response "%s".\n'
826 'Safesync URLs with a git checkout currently require a git-svn\n'
827 'remote or a safesync_url that provides git sha1s. Please add a\n'
828 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000829 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000830 '#Initial_checkout' ) % rev)
831
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000832 return sha1
833
msb@chromium.orge6f78352010-01-13 17:05:33 +0000834 def FullUrlForRelativeUrl(self, url):
835 # Strip from last '/'
836 # Equivalent to unix basename
837 base_url = self.url
838 return base_url[:base_url.rfind('/')] + url
839
primiano@chromium.org1c127382015-02-17 11:15:40 +0000840 def GetGitBackupDirPath(self):
841 """Returns the path where the .git folder for the current project can be
842 staged/restored. Use case: subproject moved from DEPS <-> outer project."""
843 return os.path.join(self._root_dir,
844 'old_' + self.relpath.replace(os.sep, '_')) + '.git'
845
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000846 def _GetMirror(self, url, options):
847 """Get a git_cache.Mirror object for the argument url."""
848 if not git_cache.Mirror.GetCachePath():
849 return None
hinoka@google.comb1b54572014-04-16 22:29:23 +0000850 mirror_kwargs = {
851 'print_func': self.filter,
852 'refs': []
853 }
hinoka@google.comb1b54572014-04-16 22:29:23 +0000854 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
855 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org8d3348f2014-08-19 22:49:16 +0000856 if hasattr(options, 'with_tags') and options.with_tags:
857 mirror_kwargs['refs'].append('refs/tags/*')
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000858 return git_cache.Mirror(url, **mirror_kwargs)
859
860 @staticmethod
861 def _UpdateMirror(mirror, options):
862 """Update a git mirror by fetching the latest commits from the remote."""
szager@chromium.org3ec84f62014-08-22 21:00:22 +0000863 if getattr(options, 'shallow', False):
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000864 # HACK(hinoka): These repositories should be super shallow.
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000865 if 'flash' in mirror.url:
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000866 depth = 10
867 else:
868 depth = 10000
869 else:
870 depth = None
e.hakkinen@samsung.come8bc1aa2015-04-08 08:00:37 +0000871 mirror.populate(verbose=options.verbose,
872 bootstrap=not getattr(options, 'no_bootstrap', False),
873 depth=depth,
szager@chromium.orgdbb6f822016-02-02 22:59:30 +0000874 ignore_lock=getattr(options, 'ignore_locks', False),
875 lock_timeout=getattr(options, 'lock_timeout', 0))
szager@chromium.org848fd492014-04-09 19:06:44 +0000876 mirror.unlock()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000877
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000878 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000879 """Clone a git repository from the given URL.
880
msb@chromium.org786fb682010-06-02 15:16:23 +0000881 Once we've cloned the repo, we checkout a working branch if the specified
882 revision is a branch head. If it is a tag or a specific commit, then we
883 leave HEAD detached as it makes future updates simpler -- in this case the
884 user should first create a new branch or switch to an existing branch before
885 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000886 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000887 # git clone doesn't seem to insert a newline properly before printing
888 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000889 self.Print('')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000890 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.org8a139702014-06-20 15:55:01 +0000891 clone_cmd = cfg + ['clone', '--no-checkout', '--progress']
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000892 if self.cache_dir:
893 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000894 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000895 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000896 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000897 # If the parent directory does not exist, Git clone on Windows will not
898 # create it, so we need to do it manually.
899 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000900 gclient_utils.safe_makedirs(parent_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000901
902 template_dir = None
903 if hasattr(options, 'no_history') and options.no_history:
904 if gclient_utils.IsGitSha(revision):
905 # In the case of a subproject, the pinned sha is not necessarily the
906 # head of the remote branch (so we can't just use --depth=N). Instead,
907 # we tell git to fetch all the remote objects from SHA..HEAD by means of
908 # a template git dir which has a 'shallow' file pointing to the sha.
909 template_dir = tempfile.mkdtemp(
910 prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
911 dir=parent_dir)
912 self._Run(['init', '--bare', template_dir], options, cwd=self._root_dir)
913 with open(os.path.join(template_dir, 'shallow'), 'w') as template_file:
914 template_file.write(revision)
915 clone_cmd.append('--template=' + template_dir)
916 else:
917 # Otherwise, we're just interested in the HEAD. Just use --depth.
918 clone_cmd.append('--depth=1')
919
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000920 tmp_dir = tempfile.mkdtemp(
921 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
922 dir=parent_dir)
923 try:
924 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000925 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000926 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000927 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
928 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000929 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000930 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000931 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000932 finally:
933 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000934 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000935 gclient_utils.rmtree(tmp_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000936 if template_dir:
937 gclient_utils.rmtree(template_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000938 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000939 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
940 self._Checkout(options, ''.join(remote_ref or revision), quiet=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000941 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000942 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000943 self.Print(
smut@google.comd33eab32014-07-07 19:35:18 +0000944 ('Checked out %s to a detached HEAD. Before making any commits\n'
945 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
946 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
947 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000948
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000949 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000950 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000951 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000952 raise gclient_utils.Error("Background task requires input. Rerun "
953 "gclient with --jobs=1 so that\n"
954 "interaction is possible.")
955 try:
956 return raw_input(prompt)
957 except KeyboardInterrupt:
958 # Hide the exception.
959 sys.exit(1)
960
961
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000962 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000963 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000964 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000965 if files is not None:
966 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000967 revision = upstream
968 if newbase:
969 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000970 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000971 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000972 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000973 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000974 printed_path = True
975 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000976 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000977
978 if merge:
979 merge_output = self._Capture(['merge', revision])
980 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000981 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000982 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000983
984 # Build the rebase command here using the args
985 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
986 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000987 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000988 rebase_cmd.append('--verbose')
989 if newbase:
990 rebase_cmd.extend(['--onto', newbase])
991 rebase_cmd.append(upstream)
992 if branch:
993 rebase_cmd.append(branch)
994
995 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000996 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000997 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000998 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
999 re.match(r'cannot rebase: your index contains uncommitted changes',
1000 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001001 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +00001002 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +00001003 'Cannot rebase because of unstaged changes.\n'
1004 '\'git reset --hard HEAD\' ?\n'
1005 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +00001006 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001007 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +00001008 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001009 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001010 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001011 break
1012 elif re.match(r'quit|q', rebase_action, re.I):
1013 raise gclient_utils.Error("Please merge or rebase manually\n"
1014 "cd %s && git " % self.checkout_path
1015 + "%s" % ' '.join(rebase_cmd))
1016 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001017 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001018 continue
1019 else:
1020 gclient_utils.Error("Input not recognized")
1021 continue
1022 elif re.search(r'^CONFLICT', e.stdout, re.M):
1023 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
1024 "Fix the conflict and run gclient again.\n"
1025 "See 'man git-rebase' for details.\n")
1026 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001027 self.Print(e.stdout.strip())
1028 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001029 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
1030 "manually.\ncd %s && git " %
1031 self.checkout_path
1032 + "%s" % ' '.join(rebase_cmd))
1033
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001034 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001035 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001036 # Make the output a little prettier. It's nice to have some
1037 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001038 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +00001039
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001040 @staticmethod
1041 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +00001042 (ok, current_version) = scm.GIT.AssertVersion(min_version)
1043 if not ok:
1044 raise gclient_utils.Error('git version %s < minimum required %s' %
1045 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +00001046
tandrii@chromium.orgc438c142015-08-24 22:55:55 +00001047 def _EnsureValidHeadObjectOrCheckout(self, revision, options, url):
1048 # Special case handling if all 3 conditions are met:
1049 # * the mirros have recently changed, but deps destination remains same,
1050 # * the git histories of mirrors are conflicting.
1051 # * git cache is used
1052 # This manifests itself in current checkout having invalid HEAD commit on
1053 # most git operations. Since git cache is used, just deleted the .git
1054 # folder, and re-create it by cloning.
1055 try:
1056 self._Capture(['rev-list', '-n', '1', 'HEAD'])
1057 except subprocess2.CalledProcessError as e:
1058 if ('fatal: bad object HEAD' in e.stderr
1059 and self.cache_dir and self.cache_dir in url):
1060 self.Print((
1061 'Likely due to DEPS change with git cache_dir, '
1062 'the current commit points to no longer existing object.\n'
1063 '%s' % e)
1064 )
1065 self._DeleteOrMove(options.force)
1066 self._Clone(revision, url, options)
1067 else:
1068 raise
1069
msb@chromium.org786fb682010-06-02 15:16:23 +00001070 def _IsRebasing(self):
1071 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
1072 # have a plumbing command to determine whether a rebase is in progress, so
1073 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
1074 g = os.path.join(self.checkout_path, '.git')
1075 return (
1076 os.path.isdir(os.path.join(g, "rebase-merge")) or
1077 os.path.isdir(os.path.join(g, "rebase-apply")))
1078
1079 def _CheckClean(self, rev_str):
iannucci@chromium.orgd9b318c2015-12-04 20:03:08 +00001080 lockfile = os.path.join(self.checkout_path, ".git", "index.lock")
1081 if os.path.exists(lockfile):
1082 raise gclient_utils.Error(
1083 '\n____ %s%s\n'
1084 '\tYour repo is locked, possibly due to a concurrent git process.\n'
1085 '\tIf no git executable is running, then clean up %r and try again.\n'
1086 % (self.relpath, rev_str, lockfile))
1087
msb@chromium.org786fb682010-06-02 15:16:23 +00001088 # Make sure the tree is clean; see git-rebase.sh for reference
1089 try:
1090 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001091 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001092 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001093 raise gclient_utils.Error('\n____ %s%s\n'
1094 '\tYou have unstaged changes.\n'
1095 '\tPlease commit, stash, or reset.\n'
1096 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001097 try:
1098 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
smut@google.com27c9c8a2014-09-11 19:57:55 +00001099 '--ignore-submodules', 'HEAD', '--'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001100 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001101 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001102 raise gclient_utils.Error('\n____ %s%s\n'
1103 '\tYour index contains uncommitted changes\n'
1104 '\tPlease commit, stash, or reset.\n'
1105 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001106
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001107 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +00001108 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1109 # reference by a commit). If not, error out -- most likely a rebase is
1110 # in progress, try to detect so we can give a better error.
1111 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001112 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1113 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001114 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001115 # Commit is not contained by any rev. See if the user is rebasing:
1116 if self._IsRebasing():
1117 # Punt to the user
1118 raise gclient_utils.Error('\n____ %s%s\n'
1119 '\tAlready in a conflict, i.e. (no branch).\n'
1120 '\tFix the conflict and run gclient again.\n'
1121 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1122 '\tSee man git-rebase for details.\n'
1123 % (self.relpath, rev_str))
1124 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001125 name = ('saved-by-gclient-' +
1126 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001127 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001128 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001129 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001130
msb@chromium.org5bde4852009-12-14 16:47:12 +00001131 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001132 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001133 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001134 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001135 return None
1136 return branch
1137
borenet@google.comc3e09d22014-04-10 13:58:18 +00001138 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001139 kwargs.setdefault('cwd', self.checkout_path)
1140 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001141 env = scm.GIT.ApplyEnvVars(kwargs)
1142 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001143
dnj@chromium.orgbb424c02014-06-23 22:42:51 +00001144 def _Checkout(self, options, ref, force=False, quiet=None):
1145 """Performs a 'git-checkout' operation.
1146
1147 Args:
1148 options: The configured option set
1149 ref: (str) The branch/commit to checkout
1150 quiet: (bool/None) Whether or not the checkout shoud pass '--quiet'; if
1151 'None', the behavior is inferred from 'options.verbose'.
1152 Returns: (str) The output of the checkout operation
1153 """
1154 if quiet is None:
1155 quiet = (not options.verbose)
1156 checkout_args = ['checkout']
1157 if force:
1158 checkout_args.append('--force')
1159 if quiet:
1160 checkout_args.append('--quiet')
1161 checkout_args.append(ref)
1162 return self._Capture(checkout_args)
1163
dnj@chromium.org680f2172014-06-25 00:39:32 +00001164 def _Fetch(self, options, remote=None, prune=False, quiet=False):
1165 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
1166 fetch_cmd = cfg + [
1167 'fetch',
1168 remote or self.remote,
1169 ]
1170
1171 if prune:
1172 fetch_cmd.append('--prune')
1173 if options.verbose:
1174 fetch_cmd.append('--verbose')
1175 elif quiet:
1176 fetch_cmd.append('--quiet')
1177 self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
1178
1179 # Return the revision that was fetched; this will be stored in 'FETCH_HEAD'
1180 return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])
1181
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001182 def _UpdateBranchHeads(self, options, fetch=False):
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001183 """Adds, and optionally fetches, "branch-heads" and "tags" refspecs
1184 if requested."""
1185 need_fetch = fetch
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001186 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001187 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001188 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1189 '^\\+refs/branch-heads/\\*:.*$']
1190 self._Run(config_cmd, options)
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001191 need_fetch = True
1192 if hasattr(options, 'with_tags') and options.with_tags:
1193 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
1194 '+refs/tags/*:refs/tags/*',
1195 '^\\+refs/tags/\\*:.*$']
1196 self._Run(config_cmd, options)
1197 need_fetch = True
1198 if fetch and need_fetch:
1199 self._Fetch(options)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001200
dnj@chromium.org680f2172014-06-25 00:39:32 +00001201 def _Run(self, args, options, show_header=True, **kwargs):
1202 # Disable 'unused options' warning | pylint: disable=W0613
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001203 kwargs.setdefault('cwd', self.checkout_path)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001204 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001205 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001206 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001207 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001208 cmd = ['git'] + args
dnj@chromium.org680f2172014-06-25 00:39:32 +00001209 if show_header:
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001210 gclient_utils.CheckCallAndFilterAndHeader(cmd, env=env, **kwargs)
1211 else:
1212 gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001213
1214
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001215class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001216 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001217 name = 'svn'
maruel@chromium.org79d62372015-06-01 18:50:55 +00001218 _PRINTED_DEPRECATION = False
1219
1220 _MESSAGE = (
1221 'Oh hai! You are using subversion. Chrome infra is eager to get rid of',
1222 'svn support so please switch to git.',
1223 'Tracking bug: http://crbug.com/475320',
iannucci@chromium.org9e18dee2015-07-28 07:22:21 +00001224 'If you are a project owner, you may request git migration assistance at: ',
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001225 ' https://code.google.com/p/chromium/issues/entry?template=Infra-Git')
maruel@chromium.org79d62372015-06-01 18:50:55 +00001226
1227 def __init__(self, *args, **kwargs):
1228 super(SVNWrapper, self).__init__(*args, **kwargs)
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001229 suppress_deprecated_notice = os.environ.get(
1230 'SUPPRESS_DEPRECATED_SVN_NOTICE', False)
1231 if not SVNWrapper._PRINTED_DEPRECATION and not suppress_deprecated_notice:
maruel@chromium.org79d62372015-06-01 18:50:55 +00001232 SVNWrapper._PRINTED_DEPRECATION = True
1233 sys.stderr.write('\n'.join(self._MESSAGE) + '\n')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001234
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001235 @staticmethod
1236 def BinaryExists():
1237 """Returns true if the command exists."""
1238 try:
1239 result, version = scm.SVN.AssertVersion('1.4')
1240 if not result:
1241 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1242 return result
1243 except OSError:
1244 return False
1245
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001246 def GetCheckoutRoot(self):
1247 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1248
floitsch@google.comeaab7842011-04-28 09:07:58 +00001249 def GetRevisionDate(self, revision):
1250 """Returns the given revision's date in ISO-8601 format (which contains the
1251 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001252 date = scm.SVN.Capture(
1253 ['propget', '--revprop', 'svn:date', '-r', revision],
1254 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001255 return date.strip()
1256
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001257 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001258 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001259 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001260
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001261 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001262 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001263 if not os.path.isdir(self.checkout_path):
1264 raise gclient_utils.Error('Directory %s is not present.' %
1265 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001266 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001267
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001268 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001269 """Generates a patch file which can be applied to the root of the
1270 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001271 if not os.path.isdir(self.checkout_path):
1272 raise gclient_utils.Error('Directory %s is not present.' %
1273 self.checkout_path)
1274 gclient_utils.CheckCallAndFilter(
1275 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1276 cwd=self.checkout_path,
1277 print_stdout=False,
avakulenko@google.com255f2be2014-12-05 22:19:55 +00001278 filter_fn=SvnDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001279
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001280 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001281 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001282
1283 All updated files will be appended to file_list.
1284
1285 Raises:
1286 Error: if can't get URL for relative path.
1287 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001288 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001289 hg_path = os.path.join(self.checkout_path, '.hg')
1290 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001291 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001292 return
1293
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001294 if args:
1295 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1296
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001297 # revision is the revision to match. It is None if no revision is specified,
1298 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001299 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001300 # Keep the original unpinned url for reference in case the repo is switched.
1301 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001302 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001303 if options.revision:
1304 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001305 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001306 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001307 if revision != 'unmanaged':
1308 forced_revision = True
1309 # Reconstruct the url.
1310 url = '%s@%s' % (url, revision)
1311 rev_str = ' at %s' % revision
1312 else:
1313 managed = False
1314 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001315 else:
1316 forced_revision = False
1317 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001318
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001319 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001320 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001321 # Git is only okay if it's a git-svn checkout of the right repo.
1322 if scm.GIT.IsGitSvn(self.checkout_path):
1323 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1324 'svn-remote.svn.url'],
1325 cwd=self.checkout_path).rstrip()
1326 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001327 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1328 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001329 return # TODO(borenet): Get the svn revision number?
1330
1331 # Get the existing scm url and the revision number of the current checkout.
1332 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001333 try:
1334 from_info = scm.SVN.CaptureLocalInfo(
1335 [], os.path.join(self.checkout_path, '.'))
1336 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001337 self._DeleteOrMove(options.force)
1338 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001339
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001340 BASE_URLS = {
1341 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1342 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1343 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001344 WHITELISTED_ROOTS = [
1345 'svn://svn.chromium.org',
1346 'svn://svn-mirror.golo.chromium.org',
1347 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001348 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001349 try:
1350 # Split out the revision number since it's not useful for us.
1351 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001352 # Check to see if we're on a whitelisted root. We do this because
1353 # only some svn servers have matching UUIDs.
1354 local_parsed = urlparse.urlparse(url)
1355 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001356 if ('CHROME_HEADLESS' in os.environ
1357 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001358 and base_path in BASE_URLS
1359 and local_root in WHITELISTED_ROOTS):
1360
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001361 # Use a tarball for initial sync if we are on a bot.
1362 # Get an unauthenticated gsutil instance.
1363 gsutil = download_from_google_storage.Gsutil(
1364 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1365
1366 gs_path = BASE_URLS[base_path]
1367 _, out, _ = gsutil.check_call('ls', gs_path)
1368 # So that we can get the most recent revision.
1369 sorted_items = sorted(out.splitlines())
1370 latest_checkout = sorted_items[-1]
1371
1372 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001373 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001374 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1375 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001376 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001377 raise Exception()
1378 filename = latest_checkout.split('/')[-1]
1379 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001380 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001381 gclient_utils.safe_makedirs(self.checkout_path)
1382 # TODO(hinoka): Use 7z for windows.
1383 cmd = ['tar', '--extract', '--ungzip',
1384 '--directory', self.checkout_path,
1385 '--file', tarball]
1386 gclient_utils.CheckCallAndFilter(
1387 cmd, stdout=sys.stdout, print_stdout=True)
1388
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001389 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001390 gclient_utils.rmtree(tempdir)
1391
1392 # Rewrite the repository root to match.
1393 tarball_url = scm.SVN.CaptureLocalInfo(
1394 ['.'], self.checkout_path)['Repository Root']
1395 tarball_parsed = urlparse.urlparse(tarball_url)
1396 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1397 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001398
1399 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001400 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001401 self._Run(['switch', '--relocate', tarball_root,
1402 local_root, self.checkout_path],
1403 options)
1404 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001405 self.Print('We tried to get a source tarball but failed.')
1406 self.Print('Resuming normal operations.')
1407 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001408
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001409 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001410 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001411 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001412 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001413 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001414 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001415
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001416 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001417 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001418 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1419 return self.Svnversion()
1420 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001421
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001422 if 'URL' not in from_info:
1423 raise gclient_utils.Error(
1424 ('gclient is confused. Couldn\'t get the url for %s.\n'
1425 'Try using @unmanaged.\n%s') % (
1426 self.checkout_path, from_info))
1427
stip@chromium.org3031d732014-04-21 22:18:02 +00001428 # Look for locked directories.
1429 dir_info = scm.SVN.CaptureStatus(
1430 None, os.path.join(self.checkout_path, '.'))
1431 if any(d[0][2] == 'L' for d in dir_info):
1432 try:
1433 self._Run(['cleanup', self.checkout_path], options)
1434 except subprocess2.CalledProcessError, e:
1435 # Get the status again, svn cleanup may have cleaned up at least
1436 # something.
1437 dir_info = scm.SVN.CaptureStatus(
1438 None, os.path.join(self.checkout_path, '.'))
1439
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001440 # Try to fix the failures by removing troublesome files.
1441 for d in dir_info:
1442 if d[0][2] == 'L':
1443 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001444 # We don't pass any files/directories to CaptureStatus and set
1445 # cwd=self.checkout_path, so we should get relative paths here.
1446 assert not os.path.isabs(d[1])
1447 path_to_remove = os.path.normpath(
1448 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001449 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001450 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001451 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001452 self.Print(
1453 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001454 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001455 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001456 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001457
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001458 # Retrieve the current HEAD version because svn is slow at null updates.
1459 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001460 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001461 revision = str(from_info_live['Revision'])
1462 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001463
borenet@google.comb09097a2014-04-09 19:09:08 +00001464 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001465 # The repository url changed, need to switch.
1466 try:
1467 to_info = scm.SVN.CaptureRemoteInfo(url)
1468 except (gclient_utils.Error, subprocess2.CalledProcessError):
1469 # The url is invalid or the server is not accessible, it's safer to bail
1470 # out right now.
1471 raise gclient_utils.Error('This url is unreachable: %s' % url)
1472 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1473 and (from_info['UUID'] == to_info['UUID']))
1474 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001475 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001476 # We have different roots, so check if we can switch --relocate.
1477 # Subversion only permits this if the repository UUIDs match.
1478 # Perform the switch --relocate, then rewrite the from_url
1479 # to reflect where we "are now." (This is the same way that
1480 # Subversion itself handles the metadata when switch --relocate
1481 # is used.) This makes the checks below for whether we
1482 # can update to a revision or have to switch to a different
1483 # branch work as expected.
1484 # TODO(maruel): TEST ME !
1485 command = ['switch', '--relocate',
1486 from_info['Repository Root'],
1487 to_info['Repository Root'],
1488 self.relpath]
1489 self._Run(command, options, cwd=self._root_dir)
1490 from_info['URL'] = from_info['URL'].replace(
1491 from_info['Repository Root'],
1492 to_info['Repository Root'])
1493 else:
1494 if not options.force and not options.reset:
1495 # Look for local modifications but ignore unversioned files.
1496 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1497 if status[0][0] != '?':
1498 raise gclient_utils.Error(
1499 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1500 'there is local changes in %s. Delete the directory and '
1501 'try again.') % (url, self.checkout_path))
1502 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001503 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001504 gclient_utils.rmtree(self.checkout_path)
1505 # We need to checkout.
1506 command = ['checkout', url, self.checkout_path]
1507 command = self._AddAdditionalUpdateFlags(command, options, revision)
1508 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1509 return self.Svnversion()
1510
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001511 # If the provided url has a revision number that matches the revision
1512 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001513 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001514 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001515 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001516 else:
1517 command = ['update', self.checkout_path]
1518 command = self._AddAdditionalUpdateFlags(command, options, revision)
1519 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001520
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001521 # If --reset and --delete_unversioned_trees are specified, remove any
1522 # untracked files and directories.
1523 if options.reset and options.delete_unversioned_trees:
1524 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1525 full_path = os.path.join(self.checkout_path, status[1])
1526 if (status[0][0] == '?'
1527 and os.path.isdir(full_path)
1528 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001529 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001530 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001531 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001532
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001533 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001534 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001535 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001536 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001537 # Create an empty checkout and then update the one file we want. Future
1538 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001539 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001540 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001541 if os.path.exists(os.path.join(self.checkout_path, filename)):
1542 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001543 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001544 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001545 # After the initial checkout, we can use update as if it were any other
1546 # dep.
1547 self.update(options, args, file_list)
1548 else:
1549 # If the installed version of SVN doesn't support --depth, fallback to
1550 # just exporting the file. This has the downside that revision
1551 # information is not stored next to the file, so we will have to
1552 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001553 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001554 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001555 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001556 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001557 command = self._AddAdditionalUpdateFlags(command, options,
1558 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001559 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001560
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001561 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001562 """Reverts local modifications. Subversion specific.
1563
1564 All reverted files will be appended to file_list, even if Subversion
1565 doesn't know about them.
1566 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001567 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001568 if os.path.exists(self.checkout_path):
1569 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001570 # svn revert won't work if the directory doesn't exist. It needs to
1571 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001572 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001573 # Don't reuse the args.
1574 return self.update(options, [], file_list)
1575
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001576 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001577 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001578 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001579 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001580 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001581 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001582 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001583 if not options.force:
1584 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001585 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001586 '\n_____ %s is not a valid svn checkout, synching instead' %
1587 self.relpath)
1588 gclient_utils.rmtree(self.checkout_path)
1589 # Don't reuse the args.
1590 return self.update(options, [], file_list)
1591
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001592 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001593 if file_list is not None:
1594 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001595 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001596 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001597 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001598 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001599 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001600
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001601 # Revert() may delete the directory altogether.
1602 if not os.path.isdir(self.checkout_path):
1603 # Don't reuse the args.
1604 return self.update(options, [], file_list)
1605
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001606 try:
1607 # svn revert is so broken we don't even use it. Using
1608 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001609 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001610 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1611 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001612 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001613 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001614 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001615
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001616 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001617 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001618 try:
1619 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001620 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001621 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001622
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001623 def runhooks(self, options, args, file_list):
1624 self.status(options, args, file_list)
1625
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001626 def status(self, options, args, file_list):
1627 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001628 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001629 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001630 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001631 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001632 'The directory does not exist.') %
1633 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001634 # There's no file list to retrieve.
1635 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001636 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001637
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001638 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001639 """Verifies the validity of the revision for this repository."""
1640 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
tandrii@chromium.orgef141922015-08-12 17:36:27 +00001641 raise NoUsableRevError(
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001642 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1643 'correct.') % rev)
1644 return rev
1645
msb@chromium.orge6f78352010-01-13 17:05:33 +00001646 def FullUrlForRelativeUrl(self, url):
1647 # Find the forth '/' and strip from there. A bit hackish.
1648 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001649
maruel@chromium.org669600d2010-09-01 19:06:31 +00001650 def _Run(self, args, options, **kwargs):
1651 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001652 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001653 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001654 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001655
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001656 def Svnversion(self):
1657 """Runs the lowest checked out revision in the current project."""
1658 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1659 return info['Revision']
1660
maruel@chromium.org669600d2010-09-01 19:06:31 +00001661 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1662 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001663 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001664 scm.SVN.RunAndGetFileList(
1665 options.verbose,
1666 args + ['--ignore-externals'],
1667 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001668 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001669
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001670 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001671 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001672 """Add additional flags to command depending on what options are set.
1673 command should be a list of strings that represents an svn command.
1674
1675 This method returns a new list to be used as a command."""
1676 new_command = command[:]
1677 if revision:
1678 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001679 # We don't want interaction when jobs are used.
1680 if options.jobs > 1:
1681 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001682 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001683 # --accept was added to 'svn update' in svn 1.6.
1684 if not scm.SVN.AssertVersion('1.5')[0]:
1685 return new_command
1686
1687 # It's annoying to have it block in the middle of a sync, just sensible
1688 # defaults.
1689 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001690 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001691 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1692 new_command.extend(('--accept', 'theirs-conflict'))
1693 elif options.manually_grab_svn_rev:
1694 new_command.append('--force')
1695 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1696 new_command.extend(('--accept', 'postpone'))
1697 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1698 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001699 return new_command