blob: af74b754d187d37ae87d7c26c1b0cff4c670cd81 [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
maruel@chromium.orgfd876172010-04-30 14:01:05 +000015import time
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000016
17import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000018import scm
19import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000020
21
szager@chromium.org71cbb502013-04-19 23:30:15 +000022THIS_FILE_PATH = os.path.abspath(__file__)
23
24
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000025class DiffFiltererWrapper(object):
26 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000027 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000028 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000029 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000030 original_prefix = "--- "
31 working_prefix = "+++ "
32
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000033 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000034 # Note that we always use '/' as the path separator to be
35 # consistent with svn's cygwin-style output on Windows
36 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000037 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000038
maruel@chromium.org6e29d572010-06-04 17:32:20 +000039 def SetCurrentFile(self, current_file):
40 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000041
iannucci@chromium.org3830a672013-02-19 20:15:14 +000042 @property
43 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000044 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000045
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000046 def _Replace(self, line):
47 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000048
49 def Filter(self, line):
50 if (line.startswith(self.index_string)):
51 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000052 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000053 else:
54 if (line.startswith(self.original_prefix) or
55 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000056 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000057 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000058
59
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000060class SvnDiffFilterer(DiffFiltererWrapper):
61 index_string = "Index: "
62
63
64class GitDiffFilterer(DiffFiltererWrapper):
65 index_string = "diff --git "
66
67 def SetCurrentFile(self, current_file):
68 # Get filename by parsing "a/<filename> b/<filename>"
69 self._current_file = current_file[:(len(current_file)/2)][2:]
70
71 def _Replace(self, line):
72 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
73
74
bratell@opera.com18fa4542013-05-21 13:30:46 +000075def ask_for_data(prompt, options):
76 if options.jobs > 1:
77 raise gclient_utils.Error("Background task requires input. Rerun "
78 "gclient with --jobs=1 so that\n"
79 "interaction is possible.")
maruel@chromium.org90541732011-04-01 17:54:18 +000080 try:
81 return raw_input(prompt)
82 except KeyboardInterrupt:
83 # Hide the exception.
84 sys.exit(1)
85
86
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000087### SCM abstraction layer
88
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000089# Factory Method for SCM wrapper creation
90
maruel@chromium.org9eda4112010-06-11 18:56:10 +000091def GetScmName(url):
92 if url:
93 url, _ = gclient_utils.SplitUrlRevision(url)
94 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000095 url.startswith('git+http://') or url.startswith('git+https://') or
maruel@chromium.org9eda4112010-06-11 18:56:10 +000096 url.endswith('.git')):
97 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000098 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000099 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000100 return 'svn'
101 return None
102
103
104def CreateSCM(url, root_dir=None, relpath=None):
105 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000106 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000107 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000108 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000109
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000110 scm_name = GetScmName(url)
111 if not scm_name in SCM_MAP:
112 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000113 scm_class = SCM_MAP[scm_name]
114 if not scm_class.BinaryExists():
115 raise gclient_utils.Error('%s command not found' % scm_name)
116 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000117
118
119# SCMWrapper base class
120
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000121class SCMWrapper(object):
122 """Add necessary glue between all the supported SCM.
123
msb@chromium.orgd6504212010-01-13 17:34:31 +0000124 This is the abstraction layer to bind to different SCM.
125 """
szager@chromium.org12b07e72013-05-03 22:06:34 +0000126 nag_timer = 30
joi@chromium.orgf10ffa92013-07-04 14:42:35 +0000127 nag_max = 30
szager@chromium.org12b07e72013-05-03 22:06:34 +0000128
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000129 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000130 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000131 self._root_dir = root_dir
132 if self._root_dir:
133 self._root_dir = self._root_dir.replace('/', os.sep)
134 self.relpath = relpath
135 if self.relpath:
136 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000137 if self.relpath and self._root_dir:
138 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000139
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000140 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000141 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000142 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000143
144 if not command in commands:
145 raise gclient_utils.Error('Unknown command %s' % command)
146
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000147 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000148 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000149 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000150
151 return getattr(self, command)(options, args, file_list)
152
153
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000154class GitFilter(object):
155 """A filter_fn implementation for quieting down git output messages.
156
157 Allows a custom function to skip certain lines (predicate), and will throttle
158 the output of percentage completed lines to only output every X seconds.
159 """
160 PERCENT_RE = re.compile('.* ([0-9]{1,2})% .*')
161
162 def __init__(self, time_throttle=0, predicate=None):
163 """
164 Args:
165 time_throttle (int): GitFilter will throttle 'noisy' output (such as the
166 XX% complete messages) to only be printed at least |time_throttle|
167 seconds apart.
168 predicate (f(line)): An optional function which is invoked for every line.
169 The line will be skipped if predicate(line) returns False.
170 """
171 self.last_time = 0
172 self.time_throttle = time_throttle
173 self.predicate = predicate
174
175 def __call__(self, line):
176 # git uses an escape sequence to clear the line; elide it.
177 esc = line.find(unichr(033))
178 if esc > -1:
179 line = line[:esc]
180 if self.predicate and not self.predicate(line):
181 return
182 now = time.time()
183 match = self.PERCENT_RE.match(line)
184 if not match:
185 self.last_time = 0
186 if (now - self.last_time) >= self.time_throttle:
187 self.last_time = now
188 print line
189
190
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000191class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000192 """Wrapper for Git"""
193
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000194 cache_dir = None
195 # If a given cache is used in a solution more than once, prevent multiple
196 # threads from updating it simultaneously.
197 cache_locks = collections.defaultdict(threading.Lock)
198
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000199 def __init__(self, url=None, root_dir=None, relpath=None):
200 """Removes 'git+' fake prefix from git URL."""
201 if url.startswith('git+http://') or url.startswith('git+https://'):
202 url = url[4:]
203 SCMWrapper.__init__(self, url, root_dir, relpath)
204
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000205 @staticmethod
206 def BinaryExists():
207 """Returns true if the command exists."""
208 try:
209 # We assume git is newer than 1.7. See: crbug.com/114483
210 result, version = scm.GIT.AssertVersion('1.7')
211 if not result:
212 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
213 return result
214 except OSError:
215 return False
216
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000217 def GetCheckoutRoot(self):
218 return scm.GIT.GetCheckoutRoot(self.checkout_path)
219
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000220 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000221 """Returns the given revision's date in ISO-8601 format (which contains the
222 time zone)."""
223 # TODO(floitsch): get the time-stamp of the given revision and not just the
224 # time-stamp of the currently checked out revision.
225 return self._Capture(['log', '-n', '1', '--format=%ai'])
226
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000227 @staticmethod
228 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000229 """'Cleanup' the repo.
230
231 There's no real git equivalent for the svn cleanup command, do a no-op.
232 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000233
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000234 def diff(self, options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000235 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000236 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000237
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000238 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000239 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000240 repository.
241
242 The patch file is generated from a diff of the merge base of HEAD and
243 its upstream branch.
244 """
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000245 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000246 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000247 ['git', 'diff', merge_base],
248 cwd=self.checkout_path,
szager@chromium.org12b07e72013-05-03 22:06:34 +0000249 nag_timer=self.nag_timer,
250 nag_max=self.nag_max,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000251 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000252
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000253 def UpdateSubmoduleConfig(self):
254 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
255 'submodule.$name.ignore', '||',
256 'git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000257 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000258 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000259 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000260 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000261 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000262 kwargs = {'cwd': self.checkout_path,
263 'print_stdout': False,
szager@chromium.org12b07e72013-05-03 22:06:34 +0000264 'nag_timer': self.nag_timer,
265 'nag_max': self.nag_max,
szager@chromium.org987b0612012-07-09 23:41:08 +0000266 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000267 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000268 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
269 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000270 except subprocess2.CalledProcessError:
271 # Not a fatal error, or even very interesting in a non-git-submodule
272 # world. So just keep it quiet.
273 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000274 try:
275 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
276 except subprocess2.CalledProcessError:
277 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000278
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000279 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
280
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000281 def _FetchAndReset(self, revision, file_list, options):
282 """Equivalent to git fetch; git reset."""
283 quiet = []
284 if not options.verbose:
285 quiet = ['--quiet']
286 self._UpdateBranchHeads(options, fetch=False)
iannucci@chromium.orgb8376882013-07-01 20:08:10 +0000287
288 fetch_cmd = [
289 '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', 'origin', '--prune']
290 self._Run(fetch_cmd + quiet, options)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000291 self._Run(['reset', '--hard', revision] + quiet, options)
292 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000293 if file_list is not None:
294 files = self._Capture(['ls-files']).splitlines()
295 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000296
msb@chromium.orge28e4982009-09-25 20:51:45 +0000297 def update(self, options, args, file_list):
298 """Runs git to update or transparently checkout the working copy.
299
300 All updated files will be appended to file_list.
301
302 Raises:
303 Error: if can't get URL for relative path.
304 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000305 if args:
306 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
307
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000308 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000309
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000310 default_rev = "refs/heads/master"
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000311 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000312 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000313 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000314 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000315 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000316 # Override the revision number.
317 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000318 if revision == 'unmanaged':
319 revision = None
320 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000321 if not revision:
322 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000323
floitsch@google.comeaab7842011-04-28 09:07:58 +0000324 if gclient_utils.IsDateRevision(revision):
325 # Date-revisions only work on git-repositories if the reflog hasn't
326 # expired yet. Use rev-list to get the corresponding revision.
327 # git rev-list -n 1 --before='time-stamp' branchname
328 if options.transitive:
329 print('Warning: --transitive only works for SVN repositories.')
330 revision = default_rev
331
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000332 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000333 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000334
335 printed_path = False
336 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000337 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000338 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000339 verbose = ['--verbose']
340 printed_path = True
341
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000342 url = self._CreateOrUpdateCache(url, options)
343
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000344 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000345 rev_type = "branch"
346 elif revision.startswith('origin/'):
347 # For compatability with old naming, translate 'origin' to 'refs/heads'
348 revision = revision.replace('origin/', 'refs/heads/')
349 rev_type = "branch"
350 else:
351 # hash is also a tag, only make a distinction at checkout
352 rev_type = "hash"
353
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000354 if (not os.path.exists(self.checkout_path) or
355 (os.path.isdir(self.checkout_path) and
356 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000357 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000358 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000359 if file_list is not None:
360 files = self._Capture(['ls-files']).splitlines()
361 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000362 if not verbose:
363 # Make the output a little prettier. It's nice to have some whitespace
364 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000365 print('')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000366 return
367
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000368 if not managed:
mmoss@chromium.org96833fa2013-04-17 03:26:37 +0000369 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgf5cc4272012-06-21 22:38:07 +0000370 self.UpdateSubmoduleConfig()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000371 print ('________ unmanaged solution; skipping %s' % self.relpath)
372 return
373
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000374 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
375 raise gclient_utils.Error('\n____ %s%s\n'
376 '\tPath is not a git repo. No .git dir.\n'
377 '\tTo resolve:\n'
378 '\t\trm -rf %s\n'
379 '\tAnd run gclient sync again\n'
380 % (self.relpath, rev_str, self.relpath))
381
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000382 # See if the url has changed (the unittests use git://foo for the url, let
383 # that through).
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000384 current_url = self._Capture(['config', 'remote.origin.url'])
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000385 return_early = False
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000386 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
387 # unit test pass. (and update the comment above)
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000388 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
389 # This allows devs to use experimental repos which have a different url
390 # but whose branch(s) are the same as official repos.
391 if (current_url != url and
392 url != 'git://foo' and
393 subprocess2.capture(
394 ['git', 'config', 'remote.origin.gclient-auto-fix-url'],
395 cwd=self.checkout_path).strip() != 'False'):
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000396 print('_____ switching %s to a new upstream' % self.relpath)
397 # Make sure it's clean
398 self._CheckClean(rev_str)
399 # Switch over to the new upstream
400 self._Run(['remote', 'set-url', 'origin', url], options)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000401 self._FetchAndReset(revision, file_list, options)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000402 return_early = True
403
404 # Need to do this in the normal path as well as in the post-remote-switch
405 # path.
406 self._PossiblySwitchCache(url, options)
407
408 if return_early:
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000409 return
410
msb@chromium.org5bde4852009-12-14 16:47:12 +0000411 cur_branch = self._GetCurrentBranch()
412
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000413 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000414 # 0) HEAD is detached. Probably from our initial clone.
415 # - make sure HEAD is contained by a named ref, then update.
416 # Cases 1-4. HEAD is a branch.
417 # 1) current branch is not tracking a remote branch (could be git-svn)
418 # - try to rebase onto the new hash or branch
419 # 2) current branch is tracking a remote branch with local committed
420 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000421 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000422 # 3) current branch is tracking a remote branch w/or w/out changes,
423 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000424 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000425 # 4) current branch is tracking a remote branch, switches to a different
426 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000427 # - exit
428
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000429 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
430 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000431 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
432 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000433 if cur_branch is None:
434 upstream_branch = None
435 current_type = "detached"
436 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000437 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000438 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
439 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
440 current_type = "hash"
441 logging.debug("Current branch is not tracking an upstream (remote)"
442 " branch.")
443 elif upstream_branch.startswith('refs/remotes'):
444 current_type = "branch"
445 else:
446 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000447
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000448 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000449 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000450 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000451 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000452 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000453 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000454
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000455 self._UpdateBranchHeads(options, fetch=True)
456
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000457 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000458 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000459 target = 'HEAD'
460 if options.upstream and upstream_branch:
461 target = upstream_branch
462 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000463
msb@chromium.org786fb682010-06-02 15:16:23 +0000464 if current_type == 'detached':
465 # case 0
466 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000467 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000468 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000469 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000470 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000471 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000472 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000473 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000475 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 newbase=revision, printed_path=printed_path)
477 printed_path = True
478 else:
479 # Can't find a merge-base since we don't know our upstream. That makes
480 # this command VERY likely to produce a rebase failure. For now we
481 # assume origin is our upstream since that's what the old behavior was.
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000482 upstream_branch = 'origin'
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000483 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000484 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000485 self._AttemptRebase(upstream_branch, files, options,
486 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000487 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000488 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000489 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000490 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000491 newbase=revision, printed_path=printed_path)
492 printed_path = True
493 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
494 # case 4
495 new_base = revision.replace('heads', 'remotes/origin')
496 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000497 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 switch_error = ("Switching upstream branch from %s to %s\n"
499 % (upstream_branch, new_base) +
500 "Please merge or rebase manually:\n" +
501 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
502 "OR git checkout -b <some new branch> %s" % new_base)
503 raise gclient_utils.Error(switch_error)
504 else:
505 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000506 if files is not None:
507 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000508 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000509 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000511 merge_args = ['merge']
512 if not options.merge:
513 merge_args.append('--ff-only')
514 merge_args.append(upstream_branch)
515 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000516 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000517 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
518 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000519 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000520 printed_path = True
521 while True:
522 try:
maruel@chromium.org90541732011-04-01 17:54:18 +0000523 action = ask_for_data(
524 'Cannot fast-forward merge, attempt to rebase? '
bratell@opera.com18fa4542013-05-21 13:30:46 +0000525 '(y)es / (q)uit / (s)kip : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000526 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000527 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000528 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000529 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000530 printed_path=printed_path)
531 printed_path = True
532 break
533 elif re.match(r'quit|q', action, re.I):
534 raise gclient_utils.Error("Can't fast-forward, please merge or "
535 "rebase manually.\n"
536 "cd %s && git " % self.checkout_path
537 + "rebase %s" % upstream_branch)
538 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000539 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000540 return
541 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000542 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000543 elif re.match("error: Your local changes to '.*' would be "
544 "overwritten by merge. Aborting.\nPlease, commit your "
545 "changes or stash them before you can merge.\n",
546 e.stderr):
547 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000548 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000549 printed_path = True
550 raise gclient_utils.Error(e.stderr)
551 else:
552 # Some other problem happened with the merge
553 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000554 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000555 raise
556 else:
557 # Fast-forward merge was successful
558 if not re.match('Already up-to-date.', merge_output) or verbose:
559 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000560 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000561 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000562 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000563 if not verbose:
564 # Make the output a little prettier. It's nice to have some
565 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000566 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000567
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000568 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000569 if file_list is not None:
570 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000571
572 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000573 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000574 raise gclient_utils.Error('\n____ %s%s\n'
575 '\nConflict while rebasing this branch.\n'
576 'Fix the conflict and run gclient again.\n'
577 'See man git-rebase for details.\n'
578 % (self.relpath, rev_str))
579
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000580 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000581 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000582
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000583 # If --reset and --delete_unversioned_trees are specified, remove any
584 # untracked directories.
585 if options.reset and options.delete_unversioned_trees:
586 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
587 # merge-base by default), so doesn't include untracked files. So we use
588 # 'git ls-files --directory --others --exclude-standard' here directly.
589 paths = scm.GIT.Capture(
590 ['ls-files', '--directory', '--others', '--exclude-standard'],
591 self.checkout_path)
592 for path in (p for p in paths.splitlines() if p.endswith('/')):
593 full_path = os.path.join(self.checkout_path, path)
594 if not os.path.islink(full_path):
595 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000596 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000597
598
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000599 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000600 """Reverts local modifications.
601
602 All reverted files will be appended to file_list.
603 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000604 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000605 # revert won't work if the directory doesn't exist. It needs to
606 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000607 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000608 # Don't reuse the args.
609 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000610
611 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000612 if options.upstream:
613 if self._GetCurrentBranch():
614 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
615 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000616 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000617 if not deps_revision:
618 deps_revision = default_rev
619 if deps_revision.startswith('refs/heads/'):
620 deps_revision = deps_revision.replace('refs/heads/', 'origin/')
621
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000622 if file_list is not None:
623 files = self._Capture(['diff', deps_revision, '--name-only']).split()
624
maruel@chromium.org37e89872010-09-07 16:11:33 +0000625 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000626 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000627
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000628 if file_list is not None:
629 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
630
631 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000632 """Returns revision"""
633 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000634
msb@chromium.orge28e4982009-09-25 20:51:45 +0000635 def runhooks(self, options, args, file_list):
636 self.status(options, args, file_list)
637
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000638 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000639 """Display status information."""
640 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000641 print(('\n________ couldn\'t run status in %s:\n'
642 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000643 else:
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000644 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000645 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000646 if file_list is not None:
647 files = self._Capture(['diff', '--name-only', merge_base]).split()
648 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000649
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000650 def GetUsableRev(self, rev, options):
651 """Finds a useful revision for this repository.
652
653 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
654 will be called on the source."""
655 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000656 if not os.path.isdir(self.checkout_path):
657 raise gclient_utils.Error(
658 ( 'We could not find a valid hash for safesync_url response "%s".\n'
659 'Safesync URLs with a git checkout currently require the repo to\n'
660 'be cloned without a safesync_url before adding the safesync_url.\n'
661 'For more info, see: '
662 'http://code.google.com/p/chromium/wiki/UsingNewGit'
663 '#Initial_checkout' ) % rev)
664 elif rev.isdigit() and len(rev) < 7:
665 # Handles an SVN rev. As an optimization, only verify an SVN revision as
666 # [0-9]{1,6} for now to avoid making a network request.
667 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000668 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
669 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000670 try:
671 logging.debug('Looking for git-svn configuration optimizations.')
672 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
673 cwd=self.checkout_path):
674 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
675 except subprocess2.CalledProcessError:
676 logging.debug('git config --get svn-remote.svn.fetch failed, '
677 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000678 if options.verbose:
679 print('Running git svn fetch. This might take a while.\n')
680 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000681 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000682 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
683 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000684 except gclient_utils.Error, e:
685 sha1 = e.message
686 print('\nWarning: Could not find a git revision with accurate\n'
687 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
688 'the closest sane git revision, which is:\n'
689 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000690 if not sha1:
691 raise gclient_utils.Error(
692 ( 'It appears that either your git-svn remote is incorrectly\n'
693 'configured or the revision in your safesync_url is\n'
694 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
695 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000696 else:
697 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
698 sha1 = rev
699 else:
700 # May exist in origin, but we don't have it yet, so fetch and look
701 # again.
702 scm.GIT.Capture(['fetch', 'origin'], cwd=self.checkout_path)
703 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
704 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000705
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000706 if not sha1:
707 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000708 ( 'We could not find a valid hash for safesync_url response "%s".\n'
709 'Safesync URLs with a git checkout currently require a git-svn\n'
710 'remote or a safesync_url that provides git sha1s. Please add a\n'
711 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000712 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000713 '#Initial_checkout' ) % rev)
714
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000715 return sha1
716
msb@chromium.orge6f78352010-01-13 17:05:33 +0000717 def FullUrlForRelativeUrl(self, url):
718 # Strip from last '/'
719 # Equivalent to unix basename
720 base_url = self.url
721 return base_url[:base_url.rfind('/')] + url
722
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000723 @staticmethod
724 def _NormalizeGitURL(url):
725 '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
726 idx = url.find('://')
727 if idx != -1:
728 url = url[idx+3:]
729 if not url.endswith('.git'):
730 url += '.git'
731 return url
732
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000733 def _PossiblySwitchCache(self, url, options):
734 """Handles switching a repo from with-cache to direct, or vice versa.
735
736 When we go from direct to with-cache, the remote url changes from the
737 'real' url to the local file url (in cache_dir). Therefore, this function
738 assumes that |url| points to the correctly-switched-over local file url, if
739 we're in cache_mode.
740
741 When we go from with-cache to direct, assume that the normal url-switching
742 code already flipped the remote over, and we just need to repack and break
743 the dependency to the cache.
744 """
745
746 altfile = os.path.join(
747 self.checkout_path, '.git', 'objects', 'info', 'alternates')
748 if self.cache_dir:
749 if not os.path.exists(altfile):
750 try:
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000751 with open(altfile, 'w') as f:
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000752 f.write(os.path.join(url, 'objects'))
753 # pylint: disable=C0301
754 # This dance is necessary according to emperical evidence, also at:
755 # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
756 self._Run(['repack', '-ad'], options)
757 self._Run(['repack', '-adl'], options)
758 except Exception:
759 # If something goes wrong, try to remove the altfile so we'll go down
760 # this path again next time.
761 try:
762 os.remove(altfile)
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000763 except OSError as e:
764 print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000765 raise
766 else:
767 if os.path.exists(altfile):
768 self._Run(['repack', '-a'], options)
769 os.remove(altfile)
770
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000771 def _CreateOrUpdateCache(self, url, options):
772 """Make a new git mirror or update existing mirror for |url|, and return the
773 mirror URI to clone from.
774
775 If no cache-dir is specified, just return |url| unchanged.
776 """
777 if not self.cache_dir:
778 return url
779
780 # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
781 folder = os.path.join(
782 self.cache_dir,
783 self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000784 altfile = os.path.join(folder, 'objects', 'info', 'alternates')
785
786 # If we're bringing an old cache up to date or cloning a new cache, and the
787 # existing repo is currently a direct clone, use its objects to help out
788 # the fetch here.
789 checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
790 checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
791 use_reference = (
792 os.path.exists(checkout_objects) and
793 not os.path.exists(checkout_altfile))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000794
795 v = ['-v'] if options.verbose else []
796 filter_fn = lambda l: '[up to date]' not in l
797 with self.cache_locks[folder]:
798 gclient_utils.safe_makedirs(self.cache_dir)
799 if not os.path.exists(os.path.join(folder, 'config')):
800 gclient_utils.rmtree(folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000801 cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
802 '--progress', '--mirror']
803
804 if use_reference:
805 cmd += ['--reference', os.path.abspath(self.checkout_path)]
806
807 self._Run(cmd + [url, folder],
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000808 options, git_filter=True, filter_fn=filter_fn,
809 cwd=self.cache_dir)
810 else:
811 # For now, assert that host/path/to/repo.git is identical. We may want
812 # to relax this restriction in the future to allow for smarter cache
813 # repo update schemes (such as pulling the same repo, but from a
814 # different host).
815 existing_url = self._Capture(['config', 'remote.origin.url'],
816 cwd=folder)
817 assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
818
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000819 if use_reference:
820 with open(altfile, 'w') as f:
821 f.write(os.path.abspath(checkout_objects))
822
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000823 # Would normally use `git remote update`, but it doesn't support
824 # --progress, so use fetch instead.
825 self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
826 options, git_filter=True, filter_fn=filter_fn, cwd=folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000827
828 # If the clone has an object dependency on the existing repo, break it
829 # with repack and remove the linkage.
830 if os.path.exists(altfile):
831 self._Run(['repack', '-a'], options, cwd=folder)
832 os.remove(altfile)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000833 return folder
834
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000835 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000836 """Clone a git repository from the given URL.
837
msb@chromium.org786fb682010-06-02 15:16:23 +0000838 Once we've cloned the repo, we checkout a working branch if the specified
839 revision is a branch head. If it is a tag or a specific commit, then we
840 leave HEAD detached as it makes future updates simpler -- in this case the
841 user should first create a new branch or switch to an existing branch before
842 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000843 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000844 # git clone doesn't seem to insert a newline properly before printing
845 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000846 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000847 template_path = os.path.join(
848 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000849 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
850 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000851 if self.cache_dir:
852 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000853 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000854 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000855 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000856 # If the parent directory does not exist, Git clone on Windows will not
857 # create it, so we need to do it manually.
858 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000859 gclient_utils.safe_makedirs(parent_dir)
860 tmp_dir = tempfile.mkdtemp(
861 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
862 dir=parent_dir)
863 try:
864 clone_cmd.append(tmp_dir)
865 for i in xrange(3):
866 try:
867 self._Run(clone_cmd, options, cwd=self._root_dir, git_filter=True)
868 break
869 except subprocess2.CalledProcessError as e:
870 gclient_utils.rmtree(os.path.join(tmp_dir, '.git'))
871 if e.returncode != 128 or i == 2:
872 raise
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000873 print(str(e))
874 print('Retrying...')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000875 gclient_utils.safe_makedirs(self.checkout_path)
876 os.rename(os.path.join(tmp_dir, '.git'),
877 os.path.join(self.checkout_path, '.git'))
878 finally:
879 if os.listdir(tmp_dir):
880 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
881 gclient_utils.rmtree(tmp_dir)
882 if revision.startswith('refs/heads/'):
883 self._Run(
884 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
885 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000886 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000887 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000888 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000889 ('Checked out %s to a detached HEAD. Before making any commits\n'
890 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
891 'an existing branch or use \'git checkout origin -b <branch>\' to\n'
892 'create a new branch for your work.') % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000893
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000894 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000895 branch=None, printed_path=False):
896 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000897 if files is not None:
898 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000899 revision = upstream
900 if newbase:
901 revision = newbase
902 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000903 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000904 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000905 printed_path = True
906 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000907 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000908
909 # Build the rebase command here using the args
910 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
911 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000912 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000913 rebase_cmd.append('--verbose')
914 if newbase:
915 rebase_cmd.extend(['--onto', newbase])
916 rebase_cmd.append(upstream)
917 if branch:
918 rebase_cmd.append(branch)
919
920 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000921 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000922 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000923 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
924 re.match(r'cannot rebase: your index contains uncommitted changes',
925 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000926 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000927 rebase_action = ask_for_data(
928 'Cannot rebase because of unstaged changes.\n'
929 '\'git reset --hard HEAD\' ?\n'
930 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000931 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000932 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000933 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000934 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000935 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000936 break
937 elif re.match(r'quit|q', rebase_action, re.I):
938 raise gclient_utils.Error("Please merge or rebase manually\n"
939 "cd %s && git " % self.checkout_path
940 + "%s" % ' '.join(rebase_cmd))
941 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000942 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000943 continue
944 else:
945 gclient_utils.Error("Input not recognized")
946 continue
947 elif re.search(r'^CONFLICT', e.stdout, re.M):
948 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
949 "Fix the conflict and run gclient again.\n"
950 "See 'man git-rebase' for details.\n")
951 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000952 print(e.stdout.strip())
953 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000954 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
955 "manually.\ncd %s && git " %
956 self.checkout_path
957 + "%s" % ' '.join(rebase_cmd))
958
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000959 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000960 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000961 # Make the output a little prettier. It's nice to have some
962 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000963 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000964
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000965 @staticmethod
966 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000967 (ok, current_version) = scm.GIT.AssertVersion(min_version)
968 if not ok:
969 raise gclient_utils.Error('git version %s < minimum required %s' %
970 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000971
msb@chromium.org786fb682010-06-02 15:16:23 +0000972 def _IsRebasing(self):
973 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
974 # have a plumbing command to determine whether a rebase is in progress, so
975 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
976 g = os.path.join(self.checkout_path, '.git')
977 return (
978 os.path.isdir(os.path.join(g, "rebase-merge")) or
979 os.path.isdir(os.path.join(g, "rebase-apply")))
980
981 def _CheckClean(self, rev_str):
982 # Make sure the tree is clean; see git-rebase.sh for reference
983 try:
984 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000985 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000986 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000987 raise gclient_utils.Error('\n____ %s%s\n'
988 '\tYou have unstaged changes.\n'
989 '\tPlease commit, stash, or reset.\n'
990 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000991 try:
992 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000993 '--ignore-submodules', 'HEAD', '--'],
994 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000995 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000996 raise gclient_utils.Error('\n____ %s%s\n'
997 '\tYour index contains uncommitted changes\n'
998 '\tPlease commit, stash, or reset.\n'
999 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001000
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001001 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +00001002 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1003 # reference by a commit). If not, error out -- most likely a rebase is
1004 # in progress, try to detect so we can give a better error.
1005 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001006 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1007 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001008 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001009 # Commit is not contained by any rev. See if the user is rebasing:
1010 if self._IsRebasing():
1011 # Punt to the user
1012 raise gclient_utils.Error('\n____ %s%s\n'
1013 '\tAlready in a conflict, i.e. (no branch).\n'
1014 '\tFix the conflict and run gclient again.\n'
1015 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1016 '\tSee man git-rebase for details.\n'
1017 % (self.relpath, rev_str))
1018 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001019 name = ('saved-by-gclient-' +
1020 self._Capture(['rev-parse', '--short', 'HEAD']))
1021 self._Capture(['branch', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001022 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001023 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001024
msb@chromium.org5bde4852009-12-14 16:47:12 +00001025 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001026 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001027 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001028 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001029 return None
1030 return branch
1031
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001032 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001033 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +00001034 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +00001035 stderr=subprocess2.VOID,
szager@chromium.org12b07e72013-05-03 22:06:34 +00001036 nag_timer=self.nag_timer,
1037 nag_max=self.nag_max,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001038 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001039
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001040 def _UpdateBranchHeads(self, options, fetch=False):
1041 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1042 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
1043 backoff_time = 5
1044 for _ in range(3):
1045 try:
1046 config_cmd = ['config', 'remote.origin.fetch',
1047 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1048 '^\\+refs/branch-heads/\\*:.*$']
1049 self._Run(config_cmd, options)
1050 if fetch:
iannucci@chromium.orgb8376882013-07-01 20:08:10 +00001051 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', 'origin']
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001052 if options.verbose:
1053 fetch_cmd.append('--verbose')
1054 self._Run(fetch_cmd, options)
1055 break
1056 except subprocess2.CalledProcessError, e:
1057 print(str(e))
1058 print('Retrying in %.1f seconds...' % backoff_time)
1059 time.sleep(backoff_time)
1060 backoff_time *= 1.3
1061
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001062 def _Run(self, args, _options, git_filter=False, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001063 kwargs.setdefault('cwd', self.checkout_path)
szager@chromium.org12b07e72013-05-03 22:06:34 +00001064 kwargs.setdefault('nag_timer', self.nag_timer)
1065 kwargs.setdefault('nag_max', self.nag_max)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001066 if git_filter:
1067 kwargs['filter_fn'] = GitFilter(kwargs['nag_timer'] / 2,
1068 kwargs.get('filter_fn'))
1069 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001070 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +00001071 # By default, git will use an interactive terminal prompt when a username/
1072 # password is needed. That shouldn't happen in the chromium workflow,
1073 # and if it does, then gclient may hide the prompt in the midst of a flood
1074 # of terminal spew. The only indication that something has gone wrong
1075 # will be when gclient hangs unresponsively. Instead, we disable the
1076 # password prompt and simply allow git to fail noisily. The error
1077 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001078 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1079 env.setdefault('GIT_ASKPASS', 'true')
1080 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001081 else:
1082 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +00001083 stdout = kwargs.get('stdout', sys.stdout)
1084 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
1085 ' '.join(args), kwargs['cwd']))
1086 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001087
1088
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001089class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001090 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001091
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001092 @staticmethod
1093 def BinaryExists():
1094 """Returns true if the command exists."""
1095 try:
1096 result, version = scm.SVN.AssertVersion('1.4')
1097 if not result:
1098 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1099 return result
1100 except OSError:
1101 return False
1102
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001103 def GetCheckoutRoot(self):
1104 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1105
floitsch@google.comeaab7842011-04-28 09:07:58 +00001106 def GetRevisionDate(self, revision):
1107 """Returns the given revision's date in ISO-8601 format (which contains the
1108 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001109 date = scm.SVN.Capture(
1110 ['propget', '--revprop', 'svn:date', '-r', revision],
1111 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001112 return date.strip()
1113
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001114 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001115 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001116 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001117
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001118 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001119 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001120 if not os.path.isdir(self.checkout_path):
1121 raise gclient_utils.Error('Directory %s is not present.' %
1122 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001123 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001124
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001125 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001126 """Generates a patch file which can be applied to the root of the
1127 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001128 if not os.path.isdir(self.checkout_path):
1129 raise gclient_utils.Error('Directory %s is not present.' %
1130 self.checkout_path)
1131 gclient_utils.CheckCallAndFilter(
1132 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1133 cwd=self.checkout_path,
1134 print_stdout=False,
szager@chromium.org12b07e72013-05-03 22:06:34 +00001135 nag_timer=self.nag_timer,
1136 nag_max=self.nag_max,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001137 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001138
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001139 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001140 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001141
1142 All updated files will be appended to file_list.
1143
1144 Raises:
1145 Error: if can't get URL for relative path.
1146 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001147 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001148 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001149 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001150 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001151 return
1152
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001153 hg_path = os.path.join(self.checkout_path, '.hg')
1154 if os.path.exists(hg_path):
1155 print('________ found .hg directory; skipping %s' % self.relpath)
1156 return
1157
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001158 if args:
1159 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1160
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001161 # revision is the revision to match. It is None if no revision is specified,
1162 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001163 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001164 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001165 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001166 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001167 if options.revision:
1168 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001169 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001170 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001171 if revision != 'unmanaged':
1172 forced_revision = True
1173 # Reconstruct the url.
1174 url = '%s@%s' % (url, revision)
1175 rev_str = ' at %s' % revision
1176 else:
1177 managed = False
1178 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001179 else:
1180 forced_revision = False
1181 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001182
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001183 # Get the existing scm url and the revision number of the current checkout.
1184 exists = os.path.exists(self.checkout_path)
1185 if exists and managed:
1186 try:
1187 from_info = scm.SVN.CaptureLocalInfo(
1188 [], os.path.join(self.checkout_path, '.'))
1189 except (gclient_utils.Error, subprocess2.CalledProcessError):
1190 if options.reset and options.delete_unversioned_trees:
1191 print 'Removing troublesome path %s' % self.checkout_path
1192 gclient_utils.rmtree(self.checkout_path)
1193 exists = False
1194 else:
1195 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1196 'present. Delete the directory and try again.')
1197 raise gclient_utils.Error(msg % self.checkout_path)
1198
1199 if not exists:
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001200 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001201 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001202 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001203 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001204 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001205 return
1206
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001207 if not managed:
1208 print ('________ unmanaged solution; skipping %s' % self.relpath)
1209 return
1210
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001211 if 'URL' not in from_info:
1212 raise gclient_utils.Error(
1213 ('gclient is confused. Couldn\'t get the url for %s.\n'
1214 'Try using @unmanaged.\n%s') % (
1215 self.checkout_path, from_info))
1216
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001217 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001218 dir_info = scm.SVN.CaptureStatus(
1219 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001220 if any(d[0][2] == 'L' for d in dir_info):
1221 try:
1222 self._Run(['cleanup', self.checkout_path], options)
1223 except subprocess2.CalledProcessError, e:
1224 # Get the status again, svn cleanup may have cleaned up at least
1225 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001226 dir_info = scm.SVN.CaptureStatus(
1227 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001228
1229 # Try to fix the failures by removing troublesome files.
1230 for d in dir_info:
1231 if d[0][2] == 'L':
1232 if d[0][0] == '!' and options.force:
1233 print 'Removing troublesome path %s' % d[1]
1234 gclient_utils.rmtree(d[1])
1235 else:
1236 print 'Not removing troublesome path %s automatically.' % d[1]
1237 if d[0][0] == '!':
1238 print 'You can pass --force to enable automatic removal.'
1239 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001240
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001241 # Retrieve the current HEAD version because svn is slow at null updates.
1242 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001243 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001244 revision = str(from_info_live['Revision'])
1245 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001246
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001247 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001248 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +00001249 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001250 to_info = scm.SVN.CaptureRemoteInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001251 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +00001252 # The url is invalid or the server is not accessible, it's safer to bail
1253 # out right now.
1254 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001255 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1256 and (from_info['UUID'] == to_info['UUID']))
1257 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001258 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001259 # We have different roots, so check if we can switch --relocate.
1260 # Subversion only permits this if the repository UUIDs match.
1261 # Perform the switch --relocate, then rewrite the from_url
1262 # to reflect where we "are now." (This is the same way that
1263 # Subversion itself handles the metadata when switch --relocate
1264 # is used.) This makes the checks below for whether we
1265 # can update to a revision or have to switch to a different
1266 # branch work as expected.
1267 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001268 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001269 from_info['Repository Root'],
1270 to_info['Repository Root'],
1271 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001272 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001273 from_info['URL'] = from_info['URL'].replace(
1274 from_info['Repository Root'],
1275 to_info['Repository Root'])
1276 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +00001277 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001278 # Look for local modifications but ignore unversioned files.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001279 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001280 if status[0][0] != '?':
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001281 raise gclient_utils.Error(
1282 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1283 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001284 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001285 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001286 print('\n_____ switching %s to a new checkout' % self.relpath)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001287 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001288 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001289 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001290 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001291 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001292 return
1293
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001294 # If the provided url has a revision number that matches the revision
1295 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001296 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001297 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001298 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001299 else:
1300 command = ['update', self.checkout_path]
1301 command = self._AddAdditionalUpdateFlags(command, options, revision)
1302 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001303
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001304 # If --reset and --delete_unversioned_trees are specified, remove any
1305 # untracked files and directories.
1306 if options.reset and options.delete_unversioned_trees:
1307 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1308 full_path = os.path.join(self.checkout_path, status[1])
1309 if (status[0][0] == '?'
1310 and os.path.isdir(full_path)
1311 and not os.path.islink(full_path)):
1312 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001313 gclient_utils.rmtree(full_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001314
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001315 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001316 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001317 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001318 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001319 # Create an empty checkout and then update the one file we want. Future
1320 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001321 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001322 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001323 if os.path.exists(os.path.join(self.checkout_path, filename)):
1324 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001325 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001326 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001327 # After the initial checkout, we can use update as if it were any other
1328 # dep.
1329 self.update(options, args, file_list)
1330 else:
1331 # If the installed version of SVN doesn't support --depth, fallback to
1332 # just exporting the file. This has the downside that revision
1333 # information is not stored next to the file, so we will have to
1334 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001335 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001336 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001337 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001338 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001339 command = self._AddAdditionalUpdateFlags(command, options,
1340 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001341 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001342
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001343 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001344 """Reverts local modifications. Subversion specific.
1345
1346 All reverted files will be appended to file_list, even if Subversion
1347 doesn't know about them.
1348 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001349 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001350 if os.path.exists(self.checkout_path):
1351 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001352 # svn revert won't work if the directory doesn't exist. It needs to
1353 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001354 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001355 # Don't reuse the args.
1356 return self.update(options, [], file_list)
1357
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001358 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
1359 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1360 print('________ found .git directory; skipping %s' % self.relpath)
1361 return
1362 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1363 print('________ found .hg directory; skipping %s' % self.relpath)
1364 return
1365 if not options.force:
1366 raise gclient_utils.Error('Invalid checkout path, aborting')
1367 print(
1368 '\n_____ %s is not a valid svn checkout, synching instead' %
1369 self.relpath)
1370 gclient_utils.rmtree(self.checkout_path)
1371 # Don't reuse the args.
1372 return self.update(options, [], file_list)
1373
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001374 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001375 if file_list is not None:
1376 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001377 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001378 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001379 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001380 print(os.path.join(self.checkout_path, file_status[1]))
1381 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001382
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001383 # Revert() may delete the directory altogether.
1384 if not os.path.isdir(self.checkout_path):
1385 # Don't reuse the args.
1386 return self.update(options, [], file_list)
1387
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001388 try:
1389 # svn revert is so broken we don't even use it. Using
1390 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001391 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001392 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1393 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001394 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001395 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001396 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001397
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001398 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001399 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001400 try:
1401 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001402 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001403 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001404
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001405 def runhooks(self, options, args, file_list):
1406 self.status(options, args, file_list)
1407
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001408 def status(self, options, args, file_list):
1409 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001410 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001411 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001412 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001413 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1414 'The directory does not exist.') %
1415 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001416 # There's no file list to retrieve.
1417 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001418 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001419
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001420 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001421 """Verifies the validity of the revision for this repository."""
1422 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1423 raise gclient_utils.Error(
1424 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1425 'correct.') % rev)
1426 return rev
1427
msb@chromium.orge6f78352010-01-13 17:05:33 +00001428 def FullUrlForRelativeUrl(self, url):
1429 # Find the forth '/' and strip from there. A bit hackish.
1430 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001431
maruel@chromium.org669600d2010-09-01 19:06:31 +00001432 def _Run(self, args, options, **kwargs):
1433 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001434 kwargs.setdefault('cwd', self.checkout_path)
szager@chromium.org12b07e72013-05-03 22:06:34 +00001435 kwargs.setdefault('nag_timer', self.nag_timer)
1436 kwargs.setdefault('nag_max', self.nag_max)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001437 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001438 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001439
1440 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1441 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001442 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001443 scm.SVN.RunAndGetFileList(
1444 options.verbose,
1445 args + ['--ignore-externals'],
1446 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001447 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001448
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001449 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001450 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001451 """Add additional flags to command depending on what options are set.
1452 command should be a list of strings that represents an svn command.
1453
1454 This method returns a new list to be used as a command."""
1455 new_command = command[:]
1456 if revision:
1457 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001458 # We don't want interaction when jobs are used.
1459 if options.jobs > 1:
1460 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001461 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001462 # --accept was added to 'svn update' in svn 1.6.
1463 if not scm.SVN.AssertVersion('1.5')[0]:
1464 return new_command
1465
1466 # It's annoying to have it block in the middle of a sync, just sensible
1467 # defaults.
1468 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001469 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001470 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1471 new_command.extend(('--accept', 'theirs-conflict'))
1472 elif options.manually_grab_svn_rev:
1473 new_command.append('--force')
1474 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1475 new_command.extend(('--accept', 'postpone'))
1476 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1477 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001478 return new_command