blob: 0389f466203b86413e0253ab9095d4cd422fe8ad [file] [log] [blame]
steveblock@chromium.org93567042012-02-15 01:02:26 +00001# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00004
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00005"""Gclient-specific SCM-specific operations."""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00006
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00007import collections
maruel@chromium.org754960e2009-09-21 12:31:05 +00008import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00009import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000010import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000011import re
maruel@chromium.org90541732011-04-01 17:54:18 +000012import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000013import tempfile
iannucci@chromium.org53456aa2013-07-03 19:38:34 +000014import threading
zty@chromium.org6279e8a2014-02-13 01:45:25 +000015import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000016import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000017
hinoka@google.com2f2ca142014-01-07 03:59:18 +000018import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000019import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000020import scm
21import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000022
23
szager@chromium.org71cbb502013-04-19 23:30:15 +000024THIS_FILE_PATH = os.path.abspath(__file__)
25
hinoka@google.com2f2ca142014-01-07 03:59:18 +000026GSUTIL_DEFAULT_PATH = os.path.join(
27 os.path.dirname(os.path.abspath(__file__)),
28 'third_party', 'gsutil', 'gsutil')
29
szager@chromium.org71cbb502013-04-19 23:30:15 +000030
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000031class DiffFiltererWrapper(object):
32 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000033 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000034 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000035 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000036 original_prefix = "--- "
37 working_prefix = "+++ "
38
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000039 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000040 # Note that we always use '/' as the path separator to be
41 # consistent with svn's cygwin-style output on Windows
42 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000043 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000044
maruel@chromium.org6e29d572010-06-04 17:32:20 +000045 def SetCurrentFile(self, current_file):
46 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000047
iannucci@chromium.org3830a672013-02-19 20:15:14 +000048 @property
49 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000050 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000051
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000052 def _Replace(self, line):
53 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000054
55 def Filter(self, line):
56 if (line.startswith(self.index_string)):
57 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000058 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000059 else:
60 if (line.startswith(self.original_prefix) or
61 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000062 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000063 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000064
65
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000066class SvnDiffFilterer(DiffFiltererWrapper):
67 index_string = "Index: "
68
69
70class GitDiffFilterer(DiffFiltererWrapper):
71 index_string = "diff --git "
72
73 def SetCurrentFile(self, current_file):
74 # Get filename by parsing "a/<filename> b/<filename>"
75 self._current_file = current_file[:(len(current_file)/2)][2:]
76
77 def _Replace(self, line):
78 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
79
80
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000081### SCM abstraction layer
82
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000083# Factory Method for SCM wrapper creation
84
maruel@chromium.org9eda4112010-06-11 18:56:10 +000085def GetScmName(url):
86 if url:
87 url, _ = gclient_utils.SplitUrlRevision(url)
88 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000089 url.startswith('git+http://') or url.startswith('git+https://') or
mariakhomenko@chromium.orga2ede5c2014-02-05 22:05:17 +000090 url.endswith('.git') or url.startswith('sso://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000091 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000092 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000093 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000094 return 'svn'
95 return None
96
97
98def CreateSCM(url, root_dir=None, relpath=None):
99 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000100 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000101 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000102 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000103
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000104 scm_name = GetScmName(url)
105 if not scm_name in SCM_MAP:
106 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000107 scm_class = SCM_MAP[scm_name]
108 if not scm_class.BinaryExists():
109 raise gclient_utils.Error('%s command not found' % scm_name)
110 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000111
112
113# SCMWrapper base class
114
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000115class SCMWrapper(object):
116 """Add necessary glue between all the supported SCM.
117
msb@chromium.orgd6504212010-01-13 17:34:31 +0000118 This is the abstraction layer to bind to different SCM.
119 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000120 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000121 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000122 self._root_dir = root_dir
123 if self._root_dir:
124 self._root_dir = self._root_dir.replace('/', os.sep)
125 self.relpath = relpath
126 if self.relpath:
127 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000128 if self.relpath and self._root_dir:
129 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000130
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000131 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000132 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000133 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000134
135 if not command in commands:
136 raise gclient_utils.Error('Unknown command %s' % command)
137
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000138 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000139 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000140 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000141
142 return getattr(self, command)(options, args, file_list)
143
144
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000145class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000146 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000147 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000148 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000149
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000150 cache_dir = None
151 # If a given cache is used in a solution more than once, prevent multiple
152 # threads from updating it simultaneously.
153 cache_locks = collections.defaultdict(threading.Lock)
154
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000155 def __init__(self, url=None, root_dir=None, relpath=None):
156 """Removes 'git+' fake prefix from git URL."""
157 if url.startswith('git+http://') or url.startswith('git+https://'):
158 url = url[4:]
159 SCMWrapper.__init__(self, url, root_dir, relpath)
160
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000161 @staticmethod
162 def BinaryExists():
163 """Returns true if the command exists."""
164 try:
165 # We assume git is newer than 1.7. See: crbug.com/114483
166 result, version = scm.GIT.AssertVersion('1.7')
167 if not result:
168 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
169 return result
170 except OSError:
171 return False
172
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000173 def GetCheckoutRoot(self):
174 return scm.GIT.GetCheckoutRoot(self.checkout_path)
175
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000176 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000177 """Returns the given revision's date in ISO-8601 format (which contains the
178 time zone)."""
179 # TODO(floitsch): get the time-stamp of the given revision and not just the
180 # time-stamp of the currently checked out revision.
181 return self._Capture(['log', '-n', '1', '--format=%ai'])
182
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000183 @staticmethod
184 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000185 """'Cleanup' the repo.
186
187 There's no real git equivalent for the svn cleanup command, do a no-op.
188 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000189
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000190 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000191 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000192 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000193
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000194 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000195 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000196 repository.
197
198 The patch file is generated from a diff of the merge base of HEAD and
199 its upstream branch.
200 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000201 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000202 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000203 ['git', 'diff', merge_base],
204 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000205 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000206
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000207 def UpdateSubmoduleConfig(self):
208 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000209 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000210 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000211 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000212 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000213 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000214 kwargs = {'cwd': self.checkout_path,
215 'print_stdout': False,
216 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000217 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000218 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
219 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000220 except subprocess2.CalledProcessError:
221 # Not a fatal error, or even very interesting in a non-git-submodule
222 # world. So just keep it quiet.
223 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000224 try:
225 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
226 except subprocess2.CalledProcessError:
227 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000228
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000229 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
230
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000231 def _FetchAndReset(self, revision, file_list, options):
232 """Equivalent to git fetch; git reset."""
233 quiet = []
234 if not options.verbose:
235 quiet = ['--quiet']
236 self._UpdateBranchHeads(options, fetch=False)
237
238 fetch_cmd = [
239 '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote, '--prune']
240 self._Run(fetch_cmd + quiet, options, retry=True)
241 self._Run(['reset', '--hard', revision] + quiet, options)
242 self.UpdateSubmoduleConfig()
243 if file_list is not None:
244 files = self._Capture(['ls-files']).splitlines()
245 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
246
msb@chromium.orge28e4982009-09-25 20:51:45 +0000247 def update(self, options, args, file_list):
248 """Runs git to update or transparently checkout the working copy.
249
250 All updated files will be appended to file_list.
251
252 Raises:
253 Error: if can't get URL for relative path.
254 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000255 if args:
256 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
257
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000258 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000259
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000260 # If a dependency is not pinned, track the default remote branch.
261 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000262 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000263 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000264 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000265 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000266 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000267 # Override the revision number.
268 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000269 if revision == 'unmanaged':
270 revision = None
271 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000272 if not revision:
273 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000274
floitsch@google.comeaab7842011-04-28 09:07:58 +0000275 if gclient_utils.IsDateRevision(revision):
276 # Date-revisions only work on git-repositories if the reflog hasn't
277 # expired yet. Use rev-list to get the corresponding revision.
278 # git rev-list -n 1 --before='time-stamp' branchname
279 if options.transitive:
280 print('Warning: --transitive only works for SVN repositories.')
281 revision = default_rev
282
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000283 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000284 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000285
286 printed_path = False
287 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000288 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000289 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000290 verbose = ['--verbose']
291 printed_path = True
292
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000293 url = self._CreateOrUpdateCache(url, options)
294
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000295 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000296 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000297 elif revision.startswith(self.remote + '/'):
298 # For compatibility with old naming, translate 'origin' to 'refs/heads'
299 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000300 rev_type = "branch"
301 else:
302 # hash is also a tag, only make a distinction at checkout
303 rev_type = "hash"
304
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000305 if (not os.path.exists(self.checkout_path) or
306 (os.path.isdir(self.checkout_path) and
307 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000308 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000309 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000310 if file_list is not None:
311 files = self._Capture(['ls-files']).splitlines()
312 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000313 if not verbose:
314 # Make the output a little prettier. It's nice to have some whitespace
315 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000316 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000317 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000318
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000319 if not managed:
320 self._UpdateBranchHeads(options, fetch=False)
321 self.UpdateSubmoduleConfig()
322 print ('________ unmanaged solution; skipping %s' % self.relpath)
323 return self._Capture(['rev-parse', '--verify', 'HEAD'])
324
325 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
326 raise gclient_utils.Error('\n____ %s%s\n'
327 '\tPath is not a git repo. No .git dir.\n'
328 '\tTo resolve:\n'
329 '\t\trm -rf %s\n'
330 '\tAnd run gclient sync again\n'
331 % (self.relpath, rev_str, self.relpath))
332
333 # See if the url has changed (the unittests use git://foo for the url, let
334 # that through).
335 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
336 return_early = False
337 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
338 # unit test pass. (and update the comment above)
339 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
340 # This allows devs to use experimental repos which have a different url
341 # but whose branch(s) are the same as official repos.
342 if (current_url != url and
343 url != 'git://foo' and
344 subprocess2.capture(
345 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
346 cwd=self.checkout_path).strip() != 'False'):
347 print('_____ switching %s to a new upstream' % self.relpath)
348 # Make sure it's clean
349 self._CheckClean(rev_str)
350 # Switch over to the new upstream
351 self._Run(['remote', 'set-url', self.remote, url], options)
352 self._FetchAndReset(revision, file_list, options)
353 return_early = True
354
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000355 # Need to do this in the normal path as well as in the post-remote-switch
356 # path.
357 self._PossiblySwitchCache(url, options)
358
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000359 if return_early:
360 return self._Capture(['rev-parse', '--verify', 'HEAD'])
361
msb@chromium.org5bde4852009-12-14 16:47:12 +0000362 cur_branch = self._GetCurrentBranch()
363
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000364 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000365 # 0) HEAD is detached. Probably from our initial clone.
366 # - make sure HEAD is contained by a named ref, then update.
367 # Cases 1-4. HEAD is a branch.
368 # 1) current branch is not tracking a remote branch (could be git-svn)
369 # - try to rebase onto the new hash or branch
370 # 2) current branch is tracking a remote branch with local committed
371 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000372 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000373 # 3) current branch is tracking a remote branch w/or w/out changes,
374 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000375 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000376 # 4) current branch is tracking a remote branch, switches to a different
377 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000378 # - exit
379
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000380 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
381 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000382 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
383 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000384 if cur_branch is None:
385 upstream_branch = None
386 current_type = "detached"
387 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000388 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000389 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
390 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
391 current_type = "hash"
392 logging.debug("Current branch is not tracking an upstream (remote)"
393 " branch.")
394 elif upstream_branch.startswith('refs/remotes'):
395 current_type = "branch"
396 else:
397 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000398
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000399 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000400 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000401 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000402 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000403 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000404 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000405
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000406 self._UpdateBranchHeads(options, fetch=True)
407
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000408 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000409 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000410 target = 'HEAD'
411 if options.upstream and upstream_branch:
412 target = upstream_branch
413 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000414
msb@chromium.org786fb682010-06-02 15:16:23 +0000415 if current_type == 'detached':
416 # case 0
417 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000418 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000419 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000420 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000421 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000422 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000424 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000425 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000426 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000427 newbase=revision, printed_path=printed_path,
428 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000429 printed_path = True
430 else:
431 # Can't find a merge-base since we don't know our upstream. That makes
432 # this command VERY likely to produce a rebase failure. For now we
433 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000434 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000435 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000436 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000437 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000438 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000439 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000440 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000441 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000442 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000443 newbase=revision, printed_path=printed_path,
444 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000445 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000446 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000447 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000448 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000449 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000450 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000451 switch_error = ("Switching upstream branch from %s to %s\n"
452 % (upstream_branch, new_base) +
453 "Please merge or rebase manually:\n" +
454 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
455 "OR git checkout -b <some new branch> %s" % new_base)
456 raise gclient_utils.Error(switch_error)
457 else:
458 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000459 if files is not None:
460 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000461 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000462 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000463 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000464 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000465 if options.merge:
466 merge_args.append('--ff')
467 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000468 merge_args.append('--ff-only')
469 merge_args.append(upstream_branch)
470 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000471 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000472 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000473 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000475 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 printed_path = True
477 while True:
478 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000479 action = self._AskForData(
480 'Cannot %s, attempt to rebase? '
481 '(y)es / (q)uit / (s)kip : ' %
482 ('merge' if options.merge else 'fast-forward merge'),
483 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000484 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000485 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000486 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000487 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000488 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000489 printed_path = True
490 break
491 elif re.match(r'quit|q', action, re.I):
492 raise gclient_utils.Error("Can't fast-forward, please merge or "
493 "rebase manually.\n"
494 "cd %s && git " % self.checkout_path
495 + "rebase %s" % upstream_branch)
496 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000497 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 return
499 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000500 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000501 elif re.match("error: Your local changes to '.*' would be "
502 "overwritten by merge. Aborting.\nPlease, commit your "
503 "changes or stash them before you can merge.\n",
504 e.stderr):
505 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000506 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000507 printed_path = True
508 raise gclient_utils.Error(e.stderr)
509 else:
510 # Some other problem happened with the merge
511 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000512 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000513 raise
514 else:
515 # Fast-forward merge was successful
516 if not re.match('Already up-to-date.', merge_output) or verbose:
517 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000518 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000519 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000520 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 if not verbose:
522 # Make the output a little prettier. It's nice to have some
523 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000524 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000525
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000526 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000527 if file_list is not None:
528 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000529
530 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000531 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000532 raise gclient_utils.Error('\n____ %s%s\n'
533 '\nConflict while rebasing this branch.\n'
534 'Fix the conflict and run gclient again.\n'
535 'See man git-rebase for details.\n'
536 % (self.relpath, rev_str))
537
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000538 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000539 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000540
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000541 # If --reset and --delete_unversioned_trees are specified, remove any
542 # untracked directories.
543 if options.reset and options.delete_unversioned_trees:
544 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
545 # merge-base by default), so doesn't include untracked files. So we use
546 # 'git ls-files --directory --others --exclude-standard' here directly.
547 paths = scm.GIT.Capture(
548 ['ls-files', '--directory', '--others', '--exclude-standard'],
549 self.checkout_path)
550 for path in (p for p in paths.splitlines() if p.endswith('/')):
551 full_path = os.path.join(self.checkout_path, path)
552 if not os.path.islink(full_path):
553 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000554 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000555
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000556 return self._Capture(['rev-parse', '--verify', 'HEAD'])
557
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000558
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000559 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000560 """Reverts local modifications.
561
562 All reverted files will be appended to file_list.
563 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000564 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000565 # revert won't work if the directory doesn't exist. It needs to
566 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000567 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000568 # Don't reuse the args.
569 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000570
571 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000572 if options.upstream:
573 if self._GetCurrentBranch():
574 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
575 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000576 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000577 if not deps_revision:
578 deps_revision = default_rev
579 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000580 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000581 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000582
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000583 if file_list is not None:
584 files = self._Capture(['diff', deps_revision, '--name-only']).split()
585
maruel@chromium.org37e89872010-09-07 16:11:33 +0000586 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000587 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000588
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000589 if file_list is not None:
590 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
591
592 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000593 """Returns revision"""
594 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000595
msb@chromium.orge28e4982009-09-25 20:51:45 +0000596 def runhooks(self, options, args, file_list):
597 self.status(options, args, file_list)
598
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000599 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000600 """Display status information."""
601 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000602 print(('\n________ couldn\'t run status in %s:\n'
603 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000604 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000605 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000606 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000607 if file_list is not None:
608 files = self._Capture(['diff', '--name-only', merge_base]).split()
609 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000610
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000611 def GetUsableRev(self, rev, options):
612 """Finds a useful revision for this repository.
613
614 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
615 will be called on the source."""
616 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000617 if not os.path.isdir(self.checkout_path):
618 raise gclient_utils.Error(
619 ( 'We could not find a valid hash for safesync_url response "%s".\n'
620 'Safesync URLs with a git checkout currently require the repo to\n'
621 'be cloned without a safesync_url before adding the safesync_url.\n'
622 'For more info, see: '
623 'http://code.google.com/p/chromium/wiki/UsingNewGit'
624 '#Initial_checkout' ) % rev)
625 elif rev.isdigit() and len(rev) < 7:
626 # Handles an SVN rev. As an optimization, only verify an SVN revision as
627 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000628 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000629 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
630 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000631 try:
632 logging.debug('Looking for git-svn configuration optimizations.')
633 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
634 cwd=self.checkout_path):
635 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
636 except subprocess2.CalledProcessError:
637 logging.debug('git config --get svn-remote.svn.fetch failed, '
638 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000639 if options.verbose:
640 print('Running git svn fetch. This might take a while.\n')
641 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000642 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000643 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
644 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000645 except gclient_utils.Error, e:
646 sha1 = e.message
647 print('\nWarning: Could not find a git revision with accurate\n'
648 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
649 'the closest sane git revision, which is:\n'
650 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000651 if not sha1:
652 raise gclient_utils.Error(
653 ( 'It appears that either your git-svn remote is incorrectly\n'
654 'configured or the revision in your safesync_url is\n'
655 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
656 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000657 else:
658 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
659 sha1 = rev
660 else:
661 # May exist in origin, but we don't have it yet, so fetch and look
662 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000663 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000664 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
665 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000666
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000667 if not sha1:
668 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000669 ( 'We could not find a valid hash for safesync_url response "%s".\n'
670 'Safesync URLs with a git checkout currently require a git-svn\n'
671 'remote or a safesync_url that provides git sha1s. Please add a\n'
672 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000673 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000674 '#Initial_checkout' ) % rev)
675
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000676 return sha1
677
msb@chromium.orge6f78352010-01-13 17:05:33 +0000678 def FullUrlForRelativeUrl(self, url):
679 # Strip from last '/'
680 # Equivalent to unix basename
681 base_url = self.url
682 return base_url[:base_url.rfind('/')] + url
683
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000684 @staticmethod
685 def _NormalizeGitURL(url):
686 '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
687 idx = url.find('://')
688 if idx != -1:
689 url = url[idx+3:]
690 if not url.endswith('.git'):
691 url += '.git'
692 return url
693
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000694 def _PossiblySwitchCache(self, url, options):
695 """Handles switching a repo from with-cache to direct, or vice versa.
696
697 When we go from direct to with-cache, the remote url changes from the
698 'real' url to the local file url (in cache_dir). Therefore, this function
699 assumes that |url| points to the correctly-switched-over local file url, if
700 we're in cache_mode.
701
702 When we go from with-cache to direct, assume that the normal url-switching
703 code already flipped the remote over, and we just need to repack and break
704 the dependency to the cache.
705 """
706
707 altfile = os.path.join(
708 self.checkout_path, '.git', 'objects', 'info', 'alternates')
709 if self.cache_dir:
710 if not os.path.exists(altfile):
711 try:
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000712 with open(altfile, 'w') as f:
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000713 f.write(os.path.join(url, 'objects'))
714 # pylint: disable=C0301
715 # This dance is necessary according to emperical evidence, also at:
716 # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
717 self._Run(['repack', '-ad'], options)
718 self._Run(['repack', '-adl'], options)
719 except Exception:
720 # If something goes wrong, try to remove the altfile so we'll go down
721 # this path again next time.
722 try:
723 os.remove(altfile)
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000724 except OSError as e:
725 print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000726 raise
727 else:
728 if os.path.exists(altfile):
729 self._Run(['repack', '-a'], options)
730 os.remove(altfile)
731
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000732 def _CreateOrUpdateCache(self, url, options):
733 """Make a new git mirror or update existing mirror for |url|, and return the
734 mirror URI to clone from.
735
736 If no cache-dir is specified, just return |url| unchanged.
737 """
738 if not self.cache_dir:
739 return url
740
741 # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
742 folder = os.path.join(
743 self.cache_dir,
744 self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000745 altfile = os.path.join(folder, 'objects', 'info', 'alternates')
746
747 # If we're bringing an old cache up to date or cloning a new cache, and the
748 # existing repo is currently a direct clone, use its objects to help out
749 # the fetch here.
750 checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
751 checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
752 use_reference = (
753 os.path.exists(checkout_objects) and
754 not os.path.exists(checkout_altfile))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000755
756 v = ['-v'] if options.verbose else []
757 filter_fn = lambda l: '[up to date]' not in l
758 with self.cache_locks[folder]:
759 gclient_utils.safe_makedirs(self.cache_dir)
760 if not os.path.exists(os.path.join(folder, 'config')):
761 gclient_utils.rmtree(folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000762 cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
hinoka@google.com78d78f32014-02-11 23:25:31 +0000763 '--progress', '--bare']
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000764
765 if use_reference:
766 cmd += ['--reference', os.path.abspath(self.checkout_path)]
767
768 self._Run(cmd + [url, folder],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000769 options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000770 else:
771 # For now, assert that host/path/to/repo.git is identical. We may want
772 # to relax this restriction in the future to allow for smarter cache
773 # repo update schemes (such as pulling the same repo, but from a
774 # different host).
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000775 existing_url = self._Capture(['config', 'remote.%s.url' % self.remote],
776 cwd=folder)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000777 assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
778
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000779 if use_reference:
780 with open(altfile, 'w') as f:
781 f.write(os.path.abspath(checkout_objects))
782
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000783 # Would normally use `git remote update`, but it doesn't support
784 # --progress, so use fetch instead.
785 self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000786 options, filter_fn=filter_fn, cwd=folder, retry=True)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000787
788 # If the clone has an object dependency on the existing repo, break it
789 # with repack and remove the linkage.
790 if os.path.exists(altfile):
791 self._Run(['repack', '-a'], options, cwd=folder)
792 os.remove(altfile)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000793 return folder
794
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000795 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000796 """Clone a git repository from the given URL.
797
msb@chromium.org786fb682010-06-02 15:16:23 +0000798 Once we've cloned the repo, we checkout a working branch if the specified
799 revision is a branch head. If it is a tag or a specific commit, then we
800 leave HEAD detached as it makes future updates simpler -- in this case the
801 user should first create a new branch or switch to an existing branch before
802 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000803 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000804 # git clone doesn't seem to insert a newline properly before printing
805 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000806 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000807 template_path = os.path.join(
808 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000809 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
810 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000811 if self.cache_dir:
812 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000813 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000814 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000815 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000816 # If the parent directory does not exist, Git clone on Windows will not
817 # create it, so we need to do it manually.
818 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000819 gclient_utils.safe_makedirs(parent_dir)
820 tmp_dir = tempfile.mkdtemp(
821 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
822 dir=parent_dir)
823 try:
824 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000825 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000826 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000827 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
828 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000829 except:
830 traceback.print_exc(file=sys.stderr)
831 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000832 finally:
833 if os.listdir(tmp_dir):
834 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
835 gclient_utils.rmtree(tmp_dir)
836 if revision.startswith('refs/heads/'):
837 self._Run(
838 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
839 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000840 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000841 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000842 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000843 ('Checked out %s to a detached HEAD. Before making any commits\n'
844 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000845 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
846 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000847
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000848 @staticmethod
849 def _AskForData(prompt, options):
850 if options.jobs > 1:
851 raise gclient_utils.Error("Background task requires input. Rerun "
852 "gclient with --jobs=1 so that\n"
853 "interaction is possible.")
854 try:
855 return raw_input(prompt)
856 except KeyboardInterrupt:
857 # Hide the exception.
858 sys.exit(1)
859
860
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000861 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000862 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000863 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000864 if files is not None:
865 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000866 revision = upstream
867 if newbase:
868 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000869 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000870 if not printed_path:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000871 print('\n_____ %s : Attempting %s onto %s...' % (
872 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000873 printed_path = True
874 else:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000875 print('Attempting %s onto %s...' % (action, revision))
876
877 if merge:
878 merge_output = self._Capture(['merge', revision])
879 if options.verbose:
880 print(merge_output)
881 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000882
883 # Build the rebase command here using the args
884 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
885 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000886 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000887 rebase_cmd.append('--verbose')
888 if newbase:
889 rebase_cmd.extend(['--onto', newbase])
890 rebase_cmd.append(upstream)
891 if branch:
892 rebase_cmd.append(branch)
893
894 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000895 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000896 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000897 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
898 re.match(r'cannot rebase: your index contains uncommitted changes',
899 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000900 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000901 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000902 'Cannot rebase because of unstaged changes.\n'
903 '\'git reset --hard HEAD\' ?\n'
904 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000905 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000906 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000907 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000908 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000909 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000910 break
911 elif re.match(r'quit|q', rebase_action, re.I):
912 raise gclient_utils.Error("Please merge or rebase manually\n"
913 "cd %s && git " % self.checkout_path
914 + "%s" % ' '.join(rebase_cmd))
915 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000916 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000917 continue
918 else:
919 gclient_utils.Error("Input not recognized")
920 continue
921 elif re.search(r'^CONFLICT', e.stdout, re.M):
922 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
923 "Fix the conflict and run gclient again.\n"
924 "See 'man git-rebase' for details.\n")
925 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000926 print(e.stdout.strip())
927 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000928 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
929 "manually.\ncd %s && git " %
930 self.checkout_path
931 + "%s" % ' '.join(rebase_cmd))
932
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000933 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000934 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000935 # Make the output a little prettier. It's nice to have some
936 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000937 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000938
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000939 @staticmethod
940 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000941 (ok, current_version) = scm.GIT.AssertVersion(min_version)
942 if not ok:
943 raise gclient_utils.Error('git version %s < minimum required %s' %
944 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000945
msb@chromium.org786fb682010-06-02 15:16:23 +0000946 def _IsRebasing(self):
947 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
948 # have a plumbing command to determine whether a rebase is in progress, so
949 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
950 g = os.path.join(self.checkout_path, '.git')
951 return (
952 os.path.isdir(os.path.join(g, "rebase-merge")) or
953 os.path.isdir(os.path.join(g, "rebase-apply")))
954
955 def _CheckClean(self, rev_str):
956 # Make sure the tree is clean; see git-rebase.sh for reference
957 try:
958 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000959 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000960 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000961 raise gclient_utils.Error('\n____ %s%s\n'
962 '\tYou have unstaged changes.\n'
963 '\tPlease commit, stash, or reset.\n'
964 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000965 try:
966 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000967 '--ignore-submodules', 'HEAD', '--'],
968 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000969 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000970 raise gclient_utils.Error('\n____ %s%s\n'
971 '\tYour index contains uncommitted changes\n'
972 '\tPlease commit, stash, or reset.\n'
973 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000974
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000975 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000976 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
977 # reference by a commit). If not, error out -- most likely a rebase is
978 # in progress, try to detect so we can give a better error.
979 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000980 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
981 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000982 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000983 # Commit is not contained by any rev. See if the user is rebasing:
984 if self._IsRebasing():
985 # Punt to the user
986 raise gclient_utils.Error('\n____ %s%s\n'
987 '\tAlready in a conflict, i.e. (no branch).\n'
988 '\tFix the conflict and run gclient again.\n'
989 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
990 '\tSee man git-rebase for details.\n'
991 % (self.relpath, rev_str))
992 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000993 name = ('saved-by-gclient-' +
994 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000995 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000996 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000997 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000998
msb@chromium.org5bde4852009-12-14 16:47:12 +0000999 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001000 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001001 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001002 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001003 return None
1004 return branch
1005
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001006 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001007 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +00001008 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +00001009 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001010 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001011
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001012 def _UpdateBranchHeads(self, options, fetch=False):
1013 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1014 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001015 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001016 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1017 '^\\+refs/branch-heads/\\*:.*$']
1018 self._Run(config_cmd, options)
1019 if fetch:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001020 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001021 if options.verbose:
1022 fetch_cmd.append('--verbose')
1023 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001024
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001025 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001026 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001027 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001028 if git_filter:
agable@chromium.org5a306a22014-02-24 22:13:59 +00001029 kwargs['filter_fn'] = gclient_utils.GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001030 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001031 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +00001032 # By default, git will use an interactive terminal prompt when a username/
1033 # password is needed. That shouldn't happen in the chromium workflow,
1034 # and if it does, then gclient may hide the prompt in the midst of a flood
1035 # of terminal spew. The only indication that something has gone wrong
1036 # will be when gclient hangs unresponsively. Instead, we disable the
1037 # password prompt and simply allow git to fail noisily. The error
1038 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001039 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1040 env.setdefault('GIT_ASKPASS', 'true')
1041 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001042 else:
1043 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +00001044 stdout = kwargs.get('stdout', sys.stdout)
1045 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
1046 ' '.join(args), kwargs['cwd']))
1047 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001048
1049
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001050class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001051 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001052 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001053
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001054 @staticmethod
1055 def BinaryExists():
1056 """Returns true if the command exists."""
1057 try:
1058 result, version = scm.SVN.AssertVersion('1.4')
1059 if not result:
1060 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1061 return result
1062 except OSError:
1063 return False
1064
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001065 def GetCheckoutRoot(self):
1066 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1067
floitsch@google.comeaab7842011-04-28 09:07:58 +00001068 def GetRevisionDate(self, revision):
1069 """Returns the given revision's date in ISO-8601 format (which contains the
1070 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001071 date = scm.SVN.Capture(
1072 ['propget', '--revprop', 'svn:date', '-r', revision],
1073 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001074 return date.strip()
1075
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001076 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001077 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001078 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001079
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001080 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001081 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001082 if not os.path.isdir(self.checkout_path):
1083 raise gclient_utils.Error('Directory %s is not present.' %
1084 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001085 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001086
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001087 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001088 """Generates a patch file which can be applied to the root of the
1089 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001090 if not os.path.isdir(self.checkout_path):
1091 raise gclient_utils.Error('Directory %s is not present.' %
1092 self.checkout_path)
1093 gclient_utils.CheckCallAndFilter(
1094 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1095 cwd=self.checkout_path,
1096 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001097 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001098
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001099 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001100 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001101
1102 All updated files will be appended to file_list.
1103
1104 Raises:
1105 Error: if can't get URL for relative path.
1106 """
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001107 # Only update if git or hg is not controlling the directory.
1108 git_path = os.path.join(self.checkout_path, '.git')
1109 if os.path.exists(git_path):
1110 print('________ found .git directory; skipping %s' % self.relpath)
1111 return
1112
1113 hg_path = os.path.join(self.checkout_path, '.hg')
1114 if os.path.exists(hg_path):
1115 print('________ found .hg directory; skipping %s' % self.relpath)
1116 return
1117
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001118 if args:
1119 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1120
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001121 # revision is the revision to match. It is None if no revision is specified,
1122 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001123 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001124 # Keep the original unpinned url for reference in case the repo is switched.
1125 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001126 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001127 if options.revision:
1128 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001129 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001130 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001131 if revision != 'unmanaged':
1132 forced_revision = True
1133 # Reconstruct the url.
1134 url = '%s@%s' % (url, revision)
1135 rev_str = ' at %s' % revision
1136 else:
1137 managed = False
1138 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001139 else:
1140 forced_revision = False
1141 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001142
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001143 # Get the existing scm url and the revision number of the current checkout.
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001144 exists = os.path.exists(self.checkout_path)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001145 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001146 try:
1147 from_info = scm.SVN.CaptureLocalInfo(
1148 [], os.path.join(self.checkout_path, '.'))
1149 except (gclient_utils.Error, subprocess2.CalledProcessError):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001150 if options.reset and options.delete_unversioned_trees:
1151 print 'Removing troublesome path %s' % self.checkout_path
1152 gclient_utils.rmtree(self.checkout_path)
1153 exists = False
1154 else:
1155 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1156 'present. Delete the directory and try again.')
1157 raise gclient_utils.Error(msg % self.checkout_path)
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001158
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001159 BASE_URLS = {
1160 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1161 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1162 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001163 WHITELISTED_ROOTS = [
1164 'svn://svn.chromium.org',
1165 'svn://svn-mirror.golo.chromium.org',
1166 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001167 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001168 try:
1169 # Split out the revision number since it's not useful for us.
1170 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001171 # Check to see if we're on a whitelisted root. We do this because
1172 # only some svn servers have matching UUIDs.
1173 local_parsed = urlparse.urlparse(url)
1174 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001175 if ('CHROME_HEADLESS' in os.environ
1176 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001177 and base_path in BASE_URLS
1178 and local_root in WHITELISTED_ROOTS):
1179
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001180 # Use a tarball for initial sync if we are on a bot.
1181 # Get an unauthenticated gsutil instance.
1182 gsutil = download_from_google_storage.Gsutil(
1183 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1184
1185 gs_path = BASE_URLS[base_path]
1186 _, out, _ = gsutil.check_call('ls', gs_path)
1187 # So that we can get the most recent revision.
1188 sorted_items = sorted(out.splitlines())
1189 latest_checkout = sorted_items[-1]
1190
1191 tempdir = tempfile.mkdtemp()
1192 print 'Downloading %s...' % latest_checkout
1193 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1194 if code:
1195 print '%s\n%s' % (out, err)
1196 raise Exception()
1197 filename = latest_checkout.split('/')[-1]
1198 tarball = os.path.join(tempdir, filename)
1199 print 'Unpacking into %s...' % self.checkout_path
1200 gclient_utils.safe_makedirs(self.checkout_path)
1201 # TODO(hinoka): Use 7z for windows.
1202 cmd = ['tar', '--extract', '--ungzip',
1203 '--directory', self.checkout_path,
1204 '--file', tarball]
1205 gclient_utils.CheckCallAndFilter(
1206 cmd, stdout=sys.stdout, print_stdout=True)
1207
1208 print 'Deleting temp file'
1209 gclient_utils.rmtree(tempdir)
1210
1211 # Rewrite the repository root to match.
1212 tarball_url = scm.SVN.CaptureLocalInfo(
1213 ['.'], self.checkout_path)['Repository Root']
1214 tarball_parsed = urlparse.urlparse(tarball_url)
1215 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1216 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001217
1218 if tarball_root != local_root:
1219 print 'Switching repository root to %s' % local_root
1220 self._Run(['switch', '--relocate', tarball_root,
1221 local_root, self.checkout_path],
1222 options)
1223 except Exception as e:
1224 print 'We tried to get a source tarball but failed.'
1225 print 'Resuming normal operations.'
1226 print str(e)
1227
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001228 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001229 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001230 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001231 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001232 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001233 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001234
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001235 if not managed:
1236 print ('________ unmanaged solution; skipping %s' % self.relpath)
1237 return self.Svnversion()
1238
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001239 if 'URL' not in from_info:
1240 raise gclient_utils.Error(
1241 ('gclient is confused. Couldn\'t get the url for %s.\n'
1242 'Try using @unmanaged.\n%s') % (
1243 self.checkout_path, from_info))
1244
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001245 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001246 dir_info = scm.SVN.CaptureStatus(
1247 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001248 if any(d[0][2] == 'L' for d in dir_info):
1249 try:
1250 self._Run(['cleanup', self.checkout_path], options)
1251 except subprocess2.CalledProcessError, e:
1252 # Get the status again, svn cleanup may have cleaned up at least
1253 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001254 dir_info = scm.SVN.CaptureStatus(
1255 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001256
1257 # Try to fix the failures by removing troublesome files.
1258 for d in dir_info:
1259 if d[0][2] == 'L':
1260 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001261 # We don't pass any files/directories to CaptureStatus and set
1262 # cwd=self.checkout_path, so we should get relative paths here.
1263 assert not os.path.isabs(d[1])
1264 path_to_remove = os.path.normpath(
1265 os.path.join(self.checkout_path, d[1]))
1266 print 'Removing troublesome path %s' % path_to_remove
1267 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001268 else:
1269 print 'Not removing troublesome path %s automatically.' % d[1]
1270 if d[0][0] == '!':
1271 print 'You can pass --force to enable automatic removal.'
1272 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001273
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001274 # Retrieve the current HEAD version because svn is slow at null updates.
1275 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001276 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001277 revision = str(from_info_live['Revision'])
1278 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001279
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001280 if from_info['URL'] != base_url:
1281 # The repository url changed, need to switch.
1282 try:
1283 to_info = scm.SVN.CaptureRemoteInfo(url)
1284 except (gclient_utils.Error, subprocess2.CalledProcessError):
1285 # The url is invalid or the server is not accessible, it's safer to bail
1286 # out right now.
1287 raise gclient_utils.Error('This url is unreachable: %s' % url)
1288 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1289 and (from_info['UUID'] == to_info['UUID']))
1290 if can_switch:
1291 print('\n_____ relocating %s to a new checkout' % self.relpath)
1292 # We have different roots, so check if we can switch --relocate.
1293 # Subversion only permits this if the repository UUIDs match.
1294 # Perform the switch --relocate, then rewrite the from_url
1295 # to reflect where we "are now." (This is the same way that
1296 # Subversion itself handles the metadata when switch --relocate
1297 # is used.) This makes the checks below for whether we
1298 # can update to a revision or have to switch to a different
1299 # branch work as expected.
1300 # TODO(maruel): TEST ME !
1301 command = ['switch', '--relocate',
1302 from_info['Repository Root'],
1303 to_info['Repository Root'],
1304 self.relpath]
1305 self._Run(command, options, cwd=self._root_dir)
1306 from_info['URL'] = from_info['URL'].replace(
1307 from_info['Repository Root'],
1308 to_info['Repository Root'])
1309 else:
1310 if not options.force and not options.reset:
1311 # Look for local modifications but ignore unversioned files.
1312 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1313 if status[0][0] != '?':
1314 raise gclient_utils.Error(
1315 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1316 'there is local changes in %s. Delete the directory and '
1317 'try again.') % (url, self.checkout_path))
1318 # Ok delete it.
1319 print('\n_____ switching %s to a new checkout' % self.relpath)
1320 gclient_utils.rmtree(self.checkout_path)
1321 # We need to checkout.
1322 command = ['checkout', url, self.checkout_path]
1323 command = self._AddAdditionalUpdateFlags(command, options, revision)
1324 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1325 return self.Svnversion()
1326
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001327 # If the provided url has a revision number that matches the revision
1328 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001329 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001330 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001331 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001332 else:
1333 command = ['update', self.checkout_path]
1334 command = self._AddAdditionalUpdateFlags(command, options, revision)
1335 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001336
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001337 # If --reset and --delete_unversioned_trees are specified, remove any
1338 # untracked files and directories.
1339 if options.reset and options.delete_unversioned_trees:
1340 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1341 full_path = os.path.join(self.checkout_path, status[1])
1342 if (status[0][0] == '?'
1343 and os.path.isdir(full_path)
1344 and not os.path.islink(full_path)):
1345 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001346 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001347 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001348
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001349 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001350 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001351 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001352 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001353 # Create an empty checkout and then update the one file we want. Future
1354 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001355 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001356 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001357 if os.path.exists(os.path.join(self.checkout_path, filename)):
1358 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001359 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001360 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001361 # After the initial checkout, we can use update as if it were any other
1362 # dep.
1363 self.update(options, args, file_list)
1364 else:
1365 # If the installed version of SVN doesn't support --depth, fallback to
1366 # just exporting the file. This has the downside that revision
1367 # information is not stored next to the file, so we will have to
1368 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001369 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001370 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001371 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001372 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001373 command = self._AddAdditionalUpdateFlags(command, options,
1374 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001375 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001376
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001377 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001378 """Reverts local modifications. Subversion specific.
1379
1380 All reverted files will be appended to file_list, even if Subversion
1381 doesn't know about them.
1382 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001383 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001384 if os.path.exists(self.checkout_path):
1385 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001386 # svn revert won't work if the directory doesn't exist. It needs to
1387 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001388 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001389 # Don't reuse the args.
1390 return self.update(options, [], file_list)
1391
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001392 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001393 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1394 print('________ found .git directory; skipping %s' % self.relpath)
1395 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001396 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1397 print('________ found .hg directory; skipping %s' % self.relpath)
1398 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001399 if not options.force:
1400 raise gclient_utils.Error('Invalid checkout path, aborting')
1401 print(
1402 '\n_____ %s is not a valid svn checkout, synching instead' %
1403 self.relpath)
1404 gclient_utils.rmtree(self.checkout_path)
1405 # Don't reuse the args.
1406 return self.update(options, [], file_list)
1407
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001408 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001409 if file_list is not None:
1410 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001411 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001412 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001413 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001414 print(os.path.join(self.checkout_path, file_status[1]))
1415 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001416
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001417 # Revert() may delete the directory altogether.
1418 if not os.path.isdir(self.checkout_path):
1419 # Don't reuse the args.
1420 return self.update(options, [], file_list)
1421
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001422 try:
1423 # svn revert is so broken we don't even use it. Using
1424 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001425 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001426 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1427 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001428 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001429 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001430 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001431
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001432 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001433 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001434 try:
1435 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001436 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001437 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001438
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001439 def runhooks(self, options, args, file_list):
1440 self.status(options, args, file_list)
1441
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001442 def status(self, options, args, file_list):
1443 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001444 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001445 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001446 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001447 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1448 'The directory does not exist.') %
1449 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001450 # There's no file list to retrieve.
1451 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001452 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001453
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001454 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001455 """Verifies the validity of the revision for this repository."""
1456 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1457 raise gclient_utils.Error(
1458 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1459 'correct.') % rev)
1460 return rev
1461
msb@chromium.orge6f78352010-01-13 17:05:33 +00001462 def FullUrlForRelativeUrl(self, url):
1463 # Find the forth '/' and strip from there. A bit hackish.
1464 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001465
maruel@chromium.org669600d2010-09-01 19:06:31 +00001466 def _Run(self, args, options, **kwargs):
1467 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001468 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001469 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001470 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001471
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001472 def Svnversion(self):
1473 """Runs the lowest checked out revision in the current project."""
1474 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1475 return info['Revision']
1476
maruel@chromium.org669600d2010-09-01 19:06:31 +00001477 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1478 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001479 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001480 scm.SVN.RunAndGetFileList(
1481 options.verbose,
1482 args + ['--ignore-externals'],
1483 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001484 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001485
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001486 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001487 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001488 """Add additional flags to command depending on what options are set.
1489 command should be a list of strings that represents an svn command.
1490
1491 This method returns a new list to be used as a command."""
1492 new_command = command[:]
1493 if revision:
1494 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001495 # We don't want interaction when jobs are used.
1496 if options.jobs > 1:
1497 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001498 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001499 # --accept was added to 'svn update' in svn 1.6.
1500 if not scm.SVN.AssertVersion('1.5')[0]:
1501 return new_command
1502
1503 # It's annoying to have it block in the middle of a sync, just sensible
1504 # defaults.
1505 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001506 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001507 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1508 new_command.extend(('--accept', 'theirs-conflict'))
1509 elif options.manually_grab_svn_rev:
1510 new_command.append('--force')
1511 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1512 new_command.extend(('--accept', 'postpone'))
1513 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1514 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001515 return new_command