blob: 76b4d8dd22bd5c360b2a603a8f91a655ab296182 [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
maruel@chromium.org754960e2009-09-21 12:31:05 +00007import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00008import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00009import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000010import re
borenet@google.com88d10082014-03-21 17:24:48 +000011import shlex
maruel@chromium.org90541732011-04-01 17:54:18 +000012import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000013import tempfile
zty@chromium.org6279e8a2014-02-13 01:45:25 +000014import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000015import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000016
hinoka@google.com2f2ca142014-01-07 03:59:18 +000017import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000018import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000019import scm
20import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000021
22
szager@chromium.org71cbb502013-04-19 23:30:15 +000023THIS_FILE_PATH = os.path.abspath(__file__)
24
hinoka@google.com2f2ca142014-01-07 03:59:18 +000025GSUTIL_DEFAULT_PATH = os.path.join(
26 os.path.dirname(os.path.abspath(__file__)),
27 'third_party', 'gsutil', 'gsutil')
28
szager@chromium.org71cbb502013-04-19 23:30:15 +000029
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000030class DiffFiltererWrapper(object):
31 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000032 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000033 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000034 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000035 original_prefix = "--- "
36 working_prefix = "+++ "
37
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000038 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000039 # Note that we always use '/' as the path separator to be
40 # consistent with svn's cygwin-style output on Windows
41 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000042 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000043
maruel@chromium.org6e29d572010-06-04 17:32:20 +000044 def SetCurrentFile(self, current_file):
45 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000046
iannucci@chromium.org3830a672013-02-19 20:15:14 +000047 @property
48 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000049 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000050
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000051 def _Replace(self, line):
52 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000053
54 def Filter(self, line):
55 if (line.startswith(self.index_string)):
56 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000057 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000058 else:
59 if (line.startswith(self.original_prefix) or
60 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000061 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000062 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000063
64
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000065class SvnDiffFilterer(DiffFiltererWrapper):
66 index_string = "Index: "
67
68
69class GitDiffFilterer(DiffFiltererWrapper):
70 index_string = "diff --git "
71
72 def SetCurrentFile(self, current_file):
73 # Get filename by parsing "a/<filename> b/<filename>"
74 self._current_file = current_file[:(len(current_file)/2)][2:]
75
76 def _Replace(self, line):
77 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
78
79
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000080### SCM abstraction layer
81
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000082# Factory Method for SCM wrapper creation
83
maruel@chromium.org9eda4112010-06-11 18:56:10 +000084def GetScmName(url):
85 if url:
86 url, _ = gclient_utils.SplitUrlRevision(url)
87 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000088 url.startswith('git+http://') or url.startswith('git+https://') or
mariakhomenko@chromium.orga2ede5c2014-02-05 22:05:17 +000089 url.endswith('.git') or url.startswith('sso://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000090 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000091 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000092 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000093 return 'svn'
94 return None
95
96
97def CreateSCM(url, root_dir=None, relpath=None):
98 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000099 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000100 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000101 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000102
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000103 scm_name = GetScmName(url)
104 if not scm_name in SCM_MAP:
105 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000106 scm_class = SCM_MAP[scm_name]
107 if not scm_class.BinaryExists():
108 raise gclient_utils.Error('%s command not found' % scm_name)
109 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000110
111
112# SCMWrapper base class
113
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000114class SCMWrapper(object):
115 """Add necessary glue between all the supported SCM.
116
msb@chromium.orgd6504212010-01-13 17:34:31 +0000117 This is the abstraction layer to bind to different SCM.
118 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000119 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000120 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000121 self._root_dir = root_dir
122 if self._root_dir:
123 self._root_dir = self._root_dir.replace('/', os.sep)
124 self.relpath = relpath
125 if self.relpath:
126 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000127 if self.relpath and self._root_dir:
128 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000129
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000130 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000131 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000132 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000133
134 if not command in commands:
135 raise gclient_utils.Error('Unknown command %s' % command)
136
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000137 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000138 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000139 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000140
141 return getattr(self, command)(options, args, file_list)
142
borenet@google.com88d10082014-03-21 17:24:48 +0000143 def GetActualRemoteURL(self):
144 """Attempt to determine the remote URL for this SCMWrapper."""
145 try:
146 return shlex.split(scm.GIT.Capture(
147 ['config', '--local', '--get-regexp', r'remote.*.url'],
148 self.checkout_path))[1]
149 except Exception:
150 pass
151 try:
152 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
153 except Exception:
154 pass
155 return None
156
157 def DoesRemoteURLMatch(self):
158 """Determine whether the remote URL of this checkout is the expected URL."""
159 if not os.path.exists(self.checkout_path):
160 # A checkout which doesn't exist can't be broken.
161 return True
162
163 actual_remote_url = self.GetActualRemoteURL()
164 if actual_remote_url:
165 return actual_remote_url.rstrip('/') == self.url.rstrip('/')
166 else:
167 # This may occur if the self.checkout_path exists but does not contain a
168 # valid git or svn checkout.
169 return False
170
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000171
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000172class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000173 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000174 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000175 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000176
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000177 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000178
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000179 def __init__(self, url=None, root_dir=None, relpath=None):
180 """Removes 'git+' fake prefix from git URL."""
181 if url.startswith('git+http://') or url.startswith('git+https://'):
182 url = url[4:]
183 SCMWrapper.__init__(self, url, root_dir, relpath)
184
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000185 @staticmethod
186 def BinaryExists():
187 """Returns true if the command exists."""
188 try:
189 # We assume git is newer than 1.7. See: crbug.com/114483
190 result, version = scm.GIT.AssertVersion('1.7')
191 if not result:
192 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
193 return result
194 except OSError:
195 return False
196
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000197 def GetCheckoutRoot(self):
198 return scm.GIT.GetCheckoutRoot(self.checkout_path)
199
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000200 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000201 """Returns the given revision's date in ISO-8601 format (which contains the
202 time zone)."""
203 # TODO(floitsch): get the time-stamp of the given revision and not just the
204 # time-stamp of the currently checked out revision.
205 return self._Capture(['log', '-n', '1', '--format=%ai'])
206
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000207 @staticmethod
208 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000209 """'Cleanup' the repo.
210
211 There's no real git equivalent for the svn cleanup command, do a no-op.
212 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000213
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000214 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000215 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000216 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000217
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000218 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000219 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000220 repository.
221
222 The patch file is generated from a diff of the merge base of HEAD and
223 its upstream branch.
224 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000225 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000226 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000227 ['git', 'diff', merge_base],
228 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000229 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000230
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000231 def UpdateSubmoduleConfig(self):
232 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000233 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000234 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000235 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000236 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000237 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000238 kwargs = {'cwd': self.checkout_path,
239 'print_stdout': False,
240 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000241 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000242 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
243 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000244 except subprocess2.CalledProcessError:
245 # Not a fatal error, or even very interesting in a non-git-submodule
246 # world. So just keep it quiet.
247 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000248 try:
249 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
250 except subprocess2.CalledProcessError:
251 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000252
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000253 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
254
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000255 def _FetchAndReset(self, revision, file_list, options):
256 """Equivalent to git fetch; git reset."""
257 quiet = []
258 if not options.verbose:
259 quiet = ['--quiet']
260 self._UpdateBranchHeads(options, fetch=False)
261
szager@chromium.orgfc616382014-03-18 20:32:04 +0000262 cfg = gclient_utils.DefaultIndexPackConfig()
263 fetch_cmd = cfg + ['fetch', self.remote, '--prune']
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000264 self._Run(fetch_cmd + quiet, options, retry=True)
265 self._Run(['reset', '--hard', revision] + quiet, options)
266 self.UpdateSubmoduleConfig()
267 if file_list is not None:
268 files = self._Capture(['ls-files']).splitlines()
269 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
270
msb@chromium.orge28e4982009-09-25 20:51:45 +0000271 def update(self, options, args, file_list):
272 """Runs git to update or transparently checkout the working copy.
273
274 All updated files will be appended to file_list.
275
276 Raises:
277 Error: if can't get URL for relative path.
278 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000279 if args:
280 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
281
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000282 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000283
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000284 # If a dependency is not pinned, track the default remote branch.
285 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000286 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000287 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000288 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000289 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000290 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000291 # Override the revision number.
292 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000293 if revision == 'unmanaged':
294 revision = None
295 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000296 if not revision:
297 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000298
floitsch@google.comeaab7842011-04-28 09:07:58 +0000299 if gclient_utils.IsDateRevision(revision):
300 # Date-revisions only work on git-repositories if the reflog hasn't
301 # expired yet. Use rev-list to get the corresponding revision.
302 # git rev-list -n 1 --before='time-stamp' branchname
303 if options.transitive:
304 print('Warning: --transitive only works for SVN repositories.')
305 revision = default_rev
306
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000307 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000308 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000309
310 printed_path = False
311 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000312 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000313 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000314 verbose = ['--verbose']
315 printed_path = True
316
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000317 url = self._CreateOrUpdateCache(url, options)
318
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000319 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000320 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000321 elif revision.startswith(self.remote + '/'):
322 # For compatibility with old naming, translate 'origin' to 'refs/heads'
323 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000324 rev_type = "branch"
325 else:
326 # hash is also a tag, only make a distinction at checkout
327 rev_type = "hash"
328
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000329 if (not os.path.exists(self.checkout_path) or
330 (os.path.isdir(self.checkout_path) and
331 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000332 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000333 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000334 if file_list is not None:
335 files = self._Capture(['ls-files']).splitlines()
336 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000337 if not verbose:
338 # Make the output a little prettier. It's nice to have some whitespace
339 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000340 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000341 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000342
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000343 if not managed:
344 self._UpdateBranchHeads(options, fetch=False)
345 self.UpdateSubmoduleConfig()
346 print ('________ unmanaged solution; skipping %s' % self.relpath)
347 return self._Capture(['rev-parse', '--verify', 'HEAD'])
348
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +0000349 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
350 raise gclient_utils.Error('\n____ %s%s\n'
351 '\tPath is not a git repo. No .git dir.\n'
352 '\tTo resolve:\n'
353 '\t\trm -rf %s\n'
354 '\tAnd run gclient sync again\n'
355 % (self.relpath, rev_str, self.relpath))
356
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000357 # See if the url has changed (the unittests use git://foo for the url, let
358 # that through).
359 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
360 return_early = False
361 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
362 # unit test pass. (and update the comment above)
363 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
364 # This allows devs to use experimental repos which have a different url
365 # but whose branch(s) are the same as official repos.
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +0000366 if (current_url != url and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000367 url != 'git://foo' and
368 subprocess2.capture(
369 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
370 cwd=self.checkout_path).strip() != 'False'):
371 print('_____ switching %s to a new upstream' % self.relpath)
372 # Make sure it's clean
373 self._CheckClean(rev_str)
374 # Switch over to the new upstream
375 self._Run(['remote', 'set-url', self.remote, url], options)
376 self._FetchAndReset(revision, file_list, options)
377 return_early = True
378
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000379 if return_early:
380 return self._Capture(['rev-parse', '--verify', 'HEAD'])
381
msb@chromium.org5bde4852009-12-14 16:47:12 +0000382 cur_branch = self._GetCurrentBranch()
383
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000384 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000385 # 0) HEAD is detached. Probably from our initial clone.
386 # - make sure HEAD is contained by a named ref, then update.
387 # Cases 1-4. HEAD is a branch.
388 # 1) current branch is not tracking a remote branch (could be git-svn)
389 # - try to rebase onto the new hash or branch
390 # 2) current branch is tracking a remote branch with local committed
391 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000392 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000393 # 3) current branch is tracking a remote branch w/or w/out changes,
394 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000395 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000396 # 4) current branch is tracking a remote branch, switches to a different
397 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000398 # - exit
399
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000400 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
401 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000402 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
403 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000404 if cur_branch is None:
405 upstream_branch = None
406 current_type = "detached"
407 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000408 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000409 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
410 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
411 current_type = "hash"
412 logging.debug("Current branch is not tracking an upstream (remote)"
413 " branch.")
414 elif upstream_branch.startswith('refs/remotes'):
415 current_type = "branch"
416 else:
417 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000418
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000419 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000420 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000421 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000422 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000423 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000424 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000425
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000426 self._UpdateBranchHeads(options, fetch=True)
427
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000428 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000429 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000430 target = 'HEAD'
431 if options.upstream and upstream_branch:
432 target = upstream_branch
433 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000434
msb@chromium.org786fb682010-06-02 15:16:23 +0000435 if current_type == 'detached':
436 # case 0
437 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000438 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000439 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000440 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000441 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000442 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000443 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000444 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000445 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000446 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000447 newbase=revision, printed_path=printed_path,
448 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000449 printed_path = True
450 else:
451 # Can't find a merge-base since we don't know our upstream. That makes
452 # this command VERY likely to produce a rebase failure. For now we
453 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000454 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000455 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000456 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000457 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000458 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000459 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000460 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000461 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000462 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000463 newbase=revision, printed_path=printed_path,
464 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000465 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000466 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000467 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000468 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000469 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000470 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000471 switch_error = ("Switching upstream branch from %s to %s\n"
472 % (upstream_branch, new_base) +
473 "Please merge or rebase manually:\n" +
474 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
475 "OR git checkout -b <some new branch> %s" % new_base)
476 raise gclient_utils.Error(switch_error)
477 else:
478 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000479 if files is not None:
480 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000481 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000482 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000483 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000484 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000485 if options.merge:
486 merge_args.append('--ff')
487 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000488 merge_args.append('--ff-only')
489 merge_args.append(upstream_branch)
490 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000491 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000493 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000494 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000495 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496 printed_path = True
497 while True:
498 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000499 action = self._AskForData(
500 'Cannot %s, attempt to rebase? '
501 '(y)es / (q)uit / (s)kip : ' %
502 ('merge' if options.merge else 'fast-forward merge'),
503 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000504 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000505 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000506 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000507 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000508 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000509 printed_path = True
510 break
511 elif re.match(r'quit|q', action, re.I):
512 raise gclient_utils.Error("Can't fast-forward, please merge or "
513 "rebase manually.\n"
514 "cd %s && git " % self.checkout_path
515 + "rebase %s" % upstream_branch)
516 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000517 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000518 return
519 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000520 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 elif re.match("error: Your local changes to '.*' would be "
522 "overwritten by merge. Aborting.\nPlease, commit your "
523 "changes or stash them before you can merge.\n",
524 e.stderr):
525 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000526 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000527 printed_path = True
528 raise gclient_utils.Error(e.stderr)
529 else:
530 # Some other problem happened with the merge
531 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000532 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000533 raise
534 else:
535 # Fast-forward merge was successful
536 if not re.match('Already up-to-date.', merge_output) or verbose:
537 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000538 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000539 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000540 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000541 if not verbose:
542 # Make the output a little prettier. It's nice to have some
543 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000544 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000545
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000546 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000547 if file_list is not None:
548 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000549
550 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000551 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000552 raise gclient_utils.Error('\n____ %s%s\n'
553 '\nConflict while rebasing this branch.\n'
554 'Fix the conflict and run gclient again.\n'
555 'See man git-rebase for details.\n'
556 % (self.relpath, rev_str))
557
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000558 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000559 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000560
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000561 # If --reset and --delete_unversioned_trees are specified, remove any
562 # untracked directories.
563 if options.reset and options.delete_unversioned_trees:
564 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
565 # merge-base by default), so doesn't include untracked files. So we use
566 # 'git ls-files --directory --others --exclude-standard' here directly.
567 paths = scm.GIT.Capture(
568 ['ls-files', '--directory', '--others', '--exclude-standard'],
569 self.checkout_path)
570 for path in (p for p in paths.splitlines() if p.endswith('/')):
571 full_path = os.path.join(self.checkout_path, path)
572 if not os.path.islink(full_path):
573 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000574 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000575
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000576 return self._Capture(['rev-parse', '--verify', 'HEAD'])
577
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000578
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000579 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000580 """Reverts local modifications.
581
582 All reverted files will be appended to file_list.
583 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000584 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000585 # revert won't work if the directory doesn't exist. It needs to
586 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000587 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000588 # Don't reuse the args.
589 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000590
591 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000592 if options.upstream:
593 if self._GetCurrentBranch():
594 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
595 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000596 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000597 if not deps_revision:
598 deps_revision = default_rev
599 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000600 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000601 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000602
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000603 if file_list is not None:
604 files = self._Capture(['diff', deps_revision, '--name-only']).split()
605
maruel@chromium.org37e89872010-09-07 16:11:33 +0000606 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000607 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000608
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000609 if file_list is not None:
610 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
611
612 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000613 """Returns revision"""
614 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000615
msb@chromium.orge28e4982009-09-25 20:51:45 +0000616 def runhooks(self, options, args, file_list):
617 self.status(options, args, file_list)
618
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000619 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000620 """Display status information."""
621 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000622 print(('\n________ couldn\'t run status in %s:\n'
623 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000624 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000625 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000626 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000627 if file_list is not None:
628 files = self._Capture(['diff', '--name-only', merge_base]).split()
629 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000630
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000631 def GetUsableRev(self, rev, options):
632 """Finds a useful revision for this repository.
633
634 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
635 will be called on the source."""
636 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000637 if not os.path.isdir(self.checkout_path):
638 raise gclient_utils.Error(
639 ( 'We could not find a valid hash for safesync_url response "%s".\n'
640 'Safesync URLs with a git checkout currently require the repo to\n'
641 'be cloned without a safesync_url before adding the safesync_url.\n'
642 'For more info, see: '
643 'http://code.google.com/p/chromium/wiki/UsingNewGit'
644 '#Initial_checkout' ) % rev)
645 elif rev.isdigit() and len(rev) < 7:
646 # Handles an SVN rev. As an optimization, only verify an SVN revision as
647 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000648 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000649 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
650 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000651 try:
652 logging.debug('Looking for git-svn configuration optimizations.')
653 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
654 cwd=self.checkout_path):
655 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
656 except subprocess2.CalledProcessError:
657 logging.debug('git config --get svn-remote.svn.fetch failed, '
658 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000659 if options.verbose:
660 print('Running git svn fetch. This might take a while.\n')
661 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000662 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000663 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
664 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000665 except gclient_utils.Error, e:
666 sha1 = e.message
667 print('\nWarning: Could not find a git revision with accurate\n'
668 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
669 'the closest sane git revision, which is:\n'
670 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000671 if not sha1:
672 raise gclient_utils.Error(
673 ( 'It appears that either your git-svn remote is incorrectly\n'
674 'configured or the revision in your safesync_url is\n'
675 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
676 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000677 else:
678 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
679 sha1 = rev
680 else:
681 # May exist in origin, but we don't have it yet, so fetch and look
682 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000683 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000684 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
685 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000686
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000687 if not sha1:
688 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000689 ( 'We could not find a valid hash for safesync_url response "%s".\n'
690 'Safesync URLs with a git checkout currently require a git-svn\n'
691 'remote or a safesync_url that provides git sha1s. Please add a\n'
692 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000693 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000694 '#Initial_checkout' ) % rev)
695
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000696 return sha1
697
msb@chromium.orge6f78352010-01-13 17:05:33 +0000698 def FullUrlForRelativeUrl(self, url):
699 # Strip from last '/'
700 # Equivalent to unix basename
701 base_url = self.url
702 return base_url[:base_url.rfind('/')] + url
703
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000704 def _CreateOrUpdateCache(self, url, options):
705 """Make a new git mirror or update existing mirror for |url|, and return the
706 mirror URI to clone from.
707
708 If no cache-dir is specified, just return |url| unchanged.
709 """
710 if not self.cache_dir:
711 return url
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000712 v = ['-v'] if options.verbose else []
hinoka@google.com1b8f0ab2014-03-18 02:10:38 +0000713 self._Run(['cache', 'populate'] + v + ['--cache-dir', self.cache_dir, url],
hinoka@google.com267f33e2014-02-28 22:02:32 +0000714 options, cwd=self._root_dir, retry=True)
715 return self._Run(['cache', 'exists', '--cache-dir', self.cache_dir, url],
hinoka@google.com703fe5d2014-02-28 23:10:51 +0000716 options, cwd=self._root_dir, ).strip()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000717
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000718 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000719 """Clone a git repository from the given URL.
720
msb@chromium.org786fb682010-06-02 15:16:23 +0000721 Once we've cloned the repo, we checkout a working branch if the specified
722 revision is a branch head. If it is a tag or a specific commit, then we
723 leave HEAD detached as it makes future updates simpler -- in this case the
724 user should first create a new branch or switch to an existing branch before
725 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000726 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000727 # git clone doesn't seem to insert a newline properly before printing
728 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000729 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000730 template_path = os.path.join(
731 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgfc616382014-03-18 20:32:04 +0000732 cfg = gclient_utils.DefaultIndexPackConfig()
733 clone_cmd = cfg + [
734 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000735 if self.cache_dir:
736 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000737 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000738 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000739 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000740 # If the parent directory does not exist, Git clone on Windows will not
741 # create it, so we need to do it manually.
742 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000743 gclient_utils.safe_makedirs(parent_dir)
744 tmp_dir = tempfile.mkdtemp(
745 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
746 dir=parent_dir)
747 try:
748 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000749 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000750 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000751 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
752 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000753 except:
754 traceback.print_exc(file=sys.stderr)
755 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000756 finally:
757 if os.listdir(tmp_dir):
758 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
759 gclient_utils.rmtree(tmp_dir)
760 if revision.startswith('refs/heads/'):
761 self._Run(
762 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
763 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000764 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000765 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000766 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000767 ('Checked out %s to a detached HEAD. Before making any commits\n'
768 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000769 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
770 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000771
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000772 @staticmethod
773 def _AskForData(prompt, options):
774 if options.jobs > 1:
775 raise gclient_utils.Error("Background task requires input. Rerun "
776 "gclient with --jobs=1 so that\n"
777 "interaction is possible.")
778 try:
779 return raw_input(prompt)
780 except KeyboardInterrupt:
781 # Hide the exception.
782 sys.exit(1)
783
784
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000785 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000786 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000787 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000788 if files is not None:
789 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000790 revision = upstream
791 if newbase:
792 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000793 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000794 if not printed_path:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000795 print('\n_____ %s : Attempting %s onto %s...' % (
796 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000797 printed_path = True
798 else:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000799 print('Attempting %s onto %s...' % (action, revision))
800
801 if merge:
802 merge_output = self._Capture(['merge', revision])
803 if options.verbose:
804 print(merge_output)
805 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000806
807 # Build the rebase command here using the args
808 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
809 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000810 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000811 rebase_cmd.append('--verbose')
812 if newbase:
813 rebase_cmd.extend(['--onto', newbase])
814 rebase_cmd.append(upstream)
815 if branch:
816 rebase_cmd.append(branch)
817
818 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000819 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000820 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000821 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
822 re.match(r'cannot rebase: your index contains uncommitted changes',
823 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000824 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000825 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000826 'Cannot rebase because of unstaged changes.\n'
827 '\'git reset --hard HEAD\' ?\n'
828 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000829 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000830 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000831 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000832 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000833 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000834 break
835 elif re.match(r'quit|q', rebase_action, re.I):
836 raise gclient_utils.Error("Please merge or rebase manually\n"
837 "cd %s && git " % self.checkout_path
838 + "%s" % ' '.join(rebase_cmd))
839 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000840 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000841 continue
842 else:
843 gclient_utils.Error("Input not recognized")
844 continue
845 elif re.search(r'^CONFLICT', e.stdout, re.M):
846 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
847 "Fix the conflict and run gclient again.\n"
848 "See 'man git-rebase' for details.\n")
849 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000850 print(e.stdout.strip())
851 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000852 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
853 "manually.\ncd %s && git " %
854 self.checkout_path
855 + "%s" % ' '.join(rebase_cmd))
856
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000857 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000858 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000859 # Make the output a little prettier. It's nice to have some
860 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000861 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000862
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000863 @staticmethod
864 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000865 (ok, current_version) = scm.GIT.AssertVersion(min_version)
866 if not ok:
867 raise gclient_utils.Error('git version %s < minimum required %s' %
868 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000869
msb@chromium.org786fb682010-06-02 15:16:23 +0000870 def _IsRebasing(self):
871 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
872 # have a plumbing command to determine whether a rebase is in progress, so
873 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
874 g = os.path.join(self.checkout_path, '.git')
875 return (
876 os.path.isdir(os.path.join(g, "rebase-merge")) or
877 os.path.isdir(os.path.join(g, "rebase-apply")))
878
879 def _CheckClean(self, rev_str):
880 # Make sure the tree is clean; see git-rebase.sh for reference
881 try:
882 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000883 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000884 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000885 raise gclient_utils.Error('\n____ %s%s\n'
886 '\tYou have unstaged changes.\n'
887 '\tPlease commit, stash, or reset.\n'
888 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000889 try:
890 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000891 '--ignore-submodules', 'HEAD', '--'],
892 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000893 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000894 raise gclient_utils.Error('\n____ %s%s\n'
895 '\tYour index contains uncommitted changes\n'
896 '\tPlease commit, stash, or reset.\n'
897 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000898
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000899 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000900 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
901 # reference by a commit). If not, error out -- most likely a rebase is
902 # in progress, try to detect so we can give a better error.
903 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000904 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
905 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000906 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000907 # Commit is not contained by any rev. See if the user is rebasing:
908 if self._IsRebasing():
909 # Punt to the user
910 raise gclient_utils.Error('\n____ %s%s\n'
911 '\tAlready in a conflict, i.e. (no branch).\n'
912 '\tFix the conflict and run gclient again.\n'
913 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
914 '\tSee man git-rebase for details.\n'
915 % (self.relpath, rev_str))
916 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000917 name = ('saved-by-gclient-' +
918 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000919 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000920 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000921 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000922
msb@chromium.org5bde4852009-12-14 16:47:12 +0000923 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000924 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000925 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000926 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000927 return None
928 return branch
929
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000930 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000931 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +0000932 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000933 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000934 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000935
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000936 def _UpdateBranchHeads(self, options, fetch=False):
937 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
938 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000939 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000940 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
941 '^\\+refs/branch-heads/\\*:.*$']
942 self._Run(config_cmd, options)
943 if fetch:
szager@chromium.orgfc616382014-03-18 20:32:04 +0000944 cfg = gclient_utils.DefaultIndexPackConfig()
945 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000946 if options.verbose:
947 fetch_cmd.append('--verbose')
948 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000949
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000950 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000951 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000952 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000953 if git_filter:
agable@chromium.org5a306a22014-02-24 22:13:59 +0000954 kwargs['filter_fn'] = gclient_utils.GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000955 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +0000956 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +0000957 # By default, git will use an interactive terminal prompt when a username/
958 # password is needed. That shouldn't happen in the chromium workflow,
959 # and if it does, then gclient may hide the prompt in the midst of a flood
960 # of terminal spew. The only indication that something has gone wrong
961 # will be when gclient hangs unresponsively. Instead, we disable the
962 # password prompt and simply allow git to fail noisily. The error
963 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +0000964 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
965 env.setdefault('GIT_ASKPASS', 'true')
966 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000967 else:
968 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +0000969 stdout = kwargs.get('stdout', sys.stdout)
970 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
971 ' '.join(args), kwargs['cwd']))
hinoka@google.com267f33e2014-02-28 22:02:32 +0000972 return gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000973
974
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000975class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000976 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000977 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000978
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000979 @staticmethod
980 def BinaryExists():
981 """Returns true if the command exists."""
982 try:
983 result, version = scm.SVN.AssertVersion('1.4')
984 if not result:
985 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
986 return result
987 except OSError:
988 return False
989
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000990 def GetCheckoutRoot(self):
991 return scm.SVN.GetCheckoutRoot(self.checkout_path)
992
floitsch@google.comeaab7842011-04-28 09:07:58 +0000993 def GetRevisionDate(self, revision):
994 """Returns the given revision's date in ISO-8601 format (which contains the
995 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +0000996 date = scm.SVN.Capture(
997 ['propget', '--revprop', 'svn:date', '-r', revision],
998 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +0000999 return date.strip()
1000
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001001 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001002 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001003 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001004
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001005 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001006 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001007 if not os.path.isdir(self.checkout_path):
1008 raise gclient_utils.Error('Directory %s is not present.' %
1009 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001010 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001011
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001012 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001013 """Generates a patch file which can be applied to the root of the
1014 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001015 if not os.path.isdir(self.checkout_path):
1016 raise gclient_utils.Error('Directory %s is not present.' %
1017 self.checkout_path)
1018 gclient_utils.CheckCallAndFilter(
1019 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1020 cwd=self.checkout_path,
1021 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001022 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001023
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001024 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001025 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001026
1027 All updated files will be appended to file_list.
1028
1029 Raises:
1030 Error: if can't get URL for relative path.
1031 """
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001032 # Only update if git or hg is not controlling the directory.
1033 git_path = os.path.join(self.checkout_path, '.git')
1034 if os.path.exists(git_path):
1035 print('________ found .git directory; skipping %s' % self.relpath)
1036 return
1037
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001038 hg_path = os.path.join(self.checkout_path, '.hg')
1039 if os.path.exists(hg_path):
1040 print('________ found .hg directory; skipping %s' % self.relpath)
1041 return
1042
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001043 if args:
1044 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1045
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001046 # revision is the revision to match. It is None if no revision is specified,
1047 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001048 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001049 # Keep the original unpinned url for reference in case the repo is switched.
1050 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001051 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001052 if options.revision:
1053 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001054 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001055 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001056 if revision != 'unmanaged':
1057 forced_revision = True
1058 # Reconstruct the url.
1059 url = '%s@%s' % (url, revision)
1060 rev_str = ' at %s' % revision
1061 else:
1062 managed = False
1063 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001064 else:
1065 forced_revision = False
1066 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001067
borenet@google.com7ff04292014-03-10 12:57:25 +00001068 # Get the existing scm url and the revision number of the current checkout.
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001069 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001070 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001071 try:
1072 from_info = scm.SVN.CaptureLocalInfo(
1073 [], os.path.join(self.checkout_path, '.'))
1074 except (gclient_utils.Error, subprocess2.CalledProcessError):
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001075 if options.reset and options.delete_unversioned_trees:
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001076 print 'Removing troublesome path %s' % self.checkout_path
1077 gclient_utils.rmtree(self.checkout_path)
1078 exists = False
1079 else:
1080 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1081 'present. Delete the directory and try again.')
1082 raise gclient_utils.Error(msg % self.checkout_path)
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001083
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001084 BASE_URLS = {
1085 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1086 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1087 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001088 WHITELISTED_ROOTS = [
1089 'svn://svn.chromium.org',
1090 'svn://svn-mirror.golo.chromium.org',
1091 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001092 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001093 try:
1094 # Split out the revision number since it's not useful for us.
1095 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001096 # Check to see if we're on a whitelisted root. We do this because
1097 # only some svn servers have matching UUIDs.
1098 local_parsed = urlparse.urlparse(url)
1099 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001100 if ('CHROME_HEADLESS' in os.environ
1101 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001102 and base_path in BASE_URLS
1103 and local_root in WHITELISTED_ROOTS):
1104
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001105 # Use a tarball for initial sync if we are on a bot.
1106 # Get an unauthenticated gsutil instance.
1107 gsutil = download_from_google_storage.Gsutil(
1108 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1109
1110 gs_path = BASE_URLS[base_path]
1111 _, out, _ = gsutil.check_call('ls', gs_path)
1112 # So that we can get the most recent revision.
1113 sorted_items = sorted(out.splitlines())
1114 latest_checkout = sorted_items[-1]
1115
1116 tempdir = tempfile.mkdtemp()
1117 print 'Downloading %s...' % latest_checkout
1118 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1119 if code:
1120 print '%s\n%s' % (out, err)
1121 raise Exception()
1122 filename = latest_checkout.split('/')[-1]
1123 tarball = os.path.join(tempdir, filename)
1124 print 'Unpacking into %s...' % self.checkout_path
1125 gclient_utils.safe_makedirs(self.checkout_path)
1126 # TODO(hinoka): Use 7z for windows.
1127 cmd = ['tar', '--extract', '--ungzip',
1128 '--directory', self.checkout_path,
1129 '--file', tarball]
1130 gclient_utils.CheckCallAndFilter(
1131 cmd, stdout=sys.stdout, print_stdout=True)
1132
1133 print 'Deleting temp file'
1134 gclient_utils.rmtree(tempdir)
1135
1136 # Rewrite the repository root to match.
1137 tarball_url = scm.SVN.CaptureLocalInfo(
1138 ['.'], self.checkout_path)['Repository Root']
1139 tarball_parsed = urlparse.urlparse(tarball_url)
1140 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1141 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001142
1143 if tarball_root != local_root:
1144 print 'Switching repository root to %s' % local_root
1145 self._Run(['switch', '--relocate', tarball_root,
1146 local_root, self.checkout_path],
1147 options)
1148 except Exception as e:
1149 print 'We tried to get a source tarball but failed.'
1150 print 'Resuming normal operations.'
1151 print str(e)
1152
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001153 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001154 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001155 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001156 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001157 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001158 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001159
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001160 if not managed:
1161 print ('________ unmanaged solution; skipping %s' % self.relpath)
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001162 return self.Svnversion()
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001163
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001164 if 'URL' not in from_info:
1165 raise gclient_utils.Error(
1166 ('gclient is confused. Couldn\'t get the url for %s.\n'
1167 'Try using @unmanaged.\n%s') % (
1168 self.checkout_path, from_info))
1169
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001170 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001171 dir_info = scm.SVN.CaptureStatus(
1172 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001173 if any(d[0][2] == 'L' for d in dir_info):
1174 try:
1175 self._Run(['cleanup', self.checkout_path], options)
1176 except subprocess2.CalledProcessError, e:
1177 # Get the status again, svn cleanup may have cleaned up at least
1178 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001179 dir_info = scm.SVN.CaptureStatus(
1180 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001181
1182 # Try to fix the failures by removing troublesome files.
1183 for d in dir_info:
1184 if d[0][2] == 'L':
1185 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001186 # We don't pass any files/directories to CaptureStatus and set
1187 # cwd=self.checkout_path, so we should get relative paths here.
1188 assert not os.path.isabs(d[1])
1189 path_to_remove = os.path.normpath(
1190 os.path.join(self.checkout_path, d[1]))
1191 print 'Removing troublesome path %s' % path_to_remove
1192 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001193 else:
1194 print 'Not removing troublesome path %s automatically.' % d[1]
1195 if d[0][0] == '!':
1196 print 'You can pass --force to enable automatic removal.'
1197 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001198
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001199 # Retrieve the current HEAD version because svn is slow at null updates.
1200 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001201 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001202 revision = str(from_info_live['Revision'])
1203 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001204
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001205 if from_info['URL'] != base_url:
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001206 # The repository url changed, need to switch.
1207 try:
1208 to_info = scm.SVN.CaptureRemoteInfo(url)
1209 except (gclient_utils.Error, subprocess2.CalledProcessError):
1210 # The url is invalid or the server is not accessible, it's safer to bail
1211 # out right now.
1212 raise gclient_utils.Error('This url is unreachable: %s' % url)
1213 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1214 and (from_info['UUID'] == to_info['UUID']))
1215 if can_switch:
1216 print('\n_____ relocating %s to a new checkout' % self.relpath)
1217 # We have different roots, so check if we can switch --relocate.
1218 # Subversion only permits this if the repository UUIDs match.
1219 # Perform the switch --relocate, then rewrite the from_url
1220 # to reflect where we "are now." (This is the same way that
1221 # Subversion itself handles the metadata when switch --relocate
1222 # is used.) This makes the checks below for whether we
1223 # can update to a revision or have to switch to a different
1224 # branch work as expected.
1225 # TODO(maruel): TEST ME !
1226 command = ['switch', '--relocate',
1227 from_info['Repository Root'],
1228 to_info['Repository Root'],
1229 self.relpath]
1230 self._Run(command, options, cwd=self._root_dir)
1231 from_info['URL'] = from_info['URL'].replace(
1232 from_info['Repository Root'],
1233 to_info['Repository Root'])
1234 else:
1235 if not options.force and not options.reset:
1236 # Look for local modifications but ignore unversioned files.
1237 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1238 if status[0][0] != '?':
1239 raise gclient_utils.Error(
1240 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1241 'there is local changes in %s. Delete the directory and '
1242 'try again.') % (url, self.checkout_path))
1243 # Ok delete it.
1244 print('\n_____ switching %s to a new checkout' % self.relpath)
1245 gclient_utils.rmtree(self.checkout_path)
1246 # We need to checkout.
1247 command = ['checkout', url, self.checkout_path]
1248 command = self._AddAdditionalUpdateFlags(command, options, revision)
1249 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1250 return self.Svnversion()
1251
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001252 # If the provided url has a revision number that matches the revision
1253 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001254 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001255 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001256 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001257 else:
1258 command = ['update', self.checkout_path]
1259 command = self._AddAdditionalUpdateFlags(command, options, revision)
1260 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001261
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001262 # If --reset and --delete_unversioned_trees are specified, remove any
1263 # untracked files and directories.
1264 if options.reset and options.delete_unversioned_trees:
1265 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1266 full_path = os.path.join(self.checkout_path, status[1])
1267 if (status[0][0] == '?'
1268 and os.path.isdir(full_path)
1269 and not os.path.islink(full_path)):
1270 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001271 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001272 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001273
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001274 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001275 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001276 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001277 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001278 # Create an empty checkout and then update the one file we want. Future
1279 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001280 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001281 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001282 if os.path.exists(os.path.join(self.checkout_path, filename)):
1283 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001284 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001285 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001286 # After the initial checkout, we can use update as if it were any other
1287 # dep.
1288 self.update(options, args, file_list)
1289 else:
1290 # If the installed version of SVN doesn't support --depth, fallback to
1291 # just exporting the file. This has the downside that revision
1292 # information is not stored next to the file, so we will have to
1293 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001294 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001295 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001296 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001297 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001298 command = self._AddAdditionalUpdateFlags(command, options,
1299 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001300 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001301
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001302 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001303 """Reverts local modifications. Subversion specific.
1304
1305 All reverted files will be appended to file_list, even if Subversion
1306 doesn't know about them.
1307 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001308 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001309 if os.path.exists(self.checkout_path):
1310 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001311 # svn revert won't work if the directory doesn't exist. It needs to
1312 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001313 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001314 # Don't reuse the args.
1315 return self.update(options, [], file_list)
1316
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001317 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001318 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1319 print('________ found .git directory; skipping %s' % self.relpath)
1320 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001321 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1322 print('________ found .hg directory; skipping %s' % self.relpath)
1323 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001324 if not options.force:
1325 raise gclient_utils.Error('Invalid checkout path, aborting')
1326 print(
1327 '\n_____ %s is not a valid svn checkout, synching instead' %
1328 self.relpath)
1329 gclient_utils.rmtree(self.checkout_path)
1330 # Don't reuse the args.
1331 return self.update(options, [], file_list)
1332
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001333 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001334 if file_list is not None:
1335 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001336 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001337 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001338 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001339 print(os.path.join(self.checkout_path, file_status[1]))
1340 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001341
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001342 # Revert() may delete the directory altogether.
1343 if not os.path.isdir(self.checkout_path):
1344 # Don't reuse the args.
1345 return self.update(options, [], file_list)
1346
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001347 try:
1348 # svn revert is so broken we don't even use it. Using
1349 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001350 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001351 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1352 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001353 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001354 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001355 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001356
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001357 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001358 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001359 try:
1360 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001361 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001362 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001363
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001364 def runhooks(self, options, args, file_list):
1365 self.status(options, args, file_list)
1366
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001367 def status(self, options, args, file_list):
1368 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001369 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001370 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001371 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001372 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1373 'The directory does not exist.') %
1374 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001375 # There's no file list to retrieve.
1376 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001377 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001378
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001379 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001380 """Verifies the validity of the revision for this repository."""
1381 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1382 raise gclient_utils.Error(
1383 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1384 'correct.') % rev)
1385 return rev
1386
msb@chromium.orge6f78352010-01-13 17:05:33 +00001387 def FullUrlForRelativeUrl(self, url):
1388 # Find the forth '/' and strip from there. A bit hackish.
1389 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001390
maruel@chromium.org669600d2010-09-01 19:06:31 +00001391 def _Run(self, args, options, **kwargs):
1392 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001393 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001394 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001395 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001396
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001397 def Svnversion(self):
1398 """Runs the lowest checked out revision in the current project."""
1399 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1400 return info['Revision']
1401
maruel@chromium.org669600d2010-09-01 19:06:31 +00001402 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1403 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001404 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001405 scm.SVN.RunAndGetFileList(
1406 options.verbose,
1407 args + ['--ignore-externals'],
1408 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001409 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001410
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001411 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001412 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001413 """Add additional flags to command depending on what options are set.
1414 command should be a list of strings that represents an svn command.
1415
1416 This method returns a new list to be used as a command."""
1417 new_command = command[:]
1418 if revision:
1419 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001420 # We don't want interaction when jobs are used.
1421 if options.jobs > 1:
1422 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001423 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001424 # --accept was added to 'svn update' in svn 1.6.
1425 if not scm.SVN.AssertVersion('1.5')[0]:
1426 return new_command
1427
1428 # It's annoying to have it block in the middle of a sync, just sensible
1429 # defaults.
1430 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001431 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001432 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1433 new_command.extend(('--accept', 'theirs-conflict'))
1434 elif options.manually_grab_svn_rev:
1435 new_command.append('--force')
1436 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1437 new_command.extend(('--accept', 'postpone'))
1438 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1439 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001440 return new_command