blob: c577f7ca98ed78e4857c4348733dc8a3ee3b2ceb [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
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000033class DiffFiltererWrapper(object):
34 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000035 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000036 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000037 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000038 original_prefix = "--- "
39 working_prefix = "+++ "
40
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000041 def __init__(self, relpath, print_func):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000042 # Note that we always use '/' as the path separator to be
43 # consistent with svn's cygwin-style output on Windows
44 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000045 self._current_file = None
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000046 self._print_func = print_func
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000047
maruel@chromium.org6e29d572010-06-04 17:32:20 +000048 def SetCurrentFile(self, current_file):
49 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000050
iannucci@chromium.org3830a672013-02-19 20:15:14 +000051 @property
52 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000053 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000054
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000055 def _Replace(self, line):
56 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000057
58 def Filter(self, line):
59 if (line.startswith(self.index_string)):
60 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000061 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000062 else:
63 if (line.startswith(self.original_prefix) or
64 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000065 line = self._Replace(line)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000066 self._print_func(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000067
68
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000069class SvnDiffFilterer(DiffFiltererWrapper):
70 index_string = "Index: "
71
72
73class GitDiffFilterer(DiffFiltererWrapper):
74 index_string = "diff --git "
75
76 def SetCurrentFile(self, current_file):
77 # Get filename by parsing "a/<filename> b/<filename>"
78 self._current_file = current_file[:(len(current_file)/2)][2:]
79
80 def _Replace(self, line):
81 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
82
83
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000084### SCM abstraction layer
85
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000086# Factory Method for SCM wrapper creation
87
maruel@chromium.org9eda4112010-06-11 18:56:10 +000088def GetScmName(url):
89 if url:
90 url, _ = gclient_utils.SplitUrlRevision(url)
91 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000092 url.startswith('git+http://') or url.startswith('git+https://') or
borenet@google.coma2aec972014-04-22 21:35:15 +000093 url.endswith('.git') or url.startswith('sso://') or
94 'googlesource' in url):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000095 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000096 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000097 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000098 return 'svn'
agable@chromium.org44ae4fb2014-10-23 08:28:30 +000099 elif url.startswith('file://'):
100 if url.endswith('.git'):
101 return 'git'
102 return 'svn'
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000103 return None
104
105
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000106def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000107 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000108 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000109 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000110 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000111
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000112 scm_name = GetScmName(url)
113 if not scm_name in SCM_MAP:
114 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000115 scm_class = SCM_MAP[scm_name]
116 if not scm_class.BinaryExists():
117 raise gclient_utils.Error('%s command not found' % scm_name)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000118 return scm_class(url, root_dir, relpath, out_fh, out_cb)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000119
120
121# SCMWrapper base class
122
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000123class SCMWrapper(object):
124 """Add necessary glue between all the supported SCM.
125
msb@chromium.orgd6504212010-01-13 17:34:31 +0000126 This is the abstraction layer to bind to different SCM.
127 """
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000128
129 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
130 out_cb=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000131 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000132 self._root_dir = root_dir
133 if self._root_dir:
134 self._root_dir = self._root_dir.replace('/', os.sep)
135 self.relpath = relpath
136 if self.relpath:
137 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000138 if self.relpath and self._root_dir:
139 self.checkout_path = os.path.join(self._root_dir, self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000140 if out_fh is None:
141 out_fh = sys.stdout
142 self.out_fh = out_fh
143 self.out_cb = out_cb
144
145 def Print(self, *args, **kwargs):
146 kwargs.setdefault('file', self.out_fh)
147 if kwargs.pop('timestamp', True):
148 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
149 print(*args, **kwargs)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000150
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000151 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000152 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000153 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000154
155 if not command in commands:
156 raise gclient_utils.Error('Unknown command %s' % command)
157
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000158 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000159 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000160 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000161
162 return getattr(self, command)(options, args, file_list)
163
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000164 @staticmethod
165 def _get_first_remote_url(checkout_path):
166 log = scm.GIT.Capture(
167 ['config', '--local', '--get-regexp', r'remote.*.url'],
168 cwd=checkout_path)
169 # Get the second token of the first line of the log.
170 return log.splitlines()[0].split(' ', 1)[1]
171
levarum@chromium.org27a6f9a2016-05-28 00:21:49 +0000172 def GetCacheMirror(self):
173 if (getattr(self, 'cache_dir', None)):
174 url, _ = gclient_utils.SplitUrlRevision(self.url)
175 return git_cache.Mirror(url)
176 return None
177
smut@google.comd33eab32014-07-07 19:35:18 +0000178 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000179 """Attempt to determine the remote URL for this SCMWrapper."""
smut@google.comd33eab32014-07-07 19:35:18 +0000180 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000181 if os.path.exists(os.path.join(self.checkout_path, '.git')):
hinoka@chromium.orgfa2b9b42014-08-22 18:08:53 +0000182 actual_remote_url = self._get_first_remote_url(self.checkout_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000183
levarum@chromium.org27a6f9a2016-05-28 00:21:49 +0000184 mirror = self.GetCacheMirror()
185 # If the cache is used, obtain the actual remote URL from there.
186 if (mirror and mirror.exists() and
187 mirror.mirror_path.replace('\\', '/') ==
188 actual_remote_url.replace('\\', '/')):
189 actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
borenet@google.com4e9be262014-04-08 19:40:30 +0000190 return actual_remote_url
191
192 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000193 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000194 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000195 return None
196
borenet@google.com4e9be262014-04-08 19:40:30 +0000197 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000198 """Determine whether the remote URL of this checkout is the expected URL."""
199 if not os.path.exists(self.checkout_path):
200 # A checkout which doesn't exist can't be broken.
201 return True
202
smut@google.comd33eab32014-07-07 19:35:18 +0000203 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000204 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000205 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
206 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000207 else:
208 # This may occur if the self.checkout_path exists but does not contain a
209 # valid git or svn checkout.
210 return False
211
borenet@google.comb09097a2014-04-09 19:09:08 +0000212 def _DeleteOrMove(self, force):
213 """Delete the checkout directory or move it out of the way.
214
215 Args:
216 force: bool; if True, delete the directory. Otherwise, just move it.
217 """
borenet@google.comb2256212014-05-07 20:57:28 +0000218 if force and os.environ.get('CHROME_HEADLESS') == '1':
219 self.Print('_____ Conflicting directory found in %s. Removing.'
220 % self.checkout_path)
221 gclient_utils.AddWarning('Conflicting directory %s deleted.'
222 % self.checkout_path)
223 gclient_utils.rmtree(self.checkout_path)
224 else:
225 bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
226 os.path.dirname(self.relpath))
227
228 try:
229 os.makedirs(bad_scm_dir)
230 except OSError as e:
231 if e.errno != errno.EEXIST:
232 raise
233
234 dest_path = tempfile.mkdtemp(
235 prefix=os.path.basename(self.relpath),
236 dir=bad_scm_dir)
237 self.Print('_____ Conflicting directory found in %s. Moving to %s.'
238 % (self.checkout_path, dest_path))
239 gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
240 % (self.checkout_path, dest_path))
241 shutil.move(self.checkout_path, dest_path)
borenet@google.comb09097a2014-04-09 19:09:08 +0000242
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000243
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000244class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000245 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000246 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000247 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000248
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000249 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000250
szager@chromium.org848fd492014-04-09 19:06:44 +0000251 def __init__(self, url=None, *args):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000252 """Removes 'git+' fake prefix from git URL."""
253 if url.startswith('git+http://') or url.startswith('git+https://'):
254 url = url[4:]
szager@chromium.org848fd492014-04-09 19:06:44 +0000255 SCMWrapper.__init__(self, url, *args)
256 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
257 if self.out_cb:
258 filter_kwargs['predicate'] = self.out_cb
259 self.filter = gclient_utils.GitFilter(**filter_kwargs)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000260
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000261 @staticmethod
262 def BinaryExists():
263 """Returns true if the command exists."""
264 try:
265 # We assume git is newer than 1.7. See: crbug.com/114483
266 result, version = scm.GIT.AssertVersion('1.7')
267 if not result:
268 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
269 return result
270 except OSError:
271 return False
272
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000273 def GetCheckoutRoot(self):
274 return scm.GIT.GetCheckoutRoot(self.checkout_path)
275
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000276 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000277 """Returns the given revision's date in ISO-8601 format (which contains the
278 time zone)."""
279 # TODO(floitsch): get the time-stamp of the given revision and not just the
280 # time-stamp of the currently checked out revision.
281 return self._Capture(['log', '-n', '1', '--format=%ai'])
282
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000283 @staticmethod
284 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000285 """'Cleanup' the repo.
286
287 There's no real git equivalent for the svn cleanup command, do a no-op.
288 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000289
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000290 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000291 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000292 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000293
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000294 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000295 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000296 repository.
297
298 The patch file is generated from a diff of the merge base of HEAD and
299 its upstream branch.
300 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000301 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000302 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000303 ['git', 'diff', merge_base],
304 cwd=self.checkout_path,
avakulenko@google.com255f2be2014-12-05 22:19:55 +0000305 filter_fn=GitDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000306
smut@google.comd33eab32014-07-07 19:35:18 +0000307 def _FetchAndReset(self, revision, file_list, options):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000308 """Equivalent to git fetch; git reset."""
309 quiet = []
310 if not options.verbose:
311 quiet = ['--quiet']
312 self._UpdateBranchHeads(options, fetch=False)
313
dnj@chromium.org680f2172014-06-25 00:39:32 +0000314 self._Fetch(options, prune=True, quiet=options.verbose)
smut@google.comd33eab32014-07-07 19:35:18 +0000315 self._Run(['reset', '--hard', revision] + quiet, options)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000316 if file_list is not None:
317 files = self._Capture(['ls-files']).splitlines()
318 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
319
szager@chromium.org8a139702014-06-20 15:55:01 +0000320 def _DisableHooks(self):
321 hook_dir = os.path.join(self.checkout_path, '.git', 'hooks')
322 if not os.path.isdir(hook_dir):
323 return
324 for f in os.listdir(hook_dir):
325 if not f.endswith('.sample') and not f.endswith('.disabled'):
primiano@chromium.org41265562015-04-08 09:14:46 +0000326 disabled_hook_path = os.path.join(hook_dir, f + '.disabled')
327 if os.path.exists(disabled_hook_path):
328 os.remove(disabled_hook_path)
329 os.rename(os.path.join(hook_dir, f), disabled_hook_path)
szager@chromium.org8a139702014-06-20 15:55:01 +0000330
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000331 def _maybe_break_locks(self, options):
332 """This removes all .lock files from this repo's .git directory, if the
333 user passed the --break_repo_locks command line flag.
334
335 In particular, this will cleanup index.lock files, as well as ref lock
336 files.
337 """
338 if options.break_repo_locks:
339 git_dir = os.path.join(self.checkout_path, '.git')
340 for path, _, filenames in os.walk(git_dir):
341 for filename in filenames:
342 if filename.endswith('.lock'):
343 to_break = os.path.join(path, filename)
344 self.Print('breaking lock: %s' % (to_break,))
345 try:
346 os.remove(to_break)
347 except OSError as ex:
348 self.Print('FAILED to break lock: %s: %s' % (to_break, ex))
349 raise
350
351
msb@chromium.orge28e4982009-09-25 20:51:45 +0000352 def update(self, options, args, file_list):
353 """Runs git to update or transparently checkout the working copy.
354
355 All updated files will be appended to file_list.
356
357 Raises:
358 Error: if can't get URL for relative path.
359 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000360 if args:
361 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
362
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000363 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000364
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000365 # If a dependency is not pinned, track the default remote branch.
smut@google.comd33eab32014-07-07 19:35:18 +0000366 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000367 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000368 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000369 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000370 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000371 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000372 # Override the revision number.
373 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000374 if revision == 'unmanaged':
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000375 # Check again for a revision in case an initial ref was specified
376 # in the url, for example bla.git@refs/heads/custombranch
377 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000378 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000379 if not revision:
380 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000381
szager@chromium.org8a139702014-06-20 15:55:01 +0000382 if managed:
383 self._DisableHooks()
384
floitsch@google.comeaab7842011-04-28 09:07:58 +0000385 if gclient_utils.IsDateRevision(revision):
386 # Date-revisions only work on git-repositories if the reflog hasn't
387 # expired yet. Use rev-list to get the corresponding revision.
388 # git rev-list -n 1 --before='time-stamp' branchname
389 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000390 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000391 revision = default_rev
392
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000393 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000394 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000395
396 printed_path = False
397 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000398 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000399 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000400 verbose = ['--verbose']
401 printed_path = True
402
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000403 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
404 if remote_ref:
smut@google.comd33eab32014-07-07 19:35:18 +0000405 # Rewrite remote refs to their local equivalents.
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000406 revision = ''.join(remote_ref)
407 rev_type = "branch"
408 elif revision.startswith('refs/'):
409 # Local branch? We probably don't want to support, since DEPS should
410 # always specify branches as they are in the upstream repo.
smut@google.comd33eab32014-07-07 19:35:18 +0000411 rev_type = "branch"
412 else:
413 # hash is also a tag, only make a distinction at checkout
414 rev_type = "hash"
415
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000416 mirror = self._GetMirror(url, options)
417 if mirror:
418 url = mirror.mirror_path
419
primiano@chromium.org1c127382015-02-17 11:15:40 +0000420 # If we are going to introduce a new project, there is a possibility that
421 # we are syncing back to a state where the project was originally a
422 # sub-project rolled by DEPS (realistic case: crossing the Blink merge point
423 # syncing backwards, when Blink was a DEPS entry and not part of src.git).
424 # In such case, we might have a backup of the former .git folder, which can
425 # be used to avoid re-fetching the entire repo again (useful for bisects).
426 backup_dir = self.GetGitBackupDirPath()
427 target_dir = os.path.join(self.checkout_path, '.git')
428 if os.path.exists(backup_dir) and not os.path.exists(target_dir):
429 gclient_utils.safe_makedirs(self.checkout_path)
430 os.rename(backup_dir, target_dir)
431 # Reset to a clean state
432 self._Run(['reset', '--hard', 'HEAD'], options)
433
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000434 if (not os.path.exists(self.checkout_path) or
435 (os.path.isdir(self.checkout_path) and
436 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000437 if mirror:
438 self._UpdateMirror(mirror, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000439 try:
smut@google.comd33eab32014-07-07 19:35:18 +0000440 self._Clone(revision, url, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000441 except subprocess2.CalledProcessError:
442 self._DeleteOrMove(options.force)
smut@google.comd33eab32014-07-07 19:35:18 +0000443 self._Clone(revision, url, options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000444 if file_list is not None:
445 files = self._Capture(['ls-files']).splitlines()
446 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000447 if not verbose:
448 # Make the output a little prettier. It's nice to have some whitespace
449 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000450 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000451 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000452
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000453 if not managed:
454 self._UpdateBranchHeads(options, fetch=False)
455 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
456 return self._Capture(['rev-parse', '--verify', 'HEAD'])
457
iannucci@chromium.org30a07982016-04-07 21:35:19 +0000458 self._maybe_break_locks(options)
459
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000460 if mirror:
461 self._UpdateMirror(mirror, options)
462
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000463 # See if the url has changed (the unittests use git://foo for the url, let
464 # that through).
465 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
466 return_early = False
467 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
468 # unit test pass. (and update the comment above)
469 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
470 # This allows devs to use experimental repos which have a different url
471 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000472 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000473 url != 'git://foo' and
474 subprocess2.capture(
475 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
476 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000477 self.Print('_____ switching %s to a new upstream' % self.relpath)
iannucci@chromium.org78514212014-08-20 23:08:00 +0000478 if not (options.force or options.reset):
479 # Make sure it's clean
480 self._CheckClean(rev_str)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000481 # Switch over to the new upstream
482 self._Run(['remote', 'set-url', self.remote, url], options)
szager@chromium.org8dd35462015-06-08 22:56:05 +0000483 if mirror:
484 with open(os.path.join(
485 self.checkout_path, '.git', 'objects', 'info', 'alternates'),
486 'w') as fh:
487 fh.write(os.path.join(url, 'objects'))
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000488 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
smut@google.comd33eab32014-07-07 19:35:18 +0000489 self._FetchAndReset(revision, file_list, options)
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000490
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000491 return_early = True
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000492 else:
493 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000494
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000495 if return_early:
496 return self._Capture(['rev-parse', '--verify', 'HEAD'])
497
msb@chromium.org5bde4852009-12-14 16:47:12 +0000498 cur_branch = self._GetCurrentBranch()
499
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000500 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000501 # 0) HEAD is detached. Probably from our initial clone.
502 # - make sure HEAD is contained by a named ref, then update.
503 # Cases 1-4. HEAD is a branch.
504 # 1) current branch is not tracking a remote branch (could be git-svn)
505 # - try to rebase onto the new hash or branch
506 # 2) current branch is tracking a remote branch with local committed
507 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000508 # - rebase those changes on top of the hash
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000509 # 3) current branch is tracking a remote branch w/or w/out changes, and
510 # no DEPS switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000511 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000512 # 4) current branch is tracking a remote branch, but DEPS switches to a
513 # different remote branch, and
514 # a) current branch has no local changes, and --force:
515 # - checkout new branch
516 # b) current branch has local changes, and --force and --reset:
517 # - checkout new branch
518 # c) otherwise exit
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000519
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000520 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
521 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000522 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
523 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000524 if cur_branch is None:
525 upstream_branch = None
526 current_type = "detached"
527 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000528 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000529 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
530 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
531 current_type = "hash"
532 logging.debug("Current branch is not tracking an upstream (remote)"
533 " branch.")
534 elif upstream_branch.startswith('refs/remotes'):
535 current_type = "branch"
536 else:
537 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000538
smut@google.comd33eab32014-07-07 19:35:18 +0000539 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000540 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000541 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000542 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000543 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000544 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000545
mmoss@chromium.org37ac0e32015-08-18 18:14:38 +0000546 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000547
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000548 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000549 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000550 target = 'HEAD'
551 if options.upstream and upstream_branch:
552 target = upstream_branch
553 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000554
msb@chromium.org786fb682010-06-02 15:16:23 +0000555 if current_type == 'detached':
556 # case 0
smut@google.com34b4e982016-05-16 19:06:07 +0000557 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000558 self._CheckDetachedHead(rev_str, options)
smut@google.comd33eab32014-07-07 19:35:18 +0000559 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
szager@chromium.org848fd492014-04-09 19:06:44 +0000560 self.Print('Up-to-date; skipping checkout.')
561 else:
vadimsh@chromium.org2b7d3ed2014-06-20 18:15:37 +0000562 # 'git checkout' may need to overwrite existing untracked files. Allow
563 # it only when nuclear options are enabled.
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000564 self._Checkout(
565 options,
566 revision,
smut@google.com34b4e982016-05-16 19:06:07 +0000567 force=(options.force and options.delete_unversioned_trees),
dnj@chromium.orgbb424c02014-06-23 22:42:51 +0000568 quiet=True,
569 )
msb@chromium.org786fb682010-06-02 15:16:23 +0000570 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000571 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000572 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000573 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000574 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000575 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000576 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000577 newbase=revision, printed_path=printed_path,
578 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000579 printed_path = True
580 else:
581 # Can't find a merge-base since we don't know our upstream. That makes
582 # this command VERY likely to produce a rebase failure. For now we
583 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000584 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000585 if options.revision or deps_revision:
smut@google.comd33eab32014-07-07 19:35:18 +0000586 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000587 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000588 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000589 printed_path = True
smut@google.comd33eab32014-07-07 19:35:18 +0000590 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000591 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000592 self._AttemptRebase(upstream_branch, files, options,
smut@google.comd33eab32014-07-07 19:35:18 +0000593 newbase=revision, printed_path=printed_path,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000594 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000595 printed_path = True
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000596 elif remote_ref and ''.join(remote_ref) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000597 # case 4
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000598 new_base = ''.join(remote_ref)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000599 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000600 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000601 switch_error = ("Could not switch upstream branch from %s to %s\n"
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000602 % (upstream_branch, new_base) +
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000603 "Please use --force or merge or rebase manually:\n" +
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000604 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
605 "OR git checkout -b <some new branch> %s" % new_base)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000606 force_switch = False
607 if options.force:
608 try:
609 self._CheckClean(rev_str)
610 # case 4a
611 force_switch = True
612 except gclient_utils.Error as e:
613 if options.reset:
614 # case 4b
615 force_switch = True
616 else:
617 switch_error = '%s\n%s' % (e.message, switch_error)
618 if force_switch:
619 self.Print("Switching upstream branch from %s to %s" %
620 (upstream_branch, new_base))
621 switch_branch = 'gclient_' + remote_ref[1]
622 self._Capture(['branch', '-f', switch_branch, new_base])
623 self._Checkout(options, switch_branch, force=True, quiet=True)
624 else:
625 # case 4c
626 raise gclient_utils.Error(switch_error)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000627 else:
628 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000629 if files is not None:
630 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000631 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000632 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000633 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000634 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000635 if options.merge:
636 merge_args.append('--ff')
637 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000638 merge_args.append('--ff-only')
639 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000640 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000641 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000642 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000643 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000644 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000645 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000646 printed_path = True
647 while True:
dnj@chromium.org5b23e872015-02-20 21:25:57 +0000648 if not options.auto_rebase:
649 try:
650 action = self._AskForData(
651 'Cannot %s, attempt to rebase? '
652 '(y)es / (q)uit / (s)kip : ' %
653 ('merge' if options.merge else 'fast-forward merge'),
654 options)
655 except ValueError:
656 raise gclient_utils.Error('Invalid Character')
657 if options.auto_rebase or re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000658 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000659 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000660 printed_path = True
661 break
662 elif re.match(r'quit|q', action, re.I):
663 raise gclient_utils.Error("Can't fast-forward, please merge or "
664 "rebase manually.\n"
665 "cd %s && git " % self.checkout_path
666 + "rebase %s" % upstream_branch)
667 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000668 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000669 return
670 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000671 self.Print('Input not recognized')
smut@google.com27c9c8a2014-09-11 19:57:55 +0000672 elif re.match("error: Your local changes to '.*' would be "
673 "overwritten by merge. Aborting.\nPlease, commit your "
674 "changes or stash them before you can merge.\n",
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000675 e.stderr):
676 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000677 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000678 printed_path = True
679 raise gclient_utils.Error(e.stderr)
680 else:
681 # Some other problem happened with the merge
682 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000683 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000684 raise
685 else:
686 # Fast-forward merge was successful
687 if not re.match('Already up-to-date.', merge_output) or verbose:
688 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000689 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000690 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000691 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000692 if not verbose:
693 # Make the output a little prettier. It's nice to have some
694 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000695 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000696
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000697 if file_list is not None:
698 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000699
700 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000701 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000702 raise gclient_utils.Error('\n____ %s%s\n'
703 '\nConflict while rebasing this branch.\n'
704 'Fix the conflict and run gclient again.\n'
705 'See man git-rebase for details.\n'
706 % (self.relpath, rev_str))
707
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000708 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000709 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
710 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000711
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000712 # If --reset and --delete_unversioned_trees are specified, remove any
713 # untracked directories.
714 if options.reset and options.delete_unversioned_trees:
715 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
716 # merge-base by default), so doesn't include untracked files. So we use
717 # 'git ls-files --directory --others --exclude-standard' here directly.
718 paths = scm.GIT.Capture(
719 ['ls-files', '--directory', '--others', '--exclude-standard'],
720 self.checkout_path)
721 for path in (p for p in paths.splitlines() if p.endswith('/')):
722 full_path = os.path.join(self.checkout_path, path)
723 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000724 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000725 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000726
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000727 return self._Capture(['rev-parse', '--verify', 'HEAD'])
728
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000729
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000730 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000731 """Reverts local modifications.
732
733 All reverted files will be appended to file_list.
734 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000735 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000736 # revert won't work if the directory doesn't exist. It needs to
737 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000738 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000739 # Don't reuse the args.
740 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000741
742 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000743 if options.upstream:
744 if self._GetCurrentBranch():
745 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
746 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000747 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000748 if not deps_revision:
749 deps_revision = default_rev
smut@google.comd33eab32014-07-07 19:35:18 +0000750 if deps_revision.startswith('refs/heads/'):
751 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
agable99a7f802016-06-24 11:19:44 -0700752 if not scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=deps_revision):
753 # There's a chance we just don't have the corresponding object.
754 self._Fetch(options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000755
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000756 if file_list is not None:
757 files = self._Capture(['diff', deps_revision, '--name-only']).split()
758
maruel@chromium.org37e89872010-09-07 16:11:33 +0000759 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000760 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000761
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000762 if file_list is not None:
763 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
764
765 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000766 """Returns revision"""
767 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000768
msb@chromium.orge28e4982009-09-25 20:51:45 +0000769 def runhooks(self, options, args, file_list):
770 self.status(options, args, file_list)
771
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000772 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000773 """Display status information."""
774 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000775 self.Print('________ couldn\'t run status in %s:\n'
776 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000777 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000778 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000779 self._Run(['diff', '--name-status', merge_base], options,
780 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000781 if file_list is not None:
782 files = self._Capture(['diff', '--name-only', merge_base]).split()
783 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000784
msb@chromium.orge6f78352010-01-13 17:05:33 +0000785 def FullUrlForRelativeUrl(self, url):
786 # Strip from last '/'
787 # Equivalent to unix basename
788 base_url = self.url
789 return base_url[:base_url.rfind('/')] + url
790
primiano@chromium.org1c127382015-02-17 11:15:40 +0000791 def GetGitBackupDirPath(self):
792 """Returns the path where the .git folder for the current project can be
793 staged/restored. Use case: subproject moved from DEPS <-> outer project."""
794 return os.path.join(self._root_dir,
795 'old_' + self.relpath.replace(os.sep, '_')) + '.git'
796
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000797 def _GetMirror(self, url, options):
798 """Get a git_cache.Mirror object for the argument url."""
799 if not git_cache.Mirror.GetCachePath():
800 return None
hinoka@google.comb1b54572014-04-16 22:29:23 +0000801 mirror_kwargs = {
802 'print_func': self.filter,
803 'refs': []
804 }
hinoka@google.comb1b54572014-04-16 22:29:23 +0000805 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
806 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org8d3348f2014-08-19 22:49:16 +0000807 if hasattr(options, 'with_tags') and options.with_tags:
808 mirror_kwargs['refs'].append('refs/tags/*')
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000809 return git_cache.Mirror(url, **mirror_kwargs)
810
811 @staticmethod
812 def _UpdateMirror(mirror, options):
813 """Update a git mirror by fetching the latest commits from the remote."""
szager@chromium.org3ec84f62014-08-22 21:00:22 +0000814 if getattr(options, 'shallow', False):
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000815 # HACK(hinoka): These repositories should be super shallow.
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000816 if 'flash' in mirror.url:
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000817 depth = 10
818 else:
819 depth = 10000
820 else:
821 depth = None
e.hakkinen@samsung.come8bc1aa2015-04-08 08:00:37 +0000822 mirror.populate(verbose=options.verbose,
823 bootstrap=not getattr(options, 'no_bootstrap', False),
824 depth=depth,
szager@chromium.orgdbb6f822016-02-02 22:59:30 +0000825 ignore_lock=getattr(options, 'ignore_locks', False),
826 lock_timeout=getattr(options, 'lock_timeout', 0))
szager@chromium.org848fd492014-04-09 19:06:44 +0000827 mirror.unlock()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000828
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000829 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000830 """Clone a git repository from the given URL.
831
msb@chromium.org786fb682010-06-02 15:16:23 +0000832 Once we've cloned the repo, we checkout a working branch if the specified
833 revision is a branch head. If it is a tag or a specific commit, then we
834 leave HEAD detached as it makes future updates simpler -- in this case the
835 user should first create a new branch or switch to an existing branch before
836 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000837 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000838 # git clone doesn't seem to insert a newline properly before printing
839 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000840 self.Print('')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000841 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.org8a139702014-06-20 15:55:01 +0000842 clone_cmd = cfg + ['clone', '--no-checkout', '--progress']
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000843 if self.cache_dir:
844 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000845 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000846 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000847 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000848 # If the parent directory does not exist, Git clone on Windows will not
849 # create it, so we need to do it manually.
850 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000851 gclient_utils.safe_makedirs(parent_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000852
853 template_dir = None
854 if hasattr(options, 'no_history') and options.no_history:
855 if gclient_utils.IsGitSha(revision):
856 # In the case of a subproject, the pinned sha is not necessarily the
857 # head of the remote branch (so we can't just use --depth=N). Instead,
858 # we tell git to fetch all the remote objects from SHA..HEAD by means of
859 # a template git dir which has a 'shallow' file pointing to the sha.
860 template_dir = tempfile.mkdtemp(
861 prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
862 dir=parent_dir)
863 self._Run(['init', '--bare', template_dir], options, cwd=self._root_dir)
864 with open(os.path.join(template_dir, 'shallow'), 'w') as template_file:
865 template_file.write(revision)
866 clone_cmd.append('--template=' + template_dir)
867 else:
868 # Otherwise, we're just interested in the HEAD. Just use --depth.
869 clone_cmd.append('--depth=1')
870
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000871 tmp_dir = tempfile.mkdtemp(
872 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
873 dir=parent_dir)
874 try:
875 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000876 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000877 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000878 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
879 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000880 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000881 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000882 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000883 finally:
884 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000885 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000886 gclient_utils.rmtree(tmp_dir)
primiano@chromium.org5439ea52014-08-06 17:18:18 +0000887 if template_dir:
888 gclient_utils.rmtree(template_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000889 self._UpdateBranchHeads(options, fetch=True)
mmoss@chromium.org6e7202b2014-09-09 18:23:39 +0000890 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
891 self._Checkout(options, ''.join(remote_ref or revision), quiet=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000892 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000893 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000894 self.Print(
smut@google.comd33eab32014-07-07 19:35:18 +0000895 ('Checked out %s to a detached HEAD. Before making any commits\n'
896 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
897 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
898 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000899
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000900 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000901 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000902 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000903 raise gclient_utils.Error("Background task requires input. Rerun "
904 "gclient with --jobs=1 so that\n"
905 "interaction is possible.")
906 try:
907 return raw_input(prompt)
908 except KeyboardInterrupt:
909 # Hide the exception.
910 sys.exit(1)
911
912
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000913 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000914 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000915 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000916 if files is not None:
917 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000918 revision = upstream
919 if newbase:
920 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000921 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000922 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000923 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000924 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000925 printed_path = True
926 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000927 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000928
929 if merge:
930 merge_output = self._Capture(['merge', revision])
931 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000932 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000933 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000934
935 # Build the rebase command here using the args
936 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
937 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000938 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000939 rebase_cmd.append('--verbose')
940 if newbase:
941 rebase_cmd.extend(['--onto', newbase])
942 rebase_cmd.append(upstream)
943 if branch:
944 rebase_cmd.append(branch)
945
946 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000947 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000948 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000949 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
950 re.match(r'cannot rebase: your index contains uncommitted changes',
951 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000952 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000953 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000954 'Cannot rebase because of unstaged changes.\n'
955 '\'git reset --hard HEAD\' ?\n'
956 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000957 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000958 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000959 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000960 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000961 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000962 break
963 elif re.match(r'quit|q', rebase_action, re.I):
964 raise gclient_utils.Error("Please merge or rebase manually\n"
965 "cd %s && git " % self.checkout_path
966 + "%s" % ' '.join(rebase_cmd))
967 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000968 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000969 continue
970 else:
971 gclient_utils.Error("Input not recognized")
972 continue
973 elif re.search(r'^CONFLICT', e.stdout, re.M):
974 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
975 "Fix the conflict and run gclient again.\n"
976 "See 'man git-rebase' for details.\n")
977 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000978 self.Print(e.stdout.strip())
979 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000980 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
981 "manually.\ncd %s && git " %
982 self.checkout_path
983 + "%s" % ' '.join(rebase_cmd))
984
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000985 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000986 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000987 # Make the output a little prettier. It's nice to have some
988 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000989 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000990
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000991 @staticmethod
992 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000993 (ok, current_version) = scm.GIT.AssertVersion(min_version)
994 if not ok:
995 raise gclient_utils.Error('git version %s < minimum required %s' %
996 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000997
tandrii@chromium.orgc438c142015-08-24 22:55:55 +0000998 def _EnsureValidHeadObjectOrCheckout(self, revision, options, url):
999 # Special case handling if all 3 conditions are met:
1000 # * the mirros have recently changed, but deps destination remains same,
1001 # * the git histories of mirrors are conflicting.
1002 # * git cache is used
1003 # This manifests itself in current checkout having invalid HEAD commit on
1004 # most git operations. Since git cache is used, just deleted the .git
1005 # folder, and re-create it by cloning.
1006 try:
1007 self._Capture(['rev-list', '-n', '1', 'HEAD'])
1008 except subprocess2.CalledProcessError as e:
1009 if ('fatal: bad object HEAD' in e.stderr
1010 and self.cache_dir and self.cache_dir in url):
1011 self.Print((
1012 'Likely due to DEPS change with git cache_dir, '
1013 'the current commit points to no longer existing object.\n'
1014 '%s' % e)
1015 )
1016 self._DeleteOrMove(options.force)
1017 self._Clone(revision, url, options)
1018 else:
1019 raise
1020
msb@chromium.org786fb682010-06-02 15:16:23 +00001021 def _IsRebasing(self):
1022 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
1023 # have a plumbing command to determine whether a rebase is in progress, so
1024 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
1025 g = os.path.join(self.checkout_path, '.git')
1026 return (
1027 os.path.isdir(os.path.join(g, "rebase-merge")) or
1028 os.path.isdir(os.path.join(g, "rebase-apply")))
1029
1030 def _CheckClean(self, rev_str):
iannucci@chromium.orgd9b318c2015-12-04 20:03:08 +00001031 lockfile = os.path.join(self.checkout_path, ".git", "index.lock")
1032 if os.path.exists(lockfile):
1033 raise gclient_utils.Error(
1034 '\n____ %s%s\n'
1035 '\tYour repo is locked, possibly due to a concurrent git process.\n'
1036 '\tIf no git executable is running, then clean up %r and try again.\n'
1037 % (self.relpath, rev_str, lockfile))
1038
msb@chromium.org786fb682010-06-02 15:16:23 +00001039 # Make sure the tree is clean; see git-rebase.sh for reference
1040 try:
1041 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001042 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001043 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001044 raise gclient_utils.Error('\n____ %s%s\n'
1045 '\tYou have unstaged changes.\n'
1046 '\tPlease commit, stash, or reset.\n'
1047 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001048 try:
1049 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
smut@google.com27c9c8a2014-09-11 19:57:55 +00001050 '--ignore-submodules', 'HEAD', '--'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001051 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001052 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001053 raise gclient_utils.Error('\n____ %s%s\n'
1054 '\tYour index contains uncommitted changes\n'
1055 '\tPlease commit, stash, or reset.\n'
1056 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001057
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001058 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +00001059 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1060 # reference by a commit). If not, error out -- most likely a rebase is
1061 # in progress, try to detect so we can give a better error.
1062 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001063 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1064 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001065 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001066 # Commit is not contained by any rev. See if the user is rebasing:
1067 if self._IsRebasing():
1068 # Punt to the user
1069 raise gclient_utils.Error('\n____ %s%s\n'
1070 '\tAlready in a conflict, i.e. (no branch).\n'
1071 '\tFix the conflict and run gclient again.\n'
1072 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1073 '\tSee man git-rebase for details.\n'
1074 % (self.relpath, rev_str))
1075 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001076 name = ('saved-by-gclient-' +
1077 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001078 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001079 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001080 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001081
msb@chromium.org5bde4852009-12-14 16:47:12 +00001082 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001083 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001084 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001085 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001086 return None
1087 return branch
1088
borenet@google.comc3e09d22014-04-10 13:58:18 +00001089 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001090 kwargs.setdefault('cwd', self.checkout_path)
1091 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001092 env = scm.GIT.ApplyEnvVars(kwargs)
1093 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001094
dnj@chromium.orgbb424c02014-06-23 22:42:51 +00001095 def _Checkout(self, options, ref, force=False, quiet=None):
1096 """Performs a 'git-checkout' operation.
1097
1098 Args:
1099 options: The configured option set
1100 ref: (str) The branch/commit to checkout
1101 quiet: (bool/None) Whether or not the checkout shoud pass '--quiet'; if
1102 'None', the behavior is inferred from 'options.verbose'.
1103 Returns: (str) The output of the checkout operation
1104 """
1105 if quiet is None:
1106 quiet = (not options.verbose)
1107 checkout_args = ['checkout']
1108 if force:
1109 checkout_args.append('--force')
1110 if quiet:
1111 checkout_args.append('--quiet')
1112 checkout_args.append(ref)
1113 return self._Capture(checkout_args)
1114
dnj@chromium.org680f2172014-06-25 00:39:32 +00001115 def _Fetch(self, options, remote=None, prune=False, quiet=False):
1116 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
1117 fetch_cmd = cfg + [
1118 'fetch',
1119 remote or self.remote,
1120 ]
1121
1122 if prune:
1123 fetch_cmd.append('--prune')
1124 if options.verbose:
1125 fetch_cmd.append('--verbose')
1126 elif quiet:
1127 fetch_cmd.append('--quiet')
1128 self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
1129
1130 # Return the revision that was fetched; this will be stored in 'FETCH_HEAD'
1131 return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])
1132
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001133 def _UpdateBranchHeads(self, options, fetch=False):
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001134 """Adds, and optionally fetches, "branch-heads" and "tags" refspecs
1135 if requested."""
1136 need_fetch = fetch
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001137 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001138 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001139 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1140 '^\\+refs/branch-heads/\\*:.*$']
1141 self._Run(config_cmd, options)
szager@chromium.org8d3348f2014-08-19 22:49:16 +00001142 need_fetch = True
1143 if hasattr(options, 'with_tags') and options.with_tags:
1144 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
1145 '+refs/tags/*:refs/tags/*',
1146 '^\\+refs/tags/\\*:.*$']
1147 self._Run(config_cmd, options)
1148 need_fetch = True
1149 if fetch and need_fetch:
1150 self._Fetch(options)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001151
dnj@chromium.org680f2172014-06-25 00:39:32 +00001152 def _Run(self, args, options, show_header=True, **kwargs):
1153 # Disable 'unused options' warning | pylint: disable=W0613
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001154 kwargs.setdefault('cwd', self.checkout_path)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001155 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001156 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001157 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001158 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001159 cmd = ['git'] + args
dnj@chromium.org680f2172014-06-25 00:39:32 +00001160 if show_header:
sbc@chromium.org2cd0b8e2014-09-22 21:17:59 +00001161 gclient_utils.CheckCallAndFilterAndHeader(cmd, env=env, **kwargs)
1162 else:
1163 gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001164
1165
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001166class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001167 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001168 name = 'svn'
maruel@chromium.org79d62372015-06-01 18:50:55 +00001169 _PRINTED_DEPRECATION = False
1170
1171 _MESSAGE = (
1172 'Oh hai! You are using subversion. Chrome infra is eager to get rid of',
1173 'svn support so please switch to git.',
1174 'Tracking bug: http://crbug.com/475320',
iannucci@chromium.org9e18dee2015-07-28 07:22:21 +00001175 'If you are a project owner, you may request git migration assistance at: ',
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001176 ' https://code.google.com/p/chromium/issues/entry?template=Infra-Git')
maruel@chromium.org79d62372015-06-01 18:50:55 +00001177
1178 def __init__(self, *args, **kwargs):
1179 super(SVNWrapper, self).__init__(*args, **kwargs)
sergiyb@chromium.orgecc37952015-06-02 09:36:43 +00001180 suppress_deprecated_notice = os.environ.get(
1181 'SUPPRESS_DEPRECATED_SVN_NOTICE', False)
1182 if not SVNWrapper._PRINTED_DEPRECATION and not suppress_deprecated_notice:
maruel@chromium.org79d62372015-06-01 18:50:55 +00001183 SVNWrapper._PRINTED_DEPRECATION = True
1184 sys.stderr.write('\n'.join(self._MESSAGE) + '\n')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001185
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001186 @staticmethod
1187 def BinaryExists():
1188 """Returns true if the command exists."""
1189 try:
1190 result, version = scm.SVN.AssertVersion('1.4')
1191 if not result:
1192 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1193 return result
1194 except OSError:
1195 return False
1196
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001197 def GetCheckoutRoot(self):
1198 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1199
floitsch@google.comeaab7842011-04-28 09:07:58 +00001200 def GetRevisionDate(self, revision):
1201 """Returns the given revision's date in ISO-8601 format (which contains the
1202 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001203 date = scm.SVN.Capture(
1204 ['propget', '--revprop', 'svn:date', '-r', revision],
1205 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001206 return date.strip()
1207
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001208 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001209 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001210 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001211
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001212 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001213 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001214 if not os.path.isdir(self.checkout_path):
1215 raise gclient_utils.Error('Directory %s is not present.' %
1216 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001217 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001218
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001219 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001220 """Generates a patch file which can be applied to the root of the
1221 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001222 if not os.path.isdir(self.checkout_path):
1223 raise gclient_utils.Error('Directory %s is not present.' %
1224 self.checkout_path)
1225 gclient_utils.CheckCallAndFilter(
1226 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1227 cwd=self.checkout_path,
1228 print_stdout=False,
avakulenko@google.com255f2be2014-12-05 22:19:55 +00001229 filter_fn=SvnDiffFilterer(self.relpath, print_func=self.Print).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001230
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001231 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001232 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001233
1234 All updated files will be appended to file_list.
1235
1236 Raises:
1237 Error: if can't get URL for relative path.
1238 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001239 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001240 hg_path = os.path.join(self.checkout_path, '.hg')
1241 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001242 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001243 return
1244
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001245 if args:
1246 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1247
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001248 # revision is the revision to match. It is None if no revision is specified,
1249 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001250 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001251 # Keep the original unpinned url for reference in case the repo is switched.
1252 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001253 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001254 if options.revision:
1255 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001256 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001257 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001258 if revision != 'unmanaged':
1259 forced_revision = True
1260 # Reconstruct the url.
1261 url = '%s@%s' % (url, revision)
1262 rev_str = ' at %s' % revision
1263 else:
1264 managed = False
1265 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001266 else:
1267 forced_revision = False
1268 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001269
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001270 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001271 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001272 # Git is only okay if it's a git-svn checkout of the right repo.
1273 if scm.GIT.IsGitSvn(self.checkout_path):
1274 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1275 'svn-remote.svn.url'],
1276 cwd=self.checkout_path).rstrip()
1277 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001278 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1279 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001280 return # TODO(borenet): Get the svn revision number?
1281
1282 # Get the existing scm url and the revision number of the current checkout.
1283 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001284 try:
1285 from_info = scm.SVN.CaptureLocalInfo(
1286 [], os.path.join(self.checkout_path, '.'))
1287 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001288 self._DeleteOrMove(options.force)
1289 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001290
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001291 BASE_URLS = {
1292 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1293 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1294 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001295 WHITELISTED_ROOTS = [
1296 'svn://svn.chromium.org',
1297 'svn://svn-mirror.golo.chromium.org',
1298 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001299 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001300 try:
1301 # Split out the revision number since it's not useful for us.
1302 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001303 # Check to see if we're on a whitelisted root. We do this because
1304 # only some svn servers have matching UUIDs.
1305 local_parsed = urlparse.urlparse(url)
1306 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001307 if ('CHROME_HEADLESS' in os.environ
1308 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001309 and base_path in BASE_URLS
1310 and local_root in WHITELISTED_ROOTS):
1311
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001312 # Use a tarball for initial sync if we are on a bot.
1313 # Get an unauthenticated gsutil instance.
1314 gsutil = download_from_google_storage.Gsutil(
1315 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1316
1317 gs_path = BASE_URLS[base_path]
1318 _, out, _ = gsutil.check_call('ls', gs_path)
1319 # So that we can get the most recent revision.
1320 sorted_items = sorted(out.splitlines())
1321 latest_checkout = sorted_items[-1]
1322
1323 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001324 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001325 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1326 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001327 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001328 raise Exception()
1329 filename = latest_checkout.split('/')[-1]
1330 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001331 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001332 gclient_utils.safe_makedirs(self.checkout_path)
1333 # TODO(hinoka): Use 7z for windows.
1334 cmd = ['tar', '--extract', '--ungzip',
1335 '--directory', self.checkout_path,
1336 '--file', tarball]
1337 gclient_utils.CheckCallAndFilter(
1338 cmd, stdout=sys.stdout, print_stdout=True)
1339
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001340 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001341 gclient_utils.rmtree(tempdir)
1342
1343 # Rewrite the repository root to match.
1344 tarball_url = scm.SVN.CaptureLocalInfo(
1345 ['.'], self.checkout_path)['Repository Root']
1346 tarball_parsed = urlparse.urlparse(tarball_url)
1347 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1348 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001349
1350 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001351 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001352 self._Run(['switch', '--relocate', tarball_root,
1353 local_root, self.checkout_path],
1354 options)
1355 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001356 self.Print('We tried to get a source tarball but failed.')
1357 self.Print('Resuming normal operations.')
1358 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001359
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001360 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001361 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001362 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001363 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001364 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001365 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001366
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001367 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001368 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001369 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1370 return self.Svnversion()
1371 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001372
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001373 if 'URL' not in from_info:
1374 raise gclient_utils.Error(
1375 ('gclient is confused. Couldn\'t get the url for %s.\n'
1376 'Try using @unmanaged.\n%s') % (
1377 self.checkout_path, from_info))
1378
stip@chromium.org3031d732014-04-21 22:18:02 +00001379 # Look for locked directories.
1380 dir_info = scm.SVN.CaptureStatus(
1381 None, os.path.join(self.checkout_path, '.'))
1382 if any(d[0][2] == 'L' for d in dir_info):
1383 try:
1384 self._Run(['cleanup', self.checkout_path], options)
1385 except subprocess2.CalledProcessError, e:
1386 # Get the status again, svn cleanup may have cleaned up at least
1387 # something.
1388 dir_info = scm.SVN.CaptureStatus(
1389 None, os.path.join(self.checkout_path, '.'))
1390
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001391 # Try to fix the failures by removing troublesome files.
1392 for d in dir_info:
1393 if d[0][2] == 'L':
1394 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001395 # We don't pass any files/directories to CaptureStatus and set
1396 # cwd=self.checkout_path, so we should get relative paths here.
1397 assert not os.path.isabs(d[1])
1398 path_to_remove = os.path.normpath(
1399 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001400 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001401 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001402 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001403 self.Print(
1404 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001405 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001406 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001407 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001408
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001409 # Retrieve the current HEAD version because svn is slow at null updates.
1410 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001411 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001412 revision = str(from_info_live['Revision'])
1413 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001414
borenet@google.comb09097a2014-04-09 19:09:08 +00001415 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001416 # The repository url changed, need to switch.
1417 try:
1418 to_info = scm.SVN.CaptureRemoteInfo(url)
1419 except (gclient_utils.Error, subprocess2.CalledProcessError):
1420 # The url is invalid or the server is not accessible, it's safer to bail
1421 # out right now.
1422 raise gclient_utils.Error('This url is unreachable: %s' % url)
1423 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1424 and (from_info['UUID'] == to_info['UUID']))
1425 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001426 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001427 # We have different roots, so check if we can switch --relocate.
1428 # Subversion only permits this if the repository UUIDs match.
1429 # Perform the switch --relocate, then rewrite the from_url
1430 # to reflect where we "are now." (This is the same way that
1431 # Subversion itself handles the metadata when switch --relocate
1432 # is used.) This makes the checks below for whether we
1433 # can update to a revision or have to switch to a different
1434 # branch work as expected.
1435 # TODO(maruel): TEST ME !
1436 command = ['switch', '--relocate',
1437 from_info['Repository Root'],
1438 to_info['Repository Root'],
1439 self.relpath]
1440 self._Run(command, options, cwd=self._root_dir)
1441 from_info['URL'] = from_info['URL'].replace(
1442 from_info['Repository Root'],
1443 to_info['Repository Root'])
1444 else:
1445 if not options.force and not options.reset:
1446 # Look for local modifications but ignore unversioned files.
1447 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1448 if status[0][0] != '?':
1449 raise gclient_utils.Error(
1450 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1451 'there is local changes in %s. Delete the directory and '
1452 'try again.') % (url, self.checkout_path))
1453 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001454 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001455 gclient_utils.rmtree(self.checkout_path)
1456 # We need to checkout.
1457 command = ['checkout', url, self.checkout_path]
1458 command = self._AddAdditionalUpdateFlags(command, options, revision)
1459 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1460 return self.Svnversion()
1461
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001462 # If the provided url has a revision number that matches the revision
1463 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001464 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001465 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001466 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001467 else:
1468 command = ['update', self.checkout_path]
1469 command = self._AddAdditionalUpdateFlags(command, options, revision)
1470 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001471
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001472 # If --reset and --delete_unversioned_trees are specified, remove any
1473 # untracked files and directories.
1474 if options.reset and options.delete_unversioned_trees:
1475 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1476 full_path = os.path.join(self.checkout_path, status[1])
1477 if (status[0][0] == '?'
1478 and os.path.isdir(full_path)
1479 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001480 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001481 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001482 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001483
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001484 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001485 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001486 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001487 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001488 # Create an empty checkout and then update the one file we want. Future
1489 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001490 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001491 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001492 if os.path.exists(os.path.join(self.checkout_path, filename)):
1493 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001494 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001495 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001496 # After the initial checkout, we can use update as if it were any other
1497 # dep.
1498 self.update(options, args, file_list)
1499 else:
1500 # If the installed version of SVN doesn't support --depth, fallback to
1501 # just exporting the file. This has the downside that revision
1502 # information is not stored next to the file, so we will have to
1503 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001504 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001505 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001506 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001507 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001508 command = self._AddAdditionalUpdateFlags(command, options,
1509 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001510 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001511
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001512 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001513 """Reverts local modifications. Subversion specific.
1514
1515 All reverted files will be appended to file_list, even if Subversion
1516 doesn't know about them.
1517 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001518 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001519 if os.path.exists(self.checkout_path):
1520 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001521 # svn revert won't work if the directory doesn't exist. It needs to
1522 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001523 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001524 # Don't reuse the args.
1525 return self.update(options, [], file_list)
1526
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001527 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001528 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001529 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001530 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001531 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001532 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001533 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001534 if not options.force:
1535 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001536 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001537 '\n_____ %s is not a valid svn checkout, synching instead' %
1538 self.relpath)
1539 gclient_utils.rmtree(self.checkout_path)
1540 # Don't reuse the args.
1541 return self.update(options, [], file_list)
1542
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001543 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001544 if file_list is not None:
1545 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001546 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001547 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001548 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001549 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001550 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001551
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001552 # Revert() may delete the directory altogether.
1553 if not os.path.isdir(self.checkout_path):
1554 # Don't reuse the args.
1555 return self.update(options, [], file_list)
1556
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001557 try:
1558 # svn revert is so broken we don't even use it. Using
1559 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001560 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001561 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1562 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001563 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001564 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001565 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001566
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001567 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001568 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001569 try:
1570 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001571 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001572 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001573
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001574 def runhooks(self, options, args, file_list):
1575 self.status(options, args, file_list)
1576
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001577 def status(self, options, args, file_list):
1578 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001579 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001580 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001581 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001582 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001583 'The directory does not exist.') %
1584 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001585 # There's no file list to retrieve.
1586 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001587 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001588
1589 def FullUrlForRelativeUrl(self, url):
1590 # Find the forth '/' and strip from there. A bit hackish.
1591 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001592
maruel@chromium.org669600d2010-09-01 19:06:31 +00001593 def _Run(self, args, options, **kwargs):
1594 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001595 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001596 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001597 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001598
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001599 def Svnversion(self):
1600 """Runs the lowest checked out revision in the current project."""
1601 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1602 return info['Revision']
1603
maruel@chromium.org669600d2010-09-01 19:06:31 +00001604 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1605 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001606 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001607 scm.SVN.RunAndGetFileList(
1608 options.verbose,
1609 args + ['--ignore-externals'],
1610 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001611 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001612
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001613 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001614 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001615 """Add additional flags to command depending on what options are set.
1616 command should be a list of strings that represents an svn command.
1617
1618 This method returns a new list to be used as a command."""
1619 new_command = command[:]
1620 if revision:
1621 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001622 # We don't want interaction when jobs are used.
1623 if options.jobs > 1:
1624 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001625 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001626 # --accept was added to 'svn update' in svn 1.6.
1627 if not scm.SVN.AssertVersion('1.5')[0]:
1628 return new_command
1629
1630 # It's annoying to have it block in the middle of a sync, just sensible
1631 # defaults.
1632 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001633 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001634 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1635 new_command.extend(('--accept', 'theirs-conflict'))
1636 elif options.manually_grab_svn_rev:
1637 new_command.append('--force')
1638 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1639 new_command.extend(('--accept', 'postpone'))
1640 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1641 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001642 return new_command