blob: 9a6f5123419cef246e638dc28ae3caf0679cd4ee [file] [log] [blame]
[email protected]93567042012-02-15 01:02:261# Copyright (c) 2012 The Chromium Authors. All rights reserved.
[email protected]5aeb7dd2009-11-17 18:09:012# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
[email protected]5f3eee32009-09-17 00:34:304
[email protected]d5800f12009-11-12 20:03:435"""Gclient-specific SCM-specific operations."""
[email protected]5f3eee32009-09-17 00:34:306
[email protected]fe0d1902014-04-08 20:50:447from __future__ import print_function
8
[email protected]b2256212014-05-07 20:57:289import errno
[email protected]754960e2009-09-21 12:31:0510import logging
[email protected]5f3eee32009-09-17 00:34:3011import os
[email protected]ee4071d2009-12-22 22:25:3712import posixpath
[email protected]5f3eee32009-09-17 00:34:3013import re
[email protected]90541732011-04-01 17:54:1814import sys
[email protected]3534aa52013-07-20 01:58:0815import tempfile
[email protected]6279e8a2014-02-13 01:45:2516import traceback
[email protected]2f2ca142014-01-07 03:59:1817import urlparse
[email protected]5f3eee32009-09-17 00:34:3018
[email protected]2f2ca142014-01-07 03:59:1819import download_from_google_storage
[email protected]5f3eee32009-09-17 00:34:3020import gclient_utils
[email protected]848fd492014-04-09 19:06:4421import git_cache
[email protected]31cb48a2011-04-04 18:01:3622import scm
[email protected]b2256212014-05-07 20:57:2823import shutil
[email protected]31cb48a2011-04-04 18:01:3624import subprocess2
[email protected]5f3eee32009-09-17 00:34:3025
26
[email protected]71cbb502013-04-19 23:30:1527THIS_FILE_PATH = os.path.abspath(__file__)
28
[email protected]2f2ca142014-01-07 03:59:1829GSUTIL_DEFAULT_PATH = os.path.join(
[email protected]b091aa52014-12-20 01:47:3130 os.path.dirname(os.path.abspath(__file__)), 'gsutil.py')
[email protected]2f2ca142014-01-07 03:59:1831
[email protected]79d62372015-06-01 18:50:5532
[email protected]ef141922015-08-12 17:36:2733class NoUsableRevError(gclient_utils.Error):
34 """Raised if requested revision isn't found in checkout."""
35
36
[email protected]306080c2012-05-04 13:11:2937class DiffFiltererWrapper(object):
38 """Simple base class which tracks which file is being diffed and
[email protected]ee4071d2009-12-22 22:25:3739 replaces instances of its file name in the original and
[email protected]d6504212010-01-13 17:34:3140 working copy lines of the svn/git diff output."""
[email protected]306080c2012-05-04 13:11:2941 index_string = None
[email protected]ee4071d2009-12-22 22:25:3742 original_prefix = "--- "
43 working_prefix = "+++ "
44
[email protected]fe0d1902014-04-08 20:50:4445 def __init__(self, relpath, print_func):
[email protected]ee4071d2009-12-22 22:25:3746 # Note that we always use '/' as the path separator to be
47 # consistent with svn's cygwin-style output on Windows
48 self._relpath = relpath.replace("\\", "/")
[email protected]306080c2012-05-04 13:11:2949 self._current_file = None
[email protected]fe0d1902014-04-08 20:50:4450 self._print_func = print_func
[email protected]ee4071d2009-12-22 22:25:3751
[email protected]6e29d572010-06-04 17:32:2052 def SetCurrentFile(self, current_file):
53 self._current_file = current_file
[email protected]306080c2012-05-04 13:11:2954
[email protected]3830a672013-02-19 20:15:1455 @property
56 def _replacement_file(self):
[email protected]306080c2012-05-04 13:11:2957 return posixpath.join(self._relpath, self._current_file)
[email protected]ee4071d2009-12-22 22:25:3758
[email protected]f5d37bf2010-09-02 00:50:3459 def _Replace(self, line):
60 return line.replace(self._current_file, self._replacement_file)
[email protected]ee4071d2009-12-22 22:25:3761
62 def Filter(self, line):
63 if (line.startswith(self.index_string)):
64 self.SetCurrentFile(line[len(self.index_string):])
[email protected]f5d37bf2010-09-02 00:50:3465 line = self._Replace(line)
[email protected]ee4071d2009-12-22 22:25:3766 else:
67 if (line.startswith(self.original_prefix) or
68 line.startswith(self.working_prefix)):
[email protected]f5d37bf2010-09-02 00:50:3469 line = self._Replace(line)
[email protected]fe0d1902014-04-08 20:50:4470 self._print_func(line)
[email protected]ee4071d2009-12-22 22:25:3771
72
[email protected]306080c2012-05-04 13:11:2973class SvnDiffFilterer(DiffFiltererWrapper):
74 index_string = "Index: "
75
76
77class GitDiffFilterer(DiffFiltererWrapper):
78 index_string = "diff --git "
79
80 def SetCurrentFile(self, current_file):
81 # Get filename by parsing "a/<filename> b/<filename>"
82 self._current_file = current_file[:(len(current_file)/2)][2:]
83
84 def _Replace(self, line):
85 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
86
87
[email protected]5f3eee32009-09-17 00:34:3088### SCM abstraction layer
89
[email protected]cb5442b2009-09-22 16:51:2490# Factory Method for SCM wrapper creation
91
[email protected]9eda4112010-06-11 18:56:1092def GetScmName(url):
93 if url:
94 url, _ = gclient_utils.SplitUrlRevision(url)
95 if (url.startswith('git://') or url.startswith('ssh://') or
[email protected]4e075672011-11-21 16:35:0896 url.startswith('git+http://') or url.startswith('git+https://') or
[email protected]a2aec972014-04-22 21:35:1597 url.endswith('.git') or url.startswith('sso://') or
98 'googlesource' in url):
[email protected]9eda4112010-06-11 18:56:1099 return 'git'
[email protected]b74dca22010-06-11 20:10:40100 elif (url.startswith('http://') or url.startswith('https://') or
[email protected]54a07a22010-06-14 19:07:39101 url.startswith('svn://') or url.startswith('svn+ssh://')):
[email protected]9eda4112010-06-11 18:56:10102 return 'svn'
[email protected]44ae4fb2014-10-23 08:28:30103 elif url.startswith('file://'):
104 if url.endswith('.git'):
105 return 'git'
106 return 'svn'
[email protected]9eda4112010-06-11 18:56:10107 return None
108
109
[email protected]fe0d1902014-04-08 20:50:44110def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
[email protected]9eda4112010-06-11 18:56:10111 SCM_MAP = {
[email protected]cb5442b2009-09-22 16:51:24112 'svn' : SVNWrapper,
[email protected]e28e4982009-09-25 20:51:45113 'git' : GitWrapper,
[email protected]cb5442b2009-09-22 16:51:24114 }
[email protected]e28e4982009-09-25 20:51:45115
[email protected]9eda4112010-06-11 18:56:10116 scm_name = GetScmName(url)
117 if not scm_name in SCM_MAP:
118 raise gclient_utils.Error('No SCM found for url %s' % url)
[email protected]9e3e82c2012-04-18 12:55:43119 scm_class = SCM_MAP[scm_name]
120 if not scm_class.BinaryExists():
121 raise gclient_utils.Error('%s command not found' % scm_name)
[email protected]fe0d1902014-04-08 20:50:44122 return scm_class(url, root_dir, relpath, out_fh, out_cb)
[email protected]cb5442b2009-09-22 16:51:24123
124
125# SCMWrapper base class
126
[email protected]5f3eee32009-09-17 00:34:30127class SCMWrapper(object):
128 """Add necessary glue between all the supported SCM.
129
[email protected]d6504212010-01-13 17:34:31130 This is the abstraction layer to bind to different SCM.
131 """
[email protected]fe0d1902014-04-08 20:50:44132
133 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
134 out_cb=None):
[email protected]5f3eee32009-09-17 00:34:30135 self.url = url
[email protected]5e73b0c2009-09-18 19:47:48136 self._root_dir = root_dir
137 if self._root_dir:
138 self._root_dir = self._root_dir.replace('/', os.sep)
139 self.relpath = relpath
140 if self.relpath:
141 self.relpath = self.relpath.replace('/', os.sep)
[email protected]e28e4982009-09-25 20:51:45142 if self.relpath and self._root_dir:
143 self.checkout_path = os.path.join(self._root_dir, self.relpath)
[email protected]fe0d1902014-04-08 20:50:44144 if out_fh is None:
145 out_fh = sys.stdout
146 self.out_fh = out_fh
147 self.out_cb = out_cb
148
149 def Print(self, *args, **kwargs):
150 kwargs.setdefault('file', self.out_fh)
151 if kwargs.pop('timestamp', True):
152 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
153 print(*args, **kwargs)
[email protected]5f3eee32009-09-17 00:34:30154
[email protected]5f3eee32009-09-17 00:34:30155 def RunCommand(self, command, options, args, file_list=None):
[email protected]6e043f72011-05-02 07:24:32156 commands = ['cleanup', 'update', 'updatesingle', 'revert',
[email protected]4b5b1772010-04-08 01:52:56157 'revinfo', 'status', 'diff', 'pack', 'runhooks']
[email protected]5f3eee32009-09-17 00:34:30158
159 if not command in commands:
160 raise gclient_utils.Error('Unknown command %s' % command)
161
[email protected]cb5442b2009-09-22 16:51:24162 if not command in dir(self):
[email protected]ee4071d2009-12-22 22:25:37163 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
[email protected]9eda4112010-06-11 18:56:10164 command, self.__class__.__name__))
[email protected]cb5442b2009-09-22 16:51:24165
166 return getattr(self, command)(options, args, file_list)
167
[email protected]fa2b9b42014-08-22 18:08:53168 @staticmethod
169 def _get_first_remote_url(checkout_path):
170 log = scm.GIT.Capture(
171 ['config', '--local', '--get-regexp', r'remote.*.url'],
172 cwd=checkout_path)
173 # Get the second token of the first line of the log.
174 return log.splitlines()[0].split(' ', 1)[1]
175
[email protected]d33eab32014-07-07 19:35:18176 def GetActualRemoteURL(self, options):
[email protected]88d10082014-03-21 17:24:48177 """Attempt to determine the remote URL for this SCMWrapper."""
[email protected]d33eab32014-07-07 19:35:18178 # Git
[email protected]bda475e2014-03-24 19:04:45179 if os.path.exists(os.path.join(self.checkout_path, '.git')):
[email protected]fa2b9b42014-08-22 18:08:53180 actual_remote_url = self._get_first_remote_url(self.checkout_path)
[email protected]4e9be262014-04-08 19:40:30181
182 # If a cache_dir is used, obtain the actual remote URL from the cache.
183 if getattr(self, 'cache_dir', None):
[email protected]46d09f62014-04-10 18:50:23184 url, _ = gclient_utils.SplitUrlRevision(self.url)
185 mirror = git_cache.Mirror(url)
[email protected]848fd492014-04-09 19:06:44186 if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
[email protected]4e9be262014-04-08 19:40:30187 actual_remote_url.replace('\\', '/')):
[email protected]fa2b9b42014-08-22 18:08:53188 actual_remote_url = self._get_first_remote_url(mirror.mirror_path)
[email protected]4e9be262014-04-08 19:40:30189 return actual_remote_url
190
191 # Svn
[email protected]bda475e2014-03-24 19:04:45192 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
[email protected]88d10082014-03-21 17:24:48193 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
[email protected]88d10082014-03-21 17:24:48194 return None
195
[email protected]4e9be262014-04-08 19:40:30196 def DoesRemoteURLMatch(self, options):
[email protected]88d10082014-03-21 17:24:48197 """Determine whether the remote URL of this checkout is the expected URL."""
198 if not os.path.exists(self.checkout_path):
199 # A checkout which doesn't exist can't be broken.
200 return True
201
[email protected]d33eab32014-07-07 19:35:18202 actual_remote_url = self.GetActualRemoteURL(options)
[email protected]88d10082014-03-21 17:24:48203 if actual_remote_url:
[email protected]8156c9f2014-04-01 16:41:36204 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
205 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
[email protected]88d10082014-03-21 17:24:48206 else:
207 # This may occur if the self.checkout_path exists but does not contain a
208 # valid git or svn checkout.
209 return False
210
[email protected]b09097a2014-04-09 19:09:08211 def _DeleteOrMove(self, force):
212 """Delete the checkout directory or move it out of the way.
213
214 Args:
215 force: bool; if True, delete the directory. Otherwise, just move it.
216 """
[email protected]b2256212014-05-07 20:57:28217 if force and os.environ.get('CHROME_HEADLESS') == '1':
218 self.Print('_____ Conflicting directory found in %s. Removing.'
219 % self.checkout_path)
220 gclient_utils.AddWarning('Conflicting directory %s deleted.'
221 % self.checkout_path)
222 gclient_utils.rmtree(self.checkout_path)
223 else:
224 bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
225 os.path.dirname(self.relpath))
226
227 try:
228 os.makedirs(bad_scm_dir)
229 except OSError as e:
230 if e.errno != errno.EEXIST:
231 raise
232
233 dest_path = tempfile.mkdtemp(
234 prefix=os.path.basename(self.relpath),
235 dir=bad_scm_dir)
236 self.Print('_____ Conflicting directory found in %s. Moving to %s.'
237 % (self.checkout_path, dest_path))
238 gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
239 % (self.checkout_path, dest_path))
240 shutil.move(self.checkout_path, dest_path)
[email protected]b09097a2014-04-09 19:09:08241
[email protected]cb5442b2009-09-22 16:51:24242
[email protected]55e724e2010-03-11 19:36:49243class GitWrapper(SCMWrapper):
[email protected]e28e4982009-09-25 20:51:45244 """Wrapper for Git"""
[email protected]2702bcd2013-09-24 19:10:07245 name = 'git'
[email protected]1a60dca2013-11-26 14:06:26246 remote = 'origin'
[email protected]e28e4982009-09-25 20:51:45247
[email protected]53456aa2013-07-03 19:38:34248 cache_dir = None
[email protected]53456aa2013-07-03 19:38:34249
[email protected]848fd492014-04-09 19:06:44250 def __init__(self, url=None, *args):
[email protected]4e075672011-11-21 16:35:08251 """Removes 'git+' fake prefix from git URL."""
252 if url.startswith('git+http://') or url.startswith('git+https://'):
253 url = url[4:]
[email protected]848fd492014-04-09 19:06:44254 SCMWrapper.__init__(self, url, *args)
255 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
256 if self.out_cb:
257 filter_kwargs['predicate'] = self.out_cb
258 self.filter = gclient_utils.GitFilter(**filter_kwargs)
[email protected]4e075672011-11-21 16:35:08259
[email protected]9e3e82c2012-04-18 12:55:43260 @staticmethod
261 def BinaryExists():
262 """Returns true if the command exists."""
263 try:
264 # We assume git is newer than 1.7. See: crbug.com/114483
265 result, version = scm.GIT.AssertVersion('1.7')
266 if not result:
267 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
268 return result
269 except OSError:
270 return False
271
[email protected]885a9602013-05-31 09:54:40272 def GetCheckoutRoot(self):
273 return scm.GIT.GetCheckoutRoot(self.checkout_path)
274
[email protected]396e1a62013-07-03 19:41:04275 def GetRevisionDate(self, _revision):
[email protected]eaab7842011-04-28 09:07:58276 """Returns the given revision's date in ISO-8601 format (which contains the
277 time zone)."""
278 # TODO(floitsch): get the time-stamp of the given revision and not just the
279 # time-stamp of the currently checked out revision.
280 return self._Capture(['log', '-n', '1', '--format=%ai'])
281
[email protected]6e29d572010-06-04 17:32:20282 @staticmethod
283 def cleanup(options, args, file_list):
[email protected]d8a63782010-01-25 17:47:05284 """'Cleanup' the repo.
285
286 There's no real git equivalent for the svn cleanup command, do a no-op.
287 """
[email protected]e28e4982009-09-25 20:51:45288
[email protected]396e1a62013-07-03 19:41:04289 def diff(self, options, _args, _file_list):
[email protected]1a60dca2013-11-26 14:06:26290 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
[email protected]37e89872010-09-07 16:11:33291 self._Run(['diff', merge_base], options)
[email protected]e28e4982009-09-25 20:51:45292
[email protected]396e1a62013-07-03 19:41:04293 def pack(self, _options, _args, _file_list):
[email protected]ee4071d2009-12-22 22:25:37294 """Generates a patch file which can be applied to the root of the
[email protected]d6504212010-01-13 17:34:31295 repository.
296
297 The patch file is generated from a diff of the merge base of HEAD and
298 its upstream branch.
299 """
[email protected]1a60dca2013-11-26 14:06:26300 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
[email protected]17d01792010-09-01 18:07:10301 gclient_utils.CheckCallAndFilter(
[email protected]8469bf92010-09-03 19:03:15302 ['git', 'diff', merge_base],
303 cwd=self.checkout_path,
[email protected]255f2be2014-12-05 22:19:55304 filter_fn=GitDiffFilterer(self.relpath, print_func=self.Print).Filter)
[email protected]ee4071d2009-12-22 22:25:37305
[email protected]d33eab32014-07-07 19:35:18306 def _FetchAndReset(self, revision, file_list, options):
[email protected]50fd47f2014-02-13 01:03:19307 """Equivalent to git fetch; git reset."""
308 quiet = []
309 if not options.verbose:
310 quiet = ['--quiet']
311 self._UpdateBranchHeads(options, fetch=False)
312
[email protected]680f2172014-06-25 00:39:32313 self._Fetch(options, prune=True, quiet=options.verbose)
[email protected]d33eab32014-07-07 19:35:18314 self._Run(['reset', '--hard', revision] + quiet, options)
[email protected]50fd47f2014-02-13 01:03:19315 if file_list is not None:
316 files = self._Capture(['ls-files']).splitlines()
317 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
318
[email protected]8a139702014-06-20 15:55:01319 def _DisableHooks(self):
320 hook_dir = os.path.join(self.checkout_path, '.git', 'hooks')
321 if not os.path.isdir(hook_dir):
322 return
323 for f in os.listdir(hook_dir):
324 if not f.endswith('.sample') and not f.endswith('.disabled'):
[email protected]41265562015-04-08 09:14:46325 disabled_hook_path = os.path.join(hook_dir, f + '.disabled')
326 if os.path.exists(disabled_hook_path):
327 os.remove(disabled_hook_path)
328 os.rename(os.path.join(hook_dir, f), disabled_hook_path)
[email protected]8a139702014-06-20 15:55:01329
[email protected]30a07982016-04-07 21:35:19330 def _maybe_break_locks(self, options):
331 """This removes all .lock files from this repo's .git directory, if the
332 user passed the --break_repo_locks command line flag.
333
334 In particular, this will cleanup index.lock files, as well as ref lock
335 files.
336 """
337 if options.break_repo_locks:
338 git_dir = os.path.join(self.checkout_path, '.git')
339 for path, _, filenames in os.walk(git_dir):
340 for filename in filenames:
341 if filename.endswith('.lock'):
342 to_break = os.path.join(path, filename)
343 self.Print('breaking lock: %s' % (to_break,))
344 try:
345 os.remove(to_break)
346 except OSError as ex:
347 self.Print('FAILED to break lock: %s: %s' % (to_break, ex))
348 raise
349
350
[email protected]e28e4982009-09-25 20:51:45351 def update(self, options, args, file_list):
352 """Runs git to update or transparently checkout the working copy.
353
354 All updated files will be appended to file_list.
355
356 Raises:
357 Error: if can't get URL for relative path.
358 """
[email protected]e28e4982009-09-25 20:51:45359 if args:
360 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
361
[email protected]ece406f2010-02-23 17:29:15362 self._CheckMinVersion("1.6.6")
[email protected]923a0372009-12-11 20:42:43363
[email protected]1a60dca2013-11-26 14:06:26364 # If a dependency is not pinned, track the default remote branch.
[email protected]d33eab32014-07-07 19:35:18365 default_rev = 'refs/remotes/%s/master' % self.remote
[email protected]7080e942010-03-15 15:06:16366 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
[email protected]ac915bb2009-11-13 17:03:01367 rev_str = ""
[email protected]7080e942010-03-15 15:06:16368 revision = deps_revision
[email protected]eb2756d2011-09-20 20:17:51369 managed = True
[email protected]e28e4982009-09-25 20:51:45370 if options.revision:
[email protected]ac915bb2009-11-13 17:03:01371 # Override the revision number.
372 revision = str(options.revision)
[email protected]eb2756d2011-09-20 20:17:51373 if revision == 'unmanaged':
[email protected]483a0ba2014-05-30 00:06:07374 # Check again for a revision in case an initial ref was specified
375 # in the url, for example bla.git@refs/heads/custombranch
376 revision = deps_revision
[email protected]eb2756d2011-09-20 20:17:51377 managed = False
[email protected]d90ba3f2010-02-23 14:42:57378 if not revision:
379 revision = default_rev
[email protected]e28e4982009-09-25 20:51:45380
[email protected]8a139702014-06-20 15:55:01381 if managed:
382 self._DisableHooks()
383
[email protected]eaab7842011-04-28 09:07:58384 if gclient_utils.IsDateRevision(revision):
385 # Date-revisions only work on git-repositories if the reflog hasn't
386 # expired yet. Use rev-list to get the corresponding revision.
387 # git rev-list -n 1 --before='time-stamp' branchname
388 if options.transitive:
[email protected]fe0d1902014-04-08 20:50:44389 self.Print('Warning: --transitive only works for SVN repositories.')
[email protected]eaab7842011-04-28 09:07:58390 revision = default_rev
391
[email protected]d90ba3f2010-02-23 14:42:57392 rev_str = ' at %s' % revision
[email protected]396e1a62013-07-03 19:41:04393 files = [] if file_list is not None else None
[email protected]d90ba3f2010-02-23 14:42:57394
395 printed_path = False
396 verbose = []
[email protected]b1a22bf2009-11-07 02:33:50397 if options.verbose:
[email protected]fe0d1902014-04-08 20:50:44398 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
[email protected]d90ba3f2010-02-23 14:42:57399 verbose = ['--verbose']
400 printed_path = True
401
[email protected]6e7202b2014-09-09 18:23:39402 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
403 if remote_ref:
[email protected]d33eab32014-07-07 19:35:18404 # Rewrite remote refs to their local equivalents.
[email protected]6e7202b2014-09-09 18:23:39405 revision = ''.join(remote_ref)
406 rev_type = "branch"
407 elif revision.startswith('refs/'):
408 # Local branch? We probably don't want to support, since DEPS should
409 # always specify branches as they are in the upstream repo.
[email protected]d33eab32014-07-07 19:35:18410 rev_type = "branch"
411 else:
412 # hash is also a tag, only make a distinction at checkout
413 rev_type = "hash"
414
[email protected]b0a13a22014-06-18 00:52:25415 mirror = self._GetMirror(url, options)
416 if mirror:
417 url = mirror.mirror_path
418
[email protected]1c127382015-02-17 11:15:40419 # If we are going to introduce a new project, there is a possibility that
420 # we are syncing back to a state where the project was originally a
421 # sub-project rolled by DEPS (realistic case: crossing the Blink merge point
422 # syncing backwards, when Blink was a DEPS entry and not part of src.git).
423 # In such case, we might have a backup of the former .git folder, which can
424 # be used to avoid re-fetching the entire repo again (useful for bisects).
425 backup_dir = self.GetGitBackupDirPath()
426 target_dir = os.path.join(self.checkout_path, '.git')
427 if os.path.exists(backup_dir) and not os.path.exists(target_dir):
428 gclient_utils.safe_makedirs(self.checkout_path)
429 os.rename(backup_dir, target_dir)
430 # Reset to a clean state
431 self._Run(['reset', '--hard', 'HEAD'], options)
432
[email protected]6c2b49d2014-02-26 23:57:38433 if (not os.path.exists(self.checkout_path) or
434 (os.path.isdir(self.checkout_path) and
435 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
[email protected]b0a13a22014-06-18 00:52:25436 if mirror:
437 self._UpdateMirror(mirror, options)
[email protected]90fe58b2014-05-01 18:22:00438 try:
[email protected]d33eab32014-07-07 19:35:18439 self._Clone(revision, url, options)
[email protected]90fe58b2014-05-01 18:22:00440 except subprocess2.CalledProcessError:
441 self._DeleteOrMove(options.force)
[email protected]d33eab32014-07-07 19:35:18442 self._Clone(revision, url, options)
[email protected]396e1a62013-07-03 19:41:04443 if file_list is not None:
444 files = self._Capture(['ls-files']).splitlines()
445 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
[email protected]d90ba3f2010-02-23 14:42:57446 if not verbose:
447 # Make the output a little prettier. It's nice to have some whitespace
448 # between projects when cloning.
[email protected]fe0d1902014-04-08 20:50:44449 self.Print('')
[email protected]2702bcd2013-09-24 19:10:07450 return self._Capture(['rev-parse', '--verify', 'HEAD'])
[email protected]e28e4982009-09-25 20:51:45451
[email protected]3dc5cb72014-06-17 15:06:05452 if not managed:
453 self._UpdateBranchHeads(options, fetch=False)
454 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
455 return self._Capture(['rev-parse', '--verify', 'HEAD'])
456
[email protected]30a07982016-04-07 21:35:19457 self._maybe_break_locks(options)
458
[email protected]b0a13a22014-06-18 00:52:25459 if mirror:
460 self._UpdateMirror(mirror, options)
461
[email protected]6c2b49d2014-02-26 23:57:38462 # See if the url has changed (the unittests use git://foo for the url, let
463 # that through).
464 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
465 return_early = False
466 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
467 # unit test pass. (and update the comment above)
468 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
469 # This allows devs to use experimental repos which have a different url
470 # but whose branch(s) are the same as official repos.
[email protected]b09097a2014-04-09 19:09:08471 if (current_url.rstrip('/') != url.rstrip('/') and
[email protected]6c2b49d2014-02-26 23:57:38472 url != 'git://foo' and
473 subprocess2.capture(
474 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
475 cwd=self.checkout_path).strip() != 'False'):
[email protected]fe0d1902014-04-08 20:50:44476 self.Print('_____ switching %s to a new upstream' % self.relpath)
[email protected]78514212014-08-20 23:08:00477 if not (options.force or options.reset):
478 # Make sure it's clean
479 self._CheckClean(rev_str)
[email protected]6c2b49d2014-02-26 23:57:38480 # Switch over to the new upstream
481 self._Run(['remote', 'set-url', self.remote, url], options)
[email protected]8dd35462015-06-08 22:56:05482 if mirror:
483 with open(os.path.join(
484 self.checkout_path, '.git', 'objects', 'info', 'alternates'),
485 'w') as fh:
486 fh.write(os.path.join(url, 'objects'))
[email protected]c438c142015-08-24 22:55:55487 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
[email protected]d33eab32014-07-07 19:35:18488 self._FetchAndReset(revision, file_list, options)
[email protected]c438c142015-08-24 22:55:55489
[email protected]6c2b49d2014-02-26 23:57:38490 return_early = True
[email protected]c438c142015-08-24 22:55:55491 else:
492 self._EnsureValidHeadObjectOrCheckout(revision, options, url)
[email protected]6c2b49d2014-02-26 23:57:38493
[email protected]50fd47f2014-02-13 01:03:19494 if return_early:
495 return self._Capture(['rev-parse', '--verify', 'HEAD'])
496
[email protected]5bde4852009-12-14 16:47:12497 cur_branch = self._GetCurrentBranch()
498
[email protected]d90ba3f2010-02-23 14:42:57499 # Cases:
[email protected]786fb682010-06-02 15:16:23500 # 0) HEAD is detached. Probably from our initial clone.
501 # - make sure HEAD is contained by a named ref, then update.
502 # Cases 1-4. HEAD is a branch.
503 # 1) current branch is not tracking a remote branch (could be git-svn)
504 # - try to rebase onto the new hash or branch
505 # 2) current branch is tracking a remote branch with local committed
506 # changes, but the DEPS file switched to point to a hash
[email protected]d90ba3f2010-02-23 14:42:57507 # - rebase those changes on top of the hash
[email protected]6e7202b2014-09-09 18:23:39508 # 3) current branch is tracking a remote branch w/or w/out changes, and
509 # no DEPS switch
[email protected]d90ba3f2010-02-23 14:42:57510 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
[email protected]6e7202b2014-09-09 18:23:39511 # 4) current branch is tracking a remote branch, but DEPS switches to a
512 # different remote branch, and
513 # a) current branch has no local changes, and --force:
514 # - checkout new branch
515 # b) current branch has local changes, and --force and --reset:
516 # - checkout new branch
517 # c) otherwise exit
[email protected]d90ba3f2010-02-23 14:42:57518
[email protected]81e012c2010-04-29 16:07:24519 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
520 # a tracking branch
[email protected]d90ba3f2010-02-23 14:42:57521 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
522 # or it returns None if it couldn't find an upstream
[email protected]786fb682010-06-02 15:16:23523 if cur_branch is None:
524 upstream_branch = None
525 current_type = "detached"
526 logging.debug("Detached HEAD")
[email protected]d90ba3f2010-02-23 14:42:57527 else:
[email protected]786fb682010-06-02 15:16:23528 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
529 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
530 current_type = "hash"
531 logging.debug("Current branch is not tracking an upstream (remote)"
532 " branch.")
533 elif upstream_branch.startswith('refs/remotes'):
534 current_type = "branch"
535 else:
536 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
[email protected]d90ba3f2010-02-23 14:42:57537
[email protected]d33eab32014-07-07 19:35:18538 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
[email protected]cbd20a42012-06-27 13:49:27539 # Update the remotes first so we have all the refs.
[email protected]a41249c2013-07-03 00:09:12540 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
[email protected]cbd20a42012-06-27 13:49:27541 cwd=self.checkout_path)
[email protected]cbd20a42012-06-27 13:49:27542 if verbose:
[email protected]fe0d1902014-04-08 20:50:44543 self.Print(remote_output)
[email protected]d90ba3f2010-02-23 14:42:57544
[email protected]37ac0e32015-08-18 18:14:38545 self._UpdateBranchHeads(options, fetch=True)
[email protected]e409df62013-04-16 17:28:57546
[email protected]d90ba3f2010-02-23 14:42:57547 # This is a big hammer, debatable if it should even be here...
[email protected]793796d2010-02-19 17:27:41548 if options.force or options.reset:
[email protected]d4fffee2013-06-28 00:35:26549 target = 'HEAD'
550 if options.upstream and upstream_branch:
551 target = upstream_branch
552 self._Run(['reset', '--hard', target], options)
[email protected]d90ba3f2010-02-23 14:42:57553
[email protected]786fb682010-06-02 15:16:23554 if current_type == 'detached':
555 # case 0
556 self._CheckClean(rev_str)
[email protected]f5d37bf2010-09-02 00:50:34557 self._CheckDetachedHead(rev_str, options)
[email protected]d33eab32014-07-07 19:35:18558 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
[email protected]848fd492014-04-09 19:06:44559 self.Print('Up-to-date; skipping checkout.')
560 else:
[email protected]2b7d3ed2014-06-20 18:15:37561 # 'git checkout' may need to overwrite existing untracked files. Allow
562 # it only when nuclear options are enabled.
[email protected]bb424c02014-06-23 22:42:51563 self._Checkout(
564 options,
565 revision,
566 force=(options.force and options.delete_unversioned_trees),
567 quiet=True,
568 )
[email protected]786fb682010-06-02 15:16:23569 if not printed_path:
[email protected]fe0d1902014-04-08 20:50:44570 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
[email protected]786fb682010-06-02 15:16:23571 elif current_type == 'hash':
[email protected]d90ba3f2010-02-23 14:42:57572 # case 1
[email protected]55e724e2010-03-11 19:36:49573 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
[email protected]d90ba3f2010-02-23 14:42:57574 # Our git-svn branch (upstream_branch) is our upstream
[email protected]f5d37bf2010-09-02 00:50:34575 self._AttemptRebase(upstream_branch, files, options,
[email protected]d33eab32014-07-07 19:35:18576 newbase=revision, printed_path=printed_path,
577 merge=options.merge)
[email protected]d90ba3f2010-02-23 14:42:57578 printed_path = True
579 else:
580 # Can't find a merge-base since we don't know our upstream. That makes
581 # this command VERY likely to produce a rebase failure. For now we
582 # assume origin is our upstream since that's what the old behavior was.
[email protected]1a60dca2013-11-26 14:06:26583 upstream_branch = self.remote
[email protected]7080e942010-03-15 15:06:16584 if options.revision or deps_revision:
[email protected]d33eab32014-07-07 19:35:18585 upstream_branch = revision
[email protected]f5d37bf2010-09-02 00:50:34586 self._AttemptRebase(upstream_branch, files, options,
[email protected]30c46d62014-01-23 12:11:56587 printed_path=printed_path, merge=options.merge)
[email protected]d90ba3f2010-02-23 14:42:57588 printed_path = True
[email protected]d33eab32014-07-07 19:35:18589 elif rev_type == 'hash':
[email protected]d90ba3f2010-02-23 14:42:57590 # case 2
[email protected]f5d37bf2010-09-02 00:50:34591 self._AttemptRebase(upstream_branch, files, options,
[email protected]d33eab32014-07-07 19:35:18592 newbase=revision, printed_path=printed_path,
[email protected]30c46d62014-01-23 12:11:56593 merge=options.merge)
[email protected]d90ba3f2010-02-23 14:42:57594 printed_path = True
[email protected]6e7202b2014-09-09 18:23:39595 elif remote_ref and ''.join(remote_ref) != upstream_branch:
[email protected]d90ba3f2010-02-23 14:42:57596 # case 4
[email protected]6e7202b2014-09-09 18:23:39597 new_base = ''.join(remote_ref)
[email protected]d90ba3f2010-02-23 14:42:57598 if not printed_path:
[email protected]fe0d1902014-04-08 20:50:44599 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
[email protected]6e7202b2014-09-09 18:23:39600 switch_error = ("Could not switch upstream branch from %s to %s\n"
[email protected]d90ba3f2010-02-23 14:42:57601 % (upstream_branch, new_base) +
[email protected]6e7202b2014-09-09 18:23:39602 "Please use --force or merge or rebase manually:\n" +
[email protected]d90ba3f2010-02-23 14:42:57603 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
604 "OR git checkout -b <some new branch> %s" % new_base)
[email protected]6e7202b2014-09-09 18:23:39605 force_switch = False
606 if options.force:
607 try:
608 self._CheckClean(rev_str)
609 # case 4a
610 force_switch = True
611 except gclient_utils.Error as e:
612 if options.reset:
613 # case 4b
614 force_switch = True
615 else:
616 switch_error = '%s\n%s' % (e.message, switch_error)
617 if force_switch:
618 self.Print("Switching upstream branch from %s to %s" %
619 (upstream_branch, new_base))
620 switch_branch = 'gclient_' + remote_ref[1]
621 self._Capture(['branch', '-f', switch_branch, new_base])
622 self._Checkout(options, switch_branch, force=True, quiet=True)
623 else:
624 # case 4c
625 raise gclient_utils.Error(switch_error)
[email protected]d90ba3f2010-02-23 14:42:57626 else:
627 # case 3 - the default case
[email protected]396e1a62013-07-03 19:41:04628 if files is not None:
629 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
[email protected]d90ba3f2010-02-23 14:42:57630 if verbose:
[email protected]fe0d1902014-04-08 20:50:44631 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
[email protected]d90ba3f2010-02-23 14:42:57632 try:
[email protected]2aad1b22011-07-22 12:00:41633 merge_args = ['merge']
[email protected]30c46d62014-01-23 12:11:56634 if options.merge:
635 merge_args.append('--ff')
636 else:
[email protected]2aad1b22011-07-22 12:00:41637 merge_args.append('--ff-only')
638 merge_args.append(upstream_branch)
[email protected]fe0d1902014-04-08 20:50:44639 merge_output = self._Capture(merge_args)
[email protected]18fa4542013-05-21 13:30:46640 except subprocess2.CalledProcessError as e:
[email protected]d90ba3f2010-02-23 14:42:57641 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
[email protected]30c46d62014-01-23 12:11:56642 files = []
[email protected]d90ba3f2010-02-23 14:42:57643 if not printed_path:
[email protected]fe0d1902014-04-08 20:50:44644 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
[email protected]d90ba3f2010-02-23 14:42:57645 printed_path = True
646 while True:
[email protected]5b23e872015-02-20 21:25:57647 if not options.auto_rebase:
648 try:
649 action = self._AskForData(
650 'Cannot %s, attempt to rebase? '
651 '(y)es / (q)uit / (s)kip : ' %
652 ('merge' if options.merge else 'fast-forward merge'),
653 options)
654 except ValueError:
655 raise gclient_utils.Error('Invalid Character')
656 if options.auto_rebase or re.match(r'yes|y', action, re.I):
[email protected]f5d37bf2010-09-02 00:50:34657 self._AttemptRebase(upstream_branch, files, options,
[email protected]30c46d62014-01-23 12:11:56658 printed_path=printed_path, merge=False)
[email protected]d90ba3f2010-02-23 14:42:57659 printed_path = True
660 break
661 elif re.match(r'quit|q', action, re.I):
662 raise gclient_utils.Error("Can't fast-forward, please merge or "
663 "rebase manually.\n"
664 "cd %s && git " % self.checkout_path
665 + "rebase %s" % upstream_branch)
666 elif re.match(r'skip|s', action, re.I):
[email protected]fe0d1902014-04-08 20:50:44667 self.Print('Skipping %s' % self.relpath)
[email protected]d90ba3f2010-02-23 14:42:57668 return
669 else:
[email protected]fe0d1902014-04-08 20:50:44670 self.Print('Input not recognized')
[email protected]27c9c8a2014-09-11 19:57:55671 elif re.match("error: Your local changes to '.*' would be "
672 "overwritten by merge. Aborting.\nPlease, commit your "
673 "changes or stash them before you can merge.\n",
[email protected]d90ba3f2010-02-23 14:42:57674 e.stderr):
675 if not printed_path:
[email protected]fe0d1902014-04-08 20:50:44676 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
[email protected]d90ba3f2010-02-23 14:42:57677 printed_path = True
678 raise gclient_utils.Error(e.stderr)
679 else:
680 # Some other problem happened with the merge
681 logging.error("Error during fast-forward merge in %s!" % self.relpath)
[email protected]fe0d1902014-04-08 20:50:44682 self.Print(e.stderr)
[email protected]d90ba3f2010-02-23 14:42:57683 raise
684 else:
685 # Fast-forward merge was successful
686 if not re.match('Already up-to-date.', merge_output) or verbose:
687 if not printed_path:
[email protected]fe0d1902014-04-08 20:50:44688 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
[email protected]d90ba3f2010-02-23 14:42:57689 printed_path = True
[email protected]fe0d1902014-04-08 20:50:44690 self.Print(merge_output.strip())
[email protected]d90ba3f2010-02-23 14:42:57691 if not verbose:
692 # Make the output a little prettier. It's nice to have some
693 # whitespace between projects when syncing.
[email protected]fe0d1902014-04-08 20:50:44694 self.Print('')
[email protected]d90ba3f2010-02-23 14:42:57695
[email protected]396e1a62013-07-03 19:41:04696 if file_list is not None:
697 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
[email protected]5bde4852009-12-14 16:47:12698
699 # If the rebase generated a conflict, abort and ask user to fix
[email protected]786fb682010-06-02 15:16:23700 if self._IsRebasing():
[email protected]5bde4852009-12-14 16:47:12701 raise gclient_utils.Error('\n____ %s%s\n'
702 '\nConflict while rebasing this branch.\n'
703 'Fix the conflict and run gclient again.\n'
704 'See man git-rebase for details.\n'
705 % (self.relpath, rev_str))
706
[email protected]d90ba3f2010-02-23 14:42:57707 if verbose:
[email protected]fe0d1902014-04-08 20:50:44708 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
709 timestamp=False)
[email protected]e28e4982009-09-25 20:51:45710
[email protected]98e69452012-02-16 16:36:43711 # If --reset and --delete_unversioned_trees are specified, remove any
712 # untracked directories.
713 if options.reset and options.delete_unversioned_trees:
714 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
715 # merge-base by default), so doesn't include untracked files. So we use
716 # 'git ls-files --directory --others --exclude-standard' here directly.
717 paths = scm.GIT.Capture(
718 ['ls-files', '--directory', '--others', '--exclude-standard'],
719 self.checkout_path)
720 for path in (p for p in paths.splitlines() if p.endswith('/')):
721 full_path = os.path.join(self.checkout_path, path)
722 if not os.path.islink(full_path):
[email protected]fe0d1902014-04-08 20:50:44723 self.Print('_____ removing unversioned directory %s' % path)
[email protected]dc112ac2013-04-24 13:00:19724 gclient_utils.rmtree(full_path)
[email protected]98e69452012-02-16 16:36:43725
[email protected]2702bcd2013-09-24 19:10:07726 return self._Capture(['rev-parse', '--verify', 'HEAD'])
727
[email protected]98e69452012-02-16 16:36:43728
[email protected]396e1a62013-07-03 19:41:04729 def revert(self, options, _args, file_list):
[email protected]e28e4982009-09-25 20:51:45730 """Reverts local modifications.
731
732 All reverted files will be appended to file_list.
733 """
[email protected]8469bf92010-09-03 19:03:15734 if not os.path.isdir(self.checkout_path):
[email protected]260c6532009-10-28 03:22:35735 # revert won't work if the directory doesn't exist. It needs to
736 # checkout instead.
[email protected]fe0d1902014-04-08 20:50:44737 self.Print('_____ %s is missing, synching instead' % self.relpath)
[email protected]260c6532009-10-28 03:22:35738 # Don't reuse the args.
739 return self.update(options, [], file_list)
[email protected]b2b46312010-04-30 20:58:03740
741 default_rev = "refs/heads/master"
[email protected]d4fffee2013-06-28 00:35:26742 if options.upstream:
743 if self._GetCurrentBranch():
744 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
745 default_rev = upstream_branch or default_rev
[email protected]6e29d572010-06-04 17:32:20746 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
[email protected]b2b46312010-04-30 20:58:03747 if not deps_revision:
748 deps_revision = default_rev
[email protected]d33eab32014-07-07 19:35:18749 if deps_revision.startswith('refs/heads/'):
750 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
[email protected]ef141922015-08-12 17:36:27751 try:
752 deps_revision = self.GetUsableRev(deps_revision, options)
753 except NoUsableRevError as e:
754 # If the DEPS entry's url and hash changed, try to update the origin.
755 # See also http://crbug.com/520067.
756 logging.warn(
757 'Couldn\'t find usable revision, will retrying to update instead: %s',
758 e.message)
759 return self.update(options, [], file_list)
[email protected]b2b46312010-04-30 20:58:03760
[email protected]396e1a62013-07-03 19:41:04761 if file_list is not None:
762 files = self._Capture(['diff', deps_revision, '--name-only']).split()
763
[email protected]37e89872010-09-07 16:11:33764 self._Run(['reset', '--hard', deps_revision], options)
[email protected]ade83db2012-09-27 14:06:49765 self._Run(['clean', '-f', '-d'], options)
[email protected]e28e4982009-09-25 20:51:45766
[email protected]396e1a62013-07-03 19:41:04767 if file_list is not None:
768 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
769
770 def revinfo(self, _options, _args, _file_list):
[email protected]6cafa132010-09-07 14:17:26771 """Returns revision"""
772 return self._Capture(['rev-parse', 'HEAD'])
[email protected]0f282062009-11-06 20:14:02773
[email protected]e28e4982009-09-25 20:51:45774 def runhooks(self, options, args, file_list):
775 self.status(options, args, file_list)
776
[email protected]396e1a62013-07-03 19:41:04777 def status(self, options, _args, file_list):
[email protected]e28e4982009-09-25 20:51:45778 """Display status information."""
779 if not os.path.isdir(self.checkout_path):
[email protected]fe0d1902014-04-08 20:50:44780 self.Print('________ couldn\'t run status in %s:\n'
781 'The directory does not exist.' % self.checkout_path)
[email protected]e28e4982009-09-25 20:51:45782 else:
[email protected]1a60dca2013-11-26 14:06:26783 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
[email protected]fe0d1902014-04-08 20:50:44784 self._Run(['diff', '--name-status', merge_base], options,
785 stdout=self.out_fh)
[email protected]396e1a62013-07-03 19:41:04786 if file_list is not None:
787 files = self._Capture(['diff', '--name-only', merge_base]).split()
788 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
[email protected]e28e4982009-09-25 20:51:45789
[email protected]e5d1e612011-12-19 19:49:19790 def GetUsableRev(self, rev, options):
791 """Finds a useful revision for this repository.
792
793 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
794 will be called on the source."""
795 sha1 = None
[email protected]3830a672013-02-19 20:15:14796 if not os.path.isdir(self.checkout_path):
[email protected]ef141922015-08-12 17:36:27797 raise NoUsableRevError(
[email protected]3830a672013-02-19 20:15:14798 ( 'We could not find a valid hash for safesync_url response "%s".\n'
799 'Safesync URLs with a git checkout currently require the repo to\n'
800 'be cloned without a safesync_url before adding the safesync_url.\n'
801 'For more info, see: '
802 'http://code.google.com/p/chromium/wiki/UsingNewGit'
803 '#Initial_checkout' ) % rev)
804 elif rev.isdigit() and len(rev) < 7:
805 # Handles an SVN rev. As an optimization, only verify an SVN revision as
806 # [0-9]{1,6} for now to avoid making a network request.
[email protected]6c2b49d2014-02-26 23:57:38807 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
[email protected]051c88b2011-12-22 00:23:03808 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
809 if not local_head or local_head < int(rev):
[email protected]2a75fdb2012-02-15 01:32:57810 try:
811 logging.debug('Looking for git-svn configuration optimizations.')
812 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
813 cwd=self.checkout_path):
[email protected]680f2172014-06-25 00:39:32814 self._Fetch(options)
[email protected]2a75fdb2012-02-15 01:32:57815 except subprocess2.CalledProcessError:
816 logging.debug('git config --get svn-remote.svn.fetch failed, '
817 'ignoring possible optimization.')
[email protected]051c88b2011-12-22 00:23:03818 if options.verbose:
[email protected]fe0d1902014-04-08 20:50:44819 self.Print('Running git svn fetch. This might take a while.\n')
[email protected]051c88b2011-12-22 00:23:03820 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
[email protected]312a6a42012-10-11 21:19:42821 try:
[email protected]c51def32012-10-15 18:50:37822 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
823 cwd=self.checkout_path, rev=rev)
[email protected]312a6a42012-10-11 21:19:42824 except gclient_utils.Error, e:
825 sha1 = e.message
[email protected]fe0d1902014-04-08 20:50:44826 self.Print('Warning: Could not find a git revision with accurate\n'
[email protected]312a6a42012-10-11 21:19:42827 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
828 'the closest sane git revision, which is:\n'
829 ' %s\n' % (rev, e.message))
[email protected]051c88b2011-12-22 00:23:03830 if not sha1:
[email protected]ef141922015-08-12 17:36:27831 raise NoUsableRevError(
[email protected]051c88b2011-12-22 00:23:03832 ( 'It appears that either your git-svn remote is incorrectly\n'
833 'configured or the revision in your safesync_url is\n'
834 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
835 'corresponding git hash for SVN rev %s.' ) % rev)
[email protected]3830a672013-02-19 20:15:14836 else:
837 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
838 sha1 = rev
839 else:
840 # May exist in origin, but we don't have it yet, so fetch and look
841 # again.
[email protected]680f2172014-06-25 00:39:32842 self._Fetch(options)
[email protected]3830a672013-02-19 20:15:14843 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
844 sha1 = rev
[email protected]051c88b2011-12-22 00:23:03845
[email protected]e5d1e612011-12-19 19:49:19846 if not sha1:
[email protected]ef141922015-08-12 17:36:27847 raise NoUsableRevError(
[email protected]051c88b2011-12-22 00:23:03848 ( 'We could not find a valid hash for safesync_url response "%s".\n'
849 'Safesync URLs with a git checkout currently require a git-svn\n'
850 'remote or a safesync_url that provides git sha1s. Please add a\n'
851 'git-svn remote or change your safesync_url. For more info, see:\n'
[email protected]e5d1e612011-12-19 19:49:19852 'http://code.google.com/p/chromium/wiki/UsingNewGit'
[email protected]051c88b2011-12-22 00:23:03853 '#Initial_checkout' ) % rev)
854
[email protected]e5d1e612011-12-19 19:49:19855 return sha1
856
[email protected]e6f78352010-01-13 17:05:33857 def FullUrlForRelativeUrl(self, url):
858 # Strip from last '/'
859 # Equivalent to unix basename
860 base_url = self.url
861 return base_url[:base_url.rfind('/')] + url
862
[email protected]1c127382015-02-17 11:15:40863 def GetGitBackupDirPath(self):
864 """Returns the path where the .git folder for the current project can be
865 staged/restored. Use case: subproject moved from DEPS <-> outer project."""
866 return os.path.join(self._root_dir,
867 'old_' + self.relpath.replace(os.sep, '_')) + '.git'
868
[email protected]b0a13a22014-06-18 00:52:25869 def _GetMirror(self, url, options):
870 """Get a git_cache.Mirror object for the argument url."""
871 if not git_cache.Mirror.GetCachePath():
872 return None
[email protected]b1b54572014-04-16 22:29:23873 mirror_kwargs = {
874 'print_func': self.filter,
875 'refs': []
876 }
[email protected]b1b54572014-04-16 22:29:23877 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
878 mirror_kwargs['refs'].append('refs/branch-heads/*')
[email protected]8d3348f2014-08-19 22:49:16879 if hasattr(options, 'with_tags') and options.with_tags:
880 mirror_kwargs['refs'].append('refs/tags/*')
[email protected]b0a13a22014-06-18 00:52:25881 return git_cache.Mirror(url, **mirror_kwargs)
882
883 @staticmethod
884 def _UpdateMirror(mirror, options):
885 """Update a git mirror by fetching the latest commits from the remote."""
[email protected]3ec84f62014-08-22 21:00:22886 if getattr(options, 'shallow', False):
[email protected]46b87412014-05-15 00:42:05887 # HACK(hinoka): These repositories should be super shallow.
[email protected]b0a13a22014-06-18 00:52:25888 if 'flash' in mirror.url:
[email protected]46b87412014-05-15 00:42:05889 depth = 10
890 else:
891 depth = 10000
892 else:
893 depth = None
[email protected]e8bc1aa2015-04-08 08:00:37894 mirror.populate(verbose=options.verbose,
895 bootstrap=not getattr(options, 'no_bootstrap', False),
896 depth=depth,
[email protected]dbb6f822016-02-02 22:59:30897 ignore_lock=getattr(options, 'ignore_locks', False),
898 lock_timeout=getattr(options, 'lock_timeout', 0))
[email protected]848fd492014-04-09 19:06:44899 mirror.unlock()
[email protected]53456aa2013-07-03 19:38:34900
[email protected]f5d37bf2010-09-02 00:50:34901 def _Clone(self, revision, url, options):
[email protected]d90ba3f2010-02-23 14:42:57902 """Clone a git repository from the given URL.
903
[email protected]786fb682010-06-02 15:16:23904 Once we've cloned the repo, we checkout a working branch if the specified
905 revision is a branch head. If it is a tag or a specific commit, then we
906 leave HEAD detached as it makes future updates simpler -- in this case the
907 user should first create a new branch or switch to an existing branch before
908 making changes in the repo."""
[email protected]f5d37bf2010-09-02 00:50:34909 if not options.verbose:
[email protected]d90ba3f2010-02-23 14:42:57910 # git clone doesn't seem to insert a newline properly before printing
911 # to stdout
[email protected]fe0d1902014-04-08 20:50:44912 self.Print('')
[email protected]f1d73eb2014-04-21 17:07:04913 cfg = gclient_utils.DefaultIndexPackConfig(url)
[email protected]8a139702014-06-20 15:55:01914 clone_cmd = cfg + ['clone', '--no-checkout', '--progress']
[email protected]53456aa2013-07-03 19:38:34915 if self.cache_dir:
916 clone_cmd.append('--shared')
[email protected]f5d37bf2010-09-02 00:50:34917 if options.verbose:
[email protected]d90ba3f2010-02-23 14:42:57918 clone_cmd.append('--verbose')
[email protected]3534aa52013-07-20 01:58:08919 clone_cmd.append(url)
[email protected]328c3c72011-06-01 20:50:27920 # If the parent directory does not exist, Git clone on Windows will not
921 # create it, so we need to do it manually.
922 parent_dir = os.path.dirname(self.checkout_path)
[email protected]3534aa52013-07-20 01:58:08923 gclient_utils.safe_makedirs(parent_dir)
[email protected]5439ea52014-08-06 17:18:18924
925 template_dir = None
926 if hasattr(options, 'no_history') and options.no_history:
927 if gclient_utils.IsGitSha(revision):
928 # In the case of a subproject, the pinned sha is not necessarily the
929 # head of the remote branch (so we can't just use --depth=N). Instead,
930 # we tell git to fetch all the remote objects from SHA..HEAD by means of
931 # a template git dir which has a 'shallow' file pointing to the sha.
932 template_dir = tempfile.mkdtemp(
933 prefix='_gclient_gittmp_%s' % os.path.basename(self.checkout_path),
934 dir=parent_dir)
935 self._Run(['init', '--bare', template_dir], options, cwd=self._root_dir)
936 with open(os.path.join(template_dir, 'shallow'), 'w') as template_file:
937 template_file.write(revision)
938 clone_cmd.append('--template=' + template_dir)
939 else:
940 # Otherwise, we're just interested in the HEAD. Just use --depth.
941 clone_cmd.append('--depth=1')
942
[email protected]3534aa52013-07-20 01:58:08943 tmp_dir = tempfile.mkdtemp(
944 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
945 dir=parent_dir)
946 try:
947 clone_cmd.append(tmp_dir)
[email protected]fd5b6382013-10-25 20:54:34948 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
[email protected]3534aa52013-07-20 01:58:08949 gclient_utils.safe_makedirs(self.checkout_path)
[email protected]ef509e42013-09-20 13:19:08950 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
951 os.path.join(self.checkout_path, '.git'))
[email protected]6279e8a2014-02-13 01:45:25952 except:
[email protected]fe0d1902014-04-08 20:50:44953 traceback.print_exc(file=self.out_fh)
[email protected]6279e8a2014-02-13 01:45:25954 raise
[email protected]3534aa52013-07-20 01:58:08955 finally:
956 if os.listdir(tmp_dir):
[email protected]fe0d1902014-04-08 20:50:44957 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
[email protected]3534aa52013-07-20 01:58:08958 gclient_utils.rmtree(tmp_dir)
[email protected]5439ea52014-08-06 17:18:18959 if template_dir:
960 gclient_utils.rmtree(template_dir)
[email protected]1a6bec02014-06-02 21:53:29961 self._UpdateBranchHeads(options, fetch=True)
[email protected]6e7202b2014-09-09 18:23:39962 remote_ref = scm.GIT.RefToRemoteRef(revision, self.remote)
963 self._Checkout(options, ''.join(remote_ref or revision), quiet=True)
[email protected]483a0ba2014-05-30 00:06:07964 if self._GetCurrentBranch() is None:
[email protected]786fb682010-06-02 15:16:23965 # Squelch git's very verbose detached HEAD warning and use our own
[email protected]fe0d1902014-04-08 20:50:44966 self.Print(
[email protected]d33eab32014-07-07 19:35:18967 ('Checked out %s to a detached HEAD. Before making any commits\n'
968 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
969 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
970 'create a new branch for your work.') % (revision, self.remote))
[email protected]d90ba3f2010-02-23 14:42:57971
[email protected]6cd41b62014-04-21 23:55:22972 def _AskForData(self, prompt, options):
[email protected]30c46d62014-01-23 12:11:56973 if options.jobs > 1:
[email protected]6cd41b62014-04-21 23:55:22974 self.Print(prompt)
[email protected]30c46d62014-01-23 12:11:56975 raise gclient_utils.Error("Background task requires input. Rerun "
976 "gclient with --jobs=1 so that\n"
977 "interaction is possible.")
978 try:
979 return raw_input(prompt)
980 except KeyboardInterrupt:
981 # Hide the exception.
982 sys.exit(1)
983
984
[email protected]f5d37bf2010-09-02 00:50:34985 def _AttemptRebase(self, upstream, files, options, newbase=None,
[email protected]30c46d62014-01-23 12:11:56986 branch=None, printed_path=False, merge=False):
[email protected]d90ba3f2010-02-23 14:42:57987 """Attempt to rebase onto either upstream or, if specified, newbase."""
[email protected]396e1a62013-07-03 19:41:04988 if files is not None:
989 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
[email protected]d90ba3f2010-02-23 14:42:57990 revision = upstream
991 if newbase:
992 revision = newbase
[email protected]30c46d62014-01-23 12:11:56993 action = 'merge' if merge else 'rebase'
[email protected]d90ba3f2010-02-23 14:42:57994 if not printed_path:
[email protected]fe0d1902014-04-08 20:50:44995 self.Print('_____ %s : Attempting %s onto %s...' % (
[email protected]30c46d62014-01-23 12:11:56996 self.relpath, action, revision))
[email protected]d90ba3f2010-02-23 14:42:57997 printed_path = True
998 else:
[email protected]fe0d1902014-04-08 20:50:44999 self.Print('Attempting %s onto %s...' % (action, revision))
[email protected]30c46d62014-01-23 12:11:561000
1001 if merge:
1002 merge_output = self._Capture(['merge', revision])
1003 if options.verbose:
[email protected]fe0d1902014-04-08 20:50:441004 self.Print(merge_output)
[email protected]30c46d62014-01-23 12:11:561005 return
[email protected]d90ba3f2010-02-23 14:42:571006
1007 # Build the rebase command here using the args
1008 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
1009 rebase_cmd = ['rebase']
[email protected]f5d37bf2010-09-02 00:50:341010 if options.verbose:
[email protected]d90ba3f2010-02-23 14:42:571011 rebase_cmd.append('--verbose')
1012 if newbase:
1013 rebase_cmd.extend(['--onto', newbase])
1014 rebase_cmd.append(upstream)
1015 if branch:
1016 rebase_cmd.append(branch)
1017
1018 try:
[email protected]ad80e3b2010-09-09 14:18:281019 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:221020 except subprocess2.CalledProcessError, e:
[email protected]ad80e3b2010-09-09 14:18:281021 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
1022 re.match(r'cannot rebase: your index contains uncommitted changes',
1023 e.stderr)):
[email protected]d90ba3f2010-02-23 14:42:571024 while True:
[email protected]30c46d62014-01-23 12:11:561025 rebase_action = self._AskForData(
[email protected]90541732011-04-01 17:54:181026 'Cannot rebase because of unstaged changes.\n'
1027 '\'git reset --hard HEAD\' ?\n'
1028 'WARNING: destroys any uncommitted work in your current branch!'
[email protected]18fa4542013-05-21 13:30:461029 ' (y)es / (q)uit / (s)how : ', options)
[email protected]d90ba3f2010-02-23 14:42:571030 if re.match(r'yes|y', rebase_action, re.I):
[email protected]37e89872010-09-07 16:11:331031 self._Run(['reset', '--hard', 'HEAD'], options)
[email protected]d90ba3f2010-02-23 14:42:571032 # Should this be recursive?
[email protected]ad80e3b2010-09-09 14:18:281033 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
[email protected]d90ba3f2010-02-23 14:42:571034 break
1035 elif re.match(r'quit|q', rebase_action, re.I):
1036 raise gclient_utils.Error("Please merge or rebase manually\n"
1037 "cd %s && git " % self.checkout_path
1038 + "%s" % ' '.join(rebase_cmd))
1039 elif re.match(r'show|s', rebase_action, re.I):
[email protected]fe0d1902014-04-08 20:50:441040 self.Print('%s' % e.stderr.strip())
[email protected]d90ba3f2010-02-23 14:42:571041 continue
1042 else:
1043 gclient_utils.Error("Input not recognized")
1044 continue
1045 elif re.search(r'^CONFLICT', e.stdout, re.M):
1046 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
1047 "Fix the conflict and run gclient again.\n"
1048 "See 'man git-rebase' for details.\n")
1049 else:
[email protected]fe0d1902014-04-08 20:50:441050 self.Print(e.stdout.strip())
1051 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
[email protected]d90ba3f2010-02-23 14:42:571052 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
1053 "manually.\ncd %s && git " %
1054 self.checkout_path
1055 + "%s" % ' '.join(rebase_cmd))
1056
[email protected]fe0d1902014-04-08 20:50:441057 self.Print(rebase_output.strip())
[email protected]f5d37bf2010-09-02 00:50:341058 if not options.verbose:
[email protected]d90ba3f2010-02-23 14:42:571059 # Make the output a little prettier. It's nice to have some
1060 # whitespace between projects when syncing.
[email protected]fe0d1902014-04-08 20:50:441061 self.Print('')
[email protected]d90ba3f2010-02-23 14:42:571062
[email protected]6e29d572010-06-04 17:32:201063 @staticmethod
1064 def _CheckMinVersion(min_version):
[email protected]d0f854a2010-03-11 19:35:531065 (ok, current_version) = scm.GIT.AssertVersion(min_version)
1066 if not ok:
1067 raise gclient_utils.Error('git version %s < minimum required %s' %
1068 (current_version, min_version))
[email protected]923a0372009-12-11 20:42:431069
[email protected]c438c142015-08-24 22:55:551070 def _EnsureValidHeadObjectOrCheckout(self, revision, options, url):
1071 # Special case handling if all 3 conditions are met:
1072 # * the mirros have recently changed, but deps destination remains same,
1073 # * the git histories of mirrors are conflicting.
1074 # * git cache is used
1075 # This manifests itself in current checkout having invalid HEAD commit on
1076 # most git operations. Since git cache is used, just deleted the .git
1077 # folder, and re-create it by cloning.
1078 try:
1079 self._Capture(['rev-list', '-n', '1', 'HEAD'])
1080 except subprocess2.CalledProcessError as e:
1081 if ('fatal: bad object HEAD' in e.stderr
1082 and self.cache_dir and self.cache_dir in url):
1083 self.Print((
1084 'Likely due to DEPS change with git cache_dir, '
1085 'the current commit points to no longer existing object.\n'
1086 '%s' % e)
1087 )
1088 self._DeleteOrMove(options.force)
1089 self._Clone(revision, url, options)
1090 else:
1091 raise
1092
[email protected]786fb682010-06-02 15:16:231093 def _IsRebasing(self):
1094 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
1095 # have a plumbing command to determine whether a rebase is in progress, so
1096 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
1097 g = os.path.join(self.checkout_path, '.git')
1098 return (
1099 os.path.isdir(os.path.join(g, "rebase-merge")) or
1100 os.path.isdir(os.path.join(g, "rebase-apply")))
1101
1102 def _CheckClean(self, rev_str):
[email protected]d9b318c2015-12-04 20:03:081103 lockfile = os.path.join(self.checkout_path, ".git", "index.lock")
1104 if os.path.exists(lockfile):
1105 raise gclient_utils.Error(
1106 '\n____ %s%s\n'
1107 '\tYour repo is locked, possibly due to a concurrent git process.\n'
1108 '\tIf no git executable is running, then clean up %r and try again.\n'
1109 % (self.relpath, rev_str, lockfile))
1110
[email protected]786fb682010-06-02 15:16:231111 # Make sure the tree is clean; see git-rebase.sh for reference
1112 try:
1113 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
[email protected]ad80e3b2010-09-09 14:18:281114 cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:221115 except subprocess2.CalledProcessError:
[email protected]6e29d572010-06-04 17:32:201116 raise gclient_utils.Error('\n____ %s%s\n'
1117 '\tYou have unstaged changes.\n'
1118 '\tPlease commit, stash, or reset.\n'
1119 % (self.relpath, rev_str))
[email protected]786fb682010-06-02 15:16:231120 try:
1121 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
[email protected]27c9c8a2014-09-11 19:57:551122 '--ignore-submodules', 'HEAD', '--'],
[email protected]ad80e3b2010-09-09 14:18:281123 cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:221124 except subprocess2.CalledProcessError:
[email protected]6e29d572010-06-04 17:32:201125 raise gclient_utils.Error('\n____ %s%s\n'
1126 '\tYour index contains uncommitted changes\n'
1127 '\tPlease commit, stash, or reset.\n'
1128 % (self.relpath, rev_str))
[email protected]786fb682010-06-02 15:16:231129
[email protected]396e1a62013-07-03 19:41:041130 def _CheckDetachedHead(self, rev_str, _options):
[email protected]786fb682010-06-02 15:16:231131 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1132 # reference by a commit). If not, error out -- most likely a rebase is
1133 # in progress, try to detect so we can give a better error.
1134 try:
[email protected]ad80e3b2010-09-09 14:18:281135 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1136 cwd=self.checkout_path)
[email protected]bffad372011-09-08 17:54:221137 except subprocess2.CalledProcessError:
[email protected]786fb682010-06-02 15:16:231138 # Commit is not contained by any rev. See if the user is rebasing:
1139 if self._IsRebasing():
1140 # Punt to the user
1141 raise gclient_utils.Error('\n____ %s%s\n'
1142 '\tAlready in a conflict, i.e. (no branch).\n'
1143 '\tFix the conflict and run gclient again.\n'
1144 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1145 '\tSee man git-rebase for details.\n'
1146 % (self.relpath, rev_str))
1147 # Let's just save off the commit so we can proceed.
[email protected]6cafa132010-09-07 14:17:261148 name = ('saved-by-gclient-' +
1149 self._Capture(['rev-parse', '--short', 'HEAD']))
[email protected]77bd7362013-09-25 23:46:141150 self._Capture(['branch', '-f', name])
[email protected]fe0d1902014-04-08 20:50:441151 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
[email protected]f5d37bf2010-09-02 00:50:341152 name)
[email protected]786fb682010-06-02 15:16:231153
[email protected]5bde4852009-12-14 16:47:121154 def _GetCurrentBranch(self):
[email protected]786fb682010-06-02 15:16:231155 # Returns name of current branch or None for detached HEAD
[email protected]6cafa132010-09-07 14:17:261156 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
[email protected]786fb682010-06-02 15:16:231157 if branch == 'HEAD':
[email protected]5bde4852009-12-14 16:47:121158 return None
1159 return branch
1160
[email protected]c3e09d22014-04-10 13:58:181161 def _Capture(self, args, **kwargs):
[email protected]fe0d1902014-04-08 20:50:441162 kwargs.setdefault('cwd', self.checkout_path)
1163 kwargs.setdefault('stderr', subprocess2.PIPE)
[email protected]6d8115d2014-04-23 20:59:231164 env = scm.GIT.ApplyEnvVars(kwargs)
1165 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
[email protected]6cafa132010-09-07 14:17:261166
[email protected]bb424c02014-06-23 22:42:511167 def _Checkout(self, options, ref, force=False, quiet=None):
1168 """Performs a 'git-checkout' operation.
1169
1170 Args:
1171 options: The configured option set
1172 ref: (str) The branch/commit to checkout
1173 quiet: (bool/None) Whether or not the checkout shoud pass '--quiet'; if
1174 'None', the behavior is inferred from 'options.verbose'.
1175 Returns: (str) The output of the checkout operation
1176 """
1177 if quiet is None:
1178 quiet = (not options.verbose)
1179 checkout_args = ['checkout']
1180 if force:
1181 checkout_args.append('--force')
1182 if quiet:
1183 checkout_args.append('--quiet')
1184 checkout_args.append(ref)
1185 return self._Capture(checkout_args)
1186
[email protected]680f2172014-06-25 00:39:321187 def _Fetch(self, options, remote=None, prune=False, quiet=False):
1188 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
1189 fetch_cmd = cfg + [
1190 'fetch',
1191 remote or self.remote,
1192 ]
1193
1194 if prune:
1195 fetch_cmd.append('--prune')
1196 if options.verbose:
1197 fetch_cmd.append('--verbose')
1198 elif quiet:
1199 fetch_cmd.append('--quiet')
1200 self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
1201
1202 # Return the revision that was fetched; this will be stored in 'FETCH_HEAD'
1203 return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])
1204
[email protected]e409df62013-04-16 17:28:571205 def _UpdateBranchHeads(self, options, fetch=False):
[email protected]8d3348f2014-08-19 22:49:161206 """Adds, and optionally fetches, "branch-heads" and "tags" refspecs
1207 if requested."""
1208 need_fetch = fetch
[email protected]e409df62013-04-16 17:28:571209 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
[email protected]1a60dca2013-11-26 14:06:261210 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
[email protected]f2d7d6b2013-10-17 20:41:431211 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1212 '^\\+refs/branch-heads/\\*:.*$']
1213 self._Run(config_cmd, options)
[email protected]8d3348f2014-08-19 22:49:161214 need_fetch = True
1215 if hasattr(options, 'with_tags') and options.with_tags:
1216 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
1217 '+refs/tags/*:refs/tags/*',
1218 '^\\+refs/tags/\\*:.*$']
1219 self._Run(config_cmd, options)
1220 need_fetch = True
1221 if fetch and need_fetch:
1222 self._Fetch(options)
[email protected]e409df62013-04-16 17:28:571223
[email protected]680f2172014-06-25 00:39:321224 def _Run(self, args, options, show_header=True, **kwargs):
1225 # Disable 'unused options' warning | pylint: disable=W0613
[email protected]2cd0b8e2014-09-22 21:17:591226 kwargs.setdefault('cwd', self.checkout_path)
[email protected]fe0d1902014-04-08 20:50:441227 kwargs.setdefault('stdout', self.out_fh)
[email protected]848fd492014-04-09 19:06:441228 kwargs['filter_fn'] = self.filter
[email protected]fe0d1902014-04-08 20:50:441229 kwargs.setdefault('print_stdout', False)
[email protected]6d8115d2014-04-23 20:59:231230 env = scm.GIT.ApplyEnvVars(kwargs)
[email protected]772efaf2014-04-01 02:35:441231 cmd = ['git'] + args
[email protected]680f2172014-06-25 00:39:321232 if show_header:
[email protected]2cd0b8e2014-09-22 21:17:591233 gclient_utils.CheckCallAndFilterAndHeader(cmd, env=env, **kwargs)
1234 else:
1235 gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
[email protected]e28e4982009-09-25 20:51:451236
1237
[email protected]55e724e2010-03-11 19:36:491238class SVNWrapper(SCMWrapper):
[email protected]cb5442b2009-09-22 16:51:241239 """ Wrapper for SVN """
[email protected]2702bcd2013-09-24 19:10:071240 name = 'svn'
[email protected]79d62372015-06-01 18:50:551241 _PRINTED_DEPRECATION = False
1242
1243 _MESSAGE = (
1244 'Oh hai! You are using subversion. Chrome infra is eager to get rid of',
1245 'svn support so please switch to git.',
1246 'Tracking bug: http://crbug.com/475320',
[email protected]9e18dee2015-07-28 07:22:211247 'If you are a project owner, you may request git migration assistance at: ',
[email protected]ecc37952015-06-02 09:36:431248 ' https://code.google.com/p/chromium/issues/entry?template=Infra-Git')
[email protected]79d62372015-06-01 18:50:551249
1250 def __init__(self, *args, **kwargs):
1251 super(SVNWrapper, self).__init__(*args, **kwargs)
[email protected]ecc37952015-06-02 09:36:431252 suppress_deprecated_notice = os.environ.get(
1253 'SUPPRESS_DEPRECATED_SVN_NOTICE', False)
1254 if not SVNWrapper._PRINTED_DEPRECATION and not suppress_deprecated_notice:
[email protected]79d62372015-06-01 18:50:551255 SVNWrapper._PRINTED_DEPRECATION = True
1256 sys.stderr.write('\n'.join(self._MESSAGE) + '\n')
[email protected]5f3eee32009-09-17 00:34:301257
[email protected]9e3e82c2012-04-18 12:55:431258 @staticmethod
1259 def BinaryExists():
1260 """Returns true if the command exists."""
1261 try:
1262 result, version = scm.SVN.AssertVersion('1.4')
1263 if not result:
1264 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1265 return result
1266 except OSError:
1267 return False
1268
[email protected]885a9602013-05-31 09:54:401269 def GetCheckoutRoot(self):
1270 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1271
[email protected]eaab7842011-04-28 09:07:581272 def GetRevisionDate(self, revision):
1273 """Returns the given revision's date in ISO-8601 format (which contains the
1274 time zone)."""
[email protected]d579fcf2011-12-13 20:36:031275 date = scm.SVN.Capture(
1276 ['propget', '--revprop', 'svn:date', '-r', revision],
1277 os.path.join(self.checkout_path, '.'))
[email protected]eaab7842011-04-28 09:07:581278 return date.strip()
1279
[email protected]396e1a62013-07-03 19:41:041280 def cleanup(self, options, args, _file_list):
[email protected]5f3eee32009-09-17 00:34:301281 """Cleanup working copy."""
[email protected]669600d2010-09-01 19:06:311282 self._Run(['cleanup'] + args, options)
[email protected]5f3eee32009-09-17 00:34:301283
[email protected]396e1a62013-07-03 19:41:041284 def diff(self, options, args, _file_list):
[email protected]5f3eee32009-09-17 00:34:301285 # NOTE: This function does not currently modify file_list.
[email protected]8469bf92010-09-03 19:03:151286 if not os.path.isdir(self.checkout_path):
1287 raise gclient_utils.Error('Directory %s is not present.' %
1288 self.checkout_path)
[email protected]669600d2010-09-01 19:06:311289 self._Run(['diff'] + args, options)
[email protected]5f3eee32009-09-17 00:34:301290
[email protected]396e1a62013-07-03 19:41:041291 def pack(self, _options, args, _file_list):
[email protected]ee4071d2009-12-22 22:25:371292 """Generates a patch file which can be applied to the root of the
1293 repository."""
[email protected]8469bf92010-09-03 19:03:151294 if not os.path.isdir(self.checkout_path):
1295 raise gclient_utils.Error('Directory %s is not present.' %
1296 self.checkout_path)
1297 gclient_utils.CheckCallAndFilter(
1298 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1299 cwd=self.checkout_path,
1300 print_stdout=False,
[email protected]255f2be2014-12-05 22:19:551301 filter_fn=SvnDiffFilterer(self.relpath, print_func=self.Print).Filter)
[email protected]ee4071d2009-12-22 22:25:371302
[email protected]5f3eee32009-09-17 00:34:301303 def update(self, options, args, file_list):
[email protected]d6504212010-01-13 17:34:311304 """Runs svn to update or transparently checkout the working copy.
[email protected]5f3eee32009-09-17 00:34:301305
1306 All updated files will be appended to file_list.
1307
1308 Raises:
1309 Error: if can't get URL for relative path.
1310 """
[email protected]b09097a2014-04-09 19:09:081311 # Only update if hg is not controlling the directory.
[email protected]6c2b49d2014-02-26 23:57:381312 hg_path = os.path.join(self.checkout_path, '.hg')
1313 if os.path.exists(hg_path):
[email protected]fe0d1902014-04-08 20:50:441314 self.Print('________ found .hg directory; skipping %s' % self.relpath)
[email protected]6c2b49d2014-02-26 23:57:381315 return
1316
[email protected]5f3eee32009-09-17 00:34:301317 if args:
1318 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1319
[email protected]8e0e9262010-08-17 19:20:271320 # revision is the revision to match. It is None if no revision is specified,
1321 # i.e. the 'deps ain't pinned'.
[email protected]ac915bb2009-11-13 17:03:011322 url, revision = gclient_utils.SplitUrlRevision(self.url)
[email protected]50fd47f2014-02-13 01:03:191323 # Keep the original unpinned url for reference in case the repo is switched.
1324 base_url = url
[email protected]eb2756d2011-09-20 20:17:511325 managed = True
[email protected]5f3eee32009-09-17 00:34:301326 if options.revision:
1327 # Override the revision number.
[email protected]ac915bb2009-11-13 17:03:011328 revision = str(options.revision)
[email protected]5f3eee32009-09-17 00:34:301329 if revision:
[email protected]eb2756d2011-09-20 20:17:511330 if revision != 'unmanaged':
1331 forced_revision = True
1332 # Reconstruct the url.
1333 url = '%s@%s' % (url, revision)
1334 rev_str = ' at %s' % revision
1335 else:
1336 managed = False
1337 revision = None
[email protected]8e0e9262010-08-17 19:20:271338 else:
1339 forced_revision = False
1340 rev_str = ''
[email protected]5f3eee32009-09-17 00:34:301341
[email protected]d0b0a5b2014-03-10 19:30:211342 exists = os.path.exists(self.checkout_path)
[email protected]7ff04292014-03-10 12:57:251343 if exists and managed:
[email protected]b09097a2014-04-09 19:09:081344 # Git is only okay if it's a git-svn checkout of the right repo.
1345 if scm.GIT.IsGitSvn(self.checkout_path):
1346 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1347 'svn-remote.svn.url'],
1348 cwd=self.checkout_path).rstrip()
1349 if remote_url.rstrip('/') == base_url.rstrip('/'):
[email protected]b2256212014-05-07 20:57:281350 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1351 % self.relpath)
[email protected]b09097a2014-04-09 19:09:081352 return # TODO(borenet): Get the svn revision number?
1353
1354 # Get the existing scm url and the revision number of the current checkout.
1355 if exists and managed:
[email protected]13349e22012-11-15 17:11:281356 try:
1357 from_info = scm.SVN.CaptureLocalInfo(
1358 [], os.path.join(self.checkout_path, '.'))
1359 except (gclient_utils.Error, subprocess2.CalledProcessError):
[email protected]b09097a2014-04-09 19:09:081360 self._DeleteOrMove(options.force)
1361 exists = False
[email protected]13349e22012-11-15 17:11:281362
[email protected]2f2ca142014-01-07 03:59:181363 BASE_URLS = {
1364 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1365 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1366 }
[email protected]ca35be32014-01-17 01:48:181367 WHITELISTED_ROOTS = [
1368 'svn://svn.chromium.org',
1369 'svn://svn-mirror.golo.chromium.org',
1370 ]
[email protected]13349e22012-11-15 17:11:281371 if not exists:
[email protected]2f2ca142014-01-07 03:59:181372 try:
1373 # Split out the revision number since it's not useful for us.
1374 base_path = urlparse.urlparse(url).path.split('@')[0]
[email protected]ca35be32014-01-17 01:48:181375 # Check to see if we're on a whitelisted root. We do this because
1376 # only some svn servers have matching UUIDs.
1377 local_parsed = urlparse.urlparse(url)
1378 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
[email protected]2f2ca142014-01-07 03:59:181379 if ('CHROME_HEADLESS' in os.environ
1380 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
[email protected]ca35be32014-01-17 01:48:181381 and base_path in BASE_URLS
1382 and local_root in WHITELISTED_ROOTS):
1383
[email protected]2f2ca142014-01-07 03:59:181384 # Use a tarball for initial sync if we are on a bot.
1385 # Get an unauthenticated gsutil instance.
1386 gsutil = download_from_google_storage.Gsutil(
1387 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1388
1389 gs_path = BASE_URLS[base_path]
1390 _, out, _ = gsutil.check_call('ls', gs_path)
1391 # So that we can get the most recent revision.
1392 sorted_items = sorted(out.splitlines())
1393 latest_checkout = sorted_items[-1]
1394
1395 tempdir = tempfile.mkdtemp()
[email protected]fe0d1902014-04-08 20:50:441396 self.Print('Downloading %s...' % latest_checkout)
[email protected]2f2ca142014-01-07 03:59:181397 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1398 if code:
[email protected]fe0d1902014-04-08 20:50:441399 self.Print('%s\n%s' % (out, err))
[email protected]2f2ca142014-01-07 03:59:181400 raise Exception()
1401 filename = latest_checkout.split('/')[-1]
1402 tarball = os.path.join(tempdir, filename)
[email protected]fe0d1902014-04-08 20:50:441403 self.Print('Unpacking into %s...' % self.checkout_path)
[email protected]2f2ca142014-01-07 03:59:181404 gclient_utils.safe_makedirs(self.checkout_path)
1405 # TODO(hinoka): Use 7z for windows.
1406 cmd = ['tar', '--extract', '--ungzip',
1407 '--directory', self.checkout_path,
1408 '--file', tarball]
1409 gclient_utils.CheckCallAndFilter(
1410 cmd, stdout=sys.stdout, print_stdout=True)
1411
[email protected]fe0d1902014-04-08 20:50:441412 self.Print('Deleting temp file')
[email protected]2f2ca142014-01-07 03:59:181413 gclient_utils.rmtree(tempdir)
1414
1415 # Rewrite the repository root to match.
1416 tarball_url = scm.SVN.CaptureLocalInfo(
1417 ['.'], self.checkout_path)['Repository Root']
1418 tarball_parsed = urlparse.urlparse(tarball_url)
1419 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1420 tarball_parsed.netloc)
[email protected]2f2ca142014-01-07 03:59:181421
1422 if tarball_root != local_root:
[email protected]fe0d1902014-04-08 20:50:441423 self.Print('Switching repository root to %s' % local_root)
[email protected]2f2ca142014-01-07 03:59:181424 self._Run(['switch', '--relocate', tarball_root,
1425 local_root, self.checkout_path],
1426 options)
1427 except Exception as e:
[email protected]fe0d1902014-04-08 20:50:441428 self.Print('We tried to get a source tarball but failed.')
1429 self.Print('Resuming normal operations.')
1430 self.Print(str(e))
[email protected]2f2ca142014-01-07 03:59:181431
[email protected]6c48a302011-10-20 23:44:201432 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
[email protected]5f3eee32009-09-17 00:34:301433 # We need to checkout.
[email protected]8469bf92010-09-03 19:03:151434 command = ['checkout', url, self.checkout_path]
[email protected]8e0e9262010-08-17 19:20:271435 command = self._AddAdditionalUpdateFlags(command, options, revision)
[email protected]669600d2010-09-01 19:06:311436 self._RunAndGetFileList(command, options, file_list, self._root_dir)
[email protected]2702bcd2013-09-24 19:10:071437 return self.Svnversion()
[email protected]5f3eee32009-09-17 00:34:301438
[email protected]6c2b49d2014-02-26 23:57:381439 if not managed:
[email protected]fe0d1902014-04-08 20:50:441440 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
[email protected]b09097a2014-04-09 19:09:081441 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1442 return self.Svnversion()
1443 return
[email protected]6c2b49d2014-02-26 23:57:381444
[email protected]49fcb0c2011-09-23 14:34:381445 if 'URL' not in from_info:
1446 raise gclient_utils.Error(
1447 ('gclient is confused. Couldn\'t get the url for %s.\n'
1448 'Try using @unmanaged.\n%s') % (
1449 self.checkout_path, from_info))
1450
[email protected]3031d732014-04-21 22:18:021451 # Look for locked directories.
1452 dir_info = scm.SVN.CaptureStatus(
1453 None, os.path.join(self.checkout_path, '.'))
1454 if any(d[0][2] == 'L' for d in dir_info):
1455 try:
1456 self._Run(['cleanup', self.checkout_path], options)
1457 except subprocess2.CalledProcessError, e:
1458 # Get the status again, svn cleanup may have cleaned up at least
1459 # something.
1460 dir_info = scm.SVN.CaptureStatus(
1461 None, os.path.join(self.checkout_path, '.'))
1462
[email protected]d558c4b2011-09-22 18:56:241463 # Try to fix the failures by removing troublesome files.
1464 for d in dir_info:
1465 if d[0][2] == 'L':
1466 if d[0][0] == '!' and options.force:
[email protected]1580d952013-08-19 07:31:401467 # We don't pass any files/directories to CaptureStatus and set
1468 # cwd=self.checkout_path, so we should get relative paths here.
1469 assert not os.path.isabs(d[1])
1470 path_to_remove = os.path.normpath(
1471 os.path.join(self.checkout_path, d[1]))
[email protected]fe0d1902014-04-08 20:50:441472 self.Print('Removing troublesome path %s' % path_to_remove)
[email protected]1580d952013-08-19 07:31:401473 gclient_utils.rmtree(path_to_remove)
[email protected]d558c4b2011-09-22 18:56:241474 else:
[email protected]fe0d1902014-04-08 20:50:441475 self.Print(
1476 'Not removing troublesome path %s automatically.' % d[1])
[email protected]d558c4b2011-09-22 18:56:241477 if d[0][0] == '!':
[email protected]fe0d1902014-04-08 20:50:441478 self.Print('You can pass --force to enable automatic removal.')
[email protected]d558c4b2011-09-22 18:56:241479 raise e
[email protected]e407c9a2010-08-09 19:11:371480
[email protected]8e0e9262010-08-17 19:20:271481 # Retrieve the current HEAD version because svn is slow at null updates.
1482 if options.manually_grab_svn_rev and not revision:
[email protected]d579fcf2011-12-13 20:36:031483 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
[email protected]8e0e9262010-08-17 19:20:271484 revision = str(from_info_live['Revision'])
1485 rev_str = ' at %s' % revision
[email protected]5f3eee32009-09-17 00:34:301486
[email protected]b09097a2014-04-09 19:09:081487 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
[email protected]6c2b49d2014-02-26 23:57:381488 # The repository url changed, need to switch.
1489 try:
1490 to_info = scm.SVN.CaptureRemoteInfo(url)
1491 except (gclient_utils.Error, subprocess2.CalledProcessError):
1492 # The url is invalid or the server is not accessible, it's safer to bail
1493 # out right now.
1494 raise gclient_utils.Error('This url is unreachable: %s' % url)
1495 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1496 and (from_info['UUID'] == to_info['UUID']))
1497 if can_switch:
[email protected]fe0d1902014-04-08 20:50:441498 self.Print('_____ relocating %s to a new checkout' % self.relpath)
[email protected]6c2b49d2014-02-26 23:57:381499 # We have different roots, so check if we can switch --relocate.
1500 # Subversion only permits this if the repository UUIDs match.
1501 # Perform the switch --relocate, then rewrite the from_url
1502 # to reflect where we "are now." (This is the same way that
1503 # Subversion itself handles the metadata when switch --relocate
1504 # is used.) This makes the checks below for whether we
1505 # can update to a revision or have to switch to a different
1506 # branch work as expected.
1507 # TODO(maruel): TEST ME !
1508 command = ['switch', '--relocate',
1509 from_info['Repository Root'],
1510 to_info['Repository Root'],
1511 self.relpath]
1512 self._Run(command, options, cwd=self._root_dir)
1513 from_info['URL'] = from_info['URL'].replace(
1514 from_info['Repository Root'],
1515 to_info['Repository Root'])
1516 else:
1517 if not options.force and not options.reset:
1518 # Look for local modifications but ignore unversioned files.
1519 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1520 if status[0][0] != '?':
1521 raise gclient_utils.Error(
1522 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1523 'there is local changes in %s. Delete the directory and '
1524 'try again.') % (url, self.checkout_path))
1525 # Ok delete it.
[email protected]fe0d1902014-04-08 20:50:441526 self.Print('_____ switching %s to a new checkout' % self.relpath)
[email protected]6c2b49d2014-02-26 23:57:381527 gclient_utils.rmtree(self.checkout_path)
1528 # We need to checkout.
1529 command = ['checkout', url, self.checkout_path]
1530 command = self._AddAdditionalUpdateFlags(command, options, revision)
1531 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1532 return self.Svnversion()
1533
[email protected]5f3eee32009-09-17 00:34:301534 # If the provided url has a revision number that matches the revision
1535 # number of the existing directory, then we don't need to bother updating.
[email protected]2e0c6852009-09-24 00:02:071536 if not options.force and str(from_info['Revision']) == revision:
[email protected]5f3eee32009-09-17 00:34:301537 if options.verbose or not forced_revision:
[email protected]fe0d1902014-04-08 20:50:441538 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
[email protected]98e69452012-02-16 16:36:431539 else:
1540 command = ['update', self.checkout_path]
1541 command = self._AddAdditionalUpdateFlags(command, options, revision)
1542 self._RunAndGetFileList(command, options, file_list, self._root_dir)
[email protected]5f3eee32009-09-17 00:34:301543
[email protected]98e69452012-02-16 16:36:431544 # If --reset and --delete_unversioned_trees are specified, remove any
1545 # untracked files and directories.
1546 if options.reset and options.delete_unversioned_trees:
1547 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1548 full_path = os.path.join(self.checkout_path, status[1])
1549 if (status[0][0] == '?'
1550 and os.path.isdir(full_path)
1551 and not os.path.islink(full_path)):
[email protected]fe0d1902014-04-08 20:50:441552 self.Print('_____ removing unversioned directory %s' % status[1])
[email protected]dc112ac2013-04-24 13:00:191553 gclient_utils.rmtree(full_path)
[email protected]2702bcd2013-09-24 19:10:071554 return self.Svnversion()
[email protected]5f3eee32009-09-17 00:34:301555
[email protected]4b5b1772010-04-08 01:52:561556 def updatesingle(self, options, args, file_list):
[email protected]4b5b1772010-04-08 01:52:561557 filename = args.pop()
[email protected]57564662010-04-14 02:35:121558 if scm.SVN.AssertVersion("1.5")[0]:
[email protected]8469bf92010-09-03 19:03:151559 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
[email protected]57564662010-04-14 02:35:121560 # Create an empty checkout and then update the one file we want. Future
1561 # operations will only apply to the one file we checked out.
[email protected]8469bf92010-09-03 19:03:151562 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
[email protected]669600d2010-09-01 19:06:311563 self._Run(command, options, cwd=self._root_dir)
[email protected]8469bf92010-09-03 19:03:151564 if os.path.exists(os.path.join(self.checkout_path, filename)):
1565 os.remove(os.path.join(self.checkout_path, filename))
[email protected]57564662010-04-14 02:35:121566 command = ["update", filename]
[email protected]669600d2010-09-01 19:06:311567 self._RunAndGetFileList(command, options, file_list)
[email protected]57564662010-04-14 02:35:121568 # After the initial checkout, we can use update as if it were any other
1569 # dep.
1570 self.update(options, args, file_list)
1571 else:
1572 # If the installed version of SVN doesn't support --depth, fallback to
1573 # just exporting the file. This has the downside that revision
1574 # information is not stored next to the file, so we will have to
1575 # re-export the file every time we sync.
[email protected]8469bf92010-09-03 19:03:151576 if not os.path.exists(self.checkout_path):
[email protected]6c48a302011-10-20 23:44:201577 gclient_utils.safe_makedirs(self.checkout_path)
[email protected]57564662010-04-14 02:35:121578 command = ["export", os.path.join(self.url, filename),
[email protected]8469bf92010-09-03 19:03:151579 os.path.join(self.checkout_path, filename)]
[email protected]8e0e9262010-08-17 19:20:271580 command = self._AddAdditionalUpdateFlags(command, options,
1581 options.revision)
[email protected]669600d2010-09-01 19:06:311582 self._Run(command, options, cwd=self._root_dir)
[email protected]4b5b1772010-04-08 01:52:561583
[email protected]396e1a62013-07-03 19:41:041584 def revert(self, options, _args, file_list):
[email protected]5f3eee32009-09-17 00:34:301585 """Reverts local modifications. Subversion specific.
1586
1587 All reverted files will be appended to file_list, even if Subversion
1588 doesn't know about them.
1589 """
[email protected]8469bf92010-09-03 19:03:151590 if not os.path.isdir(self.checkout_path):
[email protected]c0cc0872011-10-12 17:02:411591 if os.path.exists(self.checkout_path):
1592 gclient_utils.rmtree(self.checkout_path)
[email protected]5f3eee32009-09-17 00:34:301593 # svn revert won't work if the directory doesn't exist. It needs to
1594 # checkout instead.
[email protected]fe0d1902014-04-08 20:50:441595 self.Print('_____ %s is missing, synching instead' % self.relpath)
[email protected]5f3eee32009-09-17 00:34:301596 # Don't reuse the args.
1597 return self.update(options, [], file_list)
1598
[email protected]c0cc0872011-10-12 17:02:411599 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
[email protected]50fd47f2014-02-13 01:03:191600 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
[email protected]fe0d1902014-04-08 20:50:441601 self.Print('________ found .git directory; skipping %s' % self.relpath)
[email protected]50fd47f2014-02-13 01:03:191602 return
[email protected]6c2b49d2014-02-26 23:57:381603 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
[email protected]fe0d1902014-04-08 20:50:441604 self.Print('________ found .hg directory; skipping %s' % self.relpath)
[email protected]6c2b49d2014-02-26 23:57:381605 return
[email protected]c0cc0872011-10-12 17:02:411606 if not options.force:
1607 raise gclient_utils.Error('Invalid checkout path, aborting')
[email protected]fe0d1902014-04-08 20:50:441608 self.Print(
[email protected]c0cc0872011-10-12 17:02:411609 '\n_____ %s is not a valid svn checkout, synching instead' %
1610 self.relpath)
1611 gclient_utils.rmtree(self.checkout_path)
1612 # Don't reuse the args.
1613 return self.update(options, [], file_list)
1614
[email protected]07ab60e2011-02-08 21:54:001615 def printcb(file_status):
[email protected]396e1a62013-07-03 19:41:041616 if file_list is not None:
1617 file_list.append(file_status[1])
[email protected]aa3dd472009-09-21 19:02:481618 if logging.getLogger().isEnabledFor(logging.INFO):
[email protected]07ab60e2011-02-08 21:54:001619 logging.info('%s%s' % (file_status[0], file_status[1]))
[email protected]aa3dd472009-09-21 19:02:481620 else:
[email protected]fe0d1902014-04-08 20:50:441621 self.Print(os.path.join(self.checkout_path, file_status[1]))
[email protected]07ab60e2011-02-08 21:54:001622 scm.SVN.Revert(self.checkout_path, callback=printcb)
[email protected]aa3dd472009-09-21 19:02:481623
[email protected]8b322b32011-11-01 19:05:501624 # Revert() may delete the directory altogether.
1625 if not os.path.isdir(self.checkout_path):
1626 # Don't reuse the args.
1627 return self.update(options, [], file_list)
1628
[email protected]810a50b2009-10-05 23:03:181629 try:
1630 # svn revert is so broken we don't even use it. Using
1631 # "svn up --revision BASE" achieve the same effect.
[email protected]07ab60e2011-02-08 21:54:001632 # file_list will contain duplicates.
[email protected]669600d2010-09-01 19:06:311633 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1634 file_list)
[email protected]810a50b2009-10-05 23:03:181635 except OSError, e:
[email protected]07ab60e2011-02-08 21:54:001636 # Maybe the directory disapeared meanwhile. Do not throw an exception.
[email protected]810a50b2009-10-05 23:03:181637 logging.error('Failed to update:\n%s' % str(e))
[email protected]5f3eee32009-09-17 00:34:301638
[email protected]396e1a62013-07-03 19:41:041639 def revinfo(self, _options, _args, _file_list):
[email protected]0f282062009-11-06 20:14:021640 """Display revision"""
[email protected]54019f32010-09-09 13:50:111641 try:
1642 return scm.SVN.CaptureRevision(self.checkout_path)
[email protected]31cb48a2011-04-04 18:01:361643 except (gclient_utils.Error, subprocess2.CalledProcessError):
[email protected]54019f32010-09-09 13:50:111644 return None
[email protected]0f282062009-11-06 20:14:021645
[email protected]cb5442b2009-09-22 16:51:241646 def runhooks(self, options, args, file_list):
1647 self.status(options, args, file_list)
1648
[email protected]5f3eee32009-09-17 00:34:301649 def status(self, options, args, file_list):
1650 """Display status information."""
[email protected]669600d2010-09-01 19:06:311651 command = ['status'] + args
[email protected]8469bf92010-09-03 19:03:151652 if not os.path.isdir(self.checkout_path):
[email protected]5f3eee32009-09-17 00:34:301653 # svn status won't work if the directory doesn't exist.
[email protected]fe0d1902014-04-08 20:50:441654 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
[email protected]77e4eca2010-09-21 13:23:071655 'The directory does not exist.') %
1656 (' '.join(command), self.checkout_path))
[email protected]5f3eee32009-09-17 00:34:301657 # There's no file list to retrieve.
1658 else:
[email protected]669600d2010-09-01 19:06:311659 self._RunAndGetFileList(command, options, file_list)
[email protected]e6f78352010-01-13 17:05:331660
[email protected]396e1a62013-07-03 19:41:041661 def GetUsableRev(self, rev, _options):
[email protected]e5d1e612011-12-19 19:49:191662 """Verifies the validity of the revision for this repository."""
1663 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
[email protected]ef141922015-08-12 17:36:271664 raise NoUsableRevError(
[email protected]e5d1e612011-12-19 19:49:191665 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1666 'correct.') % rev)
1667 return rev
1668
[email protected]e6f78352010-01-13 17:05:331669 def FullUrlForRelativeUrl(self, url):
1670 # Find the forth '/' and strip from there. A bit hackish.
1671 return '/'.join(self.url.split('/')[:4]) + url
[email protected]99828122010-06-04 01:41:021672
[email protected]669600d2010-09-01 19:06:311673 def _Run(self, args, options, **kwargs):
1674 """Runs a commands that goes to stdout."""
[email protected]8469bf92010-09-03 19:03:151675 kwargs.setdefault('cwd', self.checkout_path)
[email protected]669600d2010-09-01 19:06:311676 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
[email protected]77e4eca2010-09-21 13:23:071677 always=options.verbose, **kwargs)
[email protected]669600d2010-09-01 19:06:311678
[email protected]2702bcd2013-09-24 19:10:071679 def Svnversion(self):
1680 """Runs the lowest checked out revision in the current project."""
1681 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1682 return info['Revision']
1683
[email protected]669600d2010-09-01 19:06:311684 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1685 """Runs a commands that goes to stdout and grabs the file listed."""
[email protected]8469bf92010-09-03 19:03:151686 cwd = cwd or self.checkout_path
[email protected]ce117f62011-01-17 20:04:251687 scm.SVN.RunAndGetFileList(
1688 options.verbose,
1689 args + ['--ignore-externals'],
1690 cwd=cwd,
[email protected]77e4eca2010-09-21 13:23:071691 file_list=file_list)
[email protected]669600d2010-09-01 19:06:311692
[email protected]6e29d572010-06-04 17:32:201693 @staticmethod
[email protected]8e0e9262010-08-17 19:20:271694 def _AddAdditionalUpdateFlags(command, options, revision):
[email protected]99828122010-06-04 01:41:021695 """Add additional flags to command depending on what options are set.
1696 command should be a list of strings that represents an svn command.
1697
1698 This method returns a new list to be used as a command."""
1699 new_command = command[:]
1700 if revision:
1701 new_command.extend(['--revision', str(revision).strip()])
[email protected]36ac2392011-10-12 16:36:111702 # We don't want interaction when jobs are used.
1703 if options.jobs > 1:
1704 new_command.append('--non-interactive')
[email protected]99828122010-06-04 01:41:021705 # --force was added to 'svn update' in svn 1.5.
[email protected]36ac2392011-10-12 16:36:111706 # --accept was added to 'svn update' in svn 1.6.
1707 if not scm.SVN.AssertVersion('1.5')[0]:
1708 return new_command
1709
1710 # It's annoying to have it block in the middle of a sync, just sensible
1711 # defaults.
1712 if options.force:
[email protected]99828122010-06-04 01:41:021713 new_command.append('--force')
[email protected]36ac2392011-10-12 16:36:111714 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1715 new_command.extend(('--accept', 'theirs-conflict'))
1716 elif options.manually_grab_svn_rev:
1717 new_command.append('--force')
1718 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1719 new_command.extend(('--accept', 'postpone'))
1720 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1721 new_command.extend(('--accept', 'postpone'))
[email protected]99828122010-06-04 01:41:021722 return new_command