blob: bd709df2386595f347c1b84d0906bb3dbe0f454b [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
hinoka@google.com2f2ca142014-01-07 03:59:18 +000016import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000017
hinoka@google.com2f2ca142014-01-07 03:59:18 +000018import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000019import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000020import scm
21import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000022
23
szager@chromium.org71cbb502013-04-19 23:30:15 +000024THIS_FILE_PATH = os.path.abspath(__file__)
25
hinoka@google.com2f2ca142014-01-07 03:59:18 +000026GSUTIL_DEFAULT_PATH = os.path.join(
27 os.path.dirname(os.path.abspath(__file__)),
28 'third_party', 'gsutil', 'gsutil')
29
szager@chromium.org71cbb502013-04-19 23:30:15 +000030
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000031class DiffFiltererWrapper(object):
32 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000033 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000034 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000035 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000036 original_prefix = "--- "
37 working_prefix = "+++ "
38
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000039 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000040 # Note that we always use '/' as the path separator to be
41 # consistent with svn's cygwin-style output on Windows
42 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000043 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000044
maruel@chromium.org6e29d572010-06-04 17:32:20 +000045 def SetCurrentFile(self, current_file):
46 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000047
iannucci@chromium.org3830a672013-02-19 20:15:14 +000048 @property
49 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000050 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000051
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000052 def _Replace(self, line):
53 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000054
55 def Filter(self, line):
56 if (line.startswith(self.index_string)):
57 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000058 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000059 else:
60 if (line.startswith(self.original_prefix) or
61 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000062 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000063 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000064
65
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000066class SvnDiffFilterer(DiffFiltererWrapper):
67 index_string = "Index: "
68
69
70class GitDiffFilterer(DiffFiltererWrapper):
71 index_string = "diff --git "
72
73 def SetCurrentFile(self, current_file):
74 # Get filename by parsing "a/<filename> b/<filename>"
75 self._current_file = current_file[:(len(current_file)/2)][2:]
76
77 def _Replace(self, line):
78 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
79
80
bratell@opera.com18fa4542013-05-21 13:30:46 +000081def ask_for_data(prompt, options):
82 if options.jobs > 1:
83 raise gclient_utils.Error("Background task requires input. Rerun "
84 "gclient with --jobs=1 so that\n"
85 "interaction is possible.")
maruel@chromium.org90541732011-04-01 17:54:18 +000086 try:
87 return raw_input(prompt)
88 except KeyboardInterrupt:
89 # Hide the exception.
90 sys.exit(1)
91
92
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000093### SCM abstraction layer
94
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000095# Factory Method for SCM wrapper creation
96
maruel@chromium.org9eda4112010-06-11 18:56:10 +000097def GetScmName(url):
98 if url:
99 url, _ = gclient_utils.SplitUrlRevision(url)
100 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000101 url.startswith('git+http://') or url.startswith('git+https://') or
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000102 url.endswith('.git')):
103 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +0000104 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +0000105 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000106 return 'svn'
107 return None
108
109
110def CreateSCM(url, root_dir=None, relpath=None):
111 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000112 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000113 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000114 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000115
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000116 scm_name = GetScmName(url)
117 if not scm_name in SCM_MAP:
118 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000119 scm_class = SCM_MAP[scm_name]
120 if not scm_class.BinaryExists():
121 raise gclient_utils.Error('%s command not found' % scm_name)
122 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000123
124
125# SCMWrapper base class
126
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000127class SCMWrapper(object):
128 """Add necessary glue between all the supported SCM.
129
msb@chromium.orgd6504212010-01-13 17:34:31 +0000130 This is the abstraction layer to bind to different SCM.
131 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000132 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000133 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000134 self._root_dir = root_dir
135 if self._root_dir:
136 self._root_dir = self._root_dir.replace('/', os.sep)
137 self.relpath = relpath
138 if self.relpath:
139 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000140 if self.relpath and self._root_dir:
141 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000142
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000143 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000144 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000145 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000146
147 if not command in commands:
148 raise gclient_utils.Error('Unknown command %s' % command)
149
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000150 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000151 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000152 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000153
154 return getattr(self, command)(options, args, file_list)
155
156
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000157class GitFilter(object):
158 """A filter_fn implementation for quieting down git output messages.
159
160 Allows a custom function to skip certain lines (predicate), and will throttle
161 the output of percentage completed lines to only output every X seconds.
162 """
163 PERCENT_RE = re.compile('.* ([0-9]{1,2})% .*')
164
165 def __init__(self, time_throttle=0, predicate=None):
166 """
167 Args:
168 time_throttle (int): GitFilter will throttle 'noisy' output (such as the
169 XX% complete messages) to only be printed at least |time_throttle|
170 seconds apart.
171 predicate (f(line)): An optional function which is invoked for every line.
172 The line will be skipped if predicate(line) returns False.
173 """
174 self.last_time = 0
175 self.time_throttle = time_throttle
176 self.predicate = predicate
177
178 def __call__(self, line):
179 # git uses an escape sequence to clear the line; elide it.
180 esc = line.find(unichr(033))
181 if esc > -1:
182 line = line[:esc]
183 if self.predicate and not self.predicate(line):
184 return
185 now = time.time()
186 match = self.PERCENT_RE.match(line)
187 if not match:
188 self.last_time = 0
189 if (now - self.last_time) >= self.time_throttle:
190 self.last_time = now
191 print line
192
193
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000194class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000195 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000196 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000197 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000198
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000199 cache_dir = None
200 # If a given cache is used in a solution more than once, prevent multiple
201 # threads from updating it simultaneously.
202 cache_locks = collections.defaultdict(threading.Lock)
203
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000204 def __init__(self, url=None, root_dir=None, relpath=None):
205 """Removes 'git+' fake prefix from git URL."""
206 if url.startswith('git+http://') or url.startswith('git+https://'):
207 url = url[4:]
208 SCMWrapper.__init__(self, url, root_dir, relpath)
209
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000210 @staticmethod
211 def BinaryExists():
212 """Returns true if the command exists."""
213 try:
214 # We assume git is newer than 1.7. See: crbug.com/114483
215 result, version = scm.GIT.AssertVersion('1.7')
216 if not result:
217 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
218 return result
219 except OSError:
220 return False
221
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000222 def GetCheckoutRoot(self):
223 return scm.GIT.GetCheckoutRoot(self.checkout_path)
224
borenet@google.comb75a8352014-01-17 01:08:40 +0000225 def GetRemoteURL(self, options, cwd=None):
226 try:
227 return self._Capture(['config', 'remote.%s.url' % self.remote],
228 cwd=cwd or self.checkout_path).rstrip()
229 except (OSError, subprocess2.CalledProcessError):
230 return None
231
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000232 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000233 """Returns the given revision's date in ISO-8601 format (which contains the
234 time zone)."""
235 # TODO(floitsch): get the time-stamp of the given revision and not just the
236 # time-stamp of the currently checked out revision.
237 return self._Capture(['log', '-n', '1', '--format=%ai'])
238
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000239 @staticmethod
240 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000241 """'Cleanup' the repo.
242
243 There's no real git equivalent for the svn cleanup command, do a no-op.
244 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000245
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000246 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000247 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000248 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000249
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000250 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000251 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000252 repository.
253
254 The patch file is generated from a diff of the merge base of HEAD and
255 its upstream branch.
256 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000257 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000258 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000259 ['git', 'diff', merge_base],
260 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000261 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000262
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000263 def UpdateSubmoduleConfig(self):
264 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000265 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000266 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000267 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000268 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000269 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000270 kwargs = {'cwd': self.checkout_path,
271 'print_stdout': False,
272 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000273 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000274 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
275 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000276 except subprocess2.CalledProcessError:
277 # Not a fatal error, or even very interesting in a non-git-submodule
278 # world. So just keep it quiet.
279 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000280 try:
281 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
282 except subprocess2.CalledProcessError:
283 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000284
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000285 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
286
msb@chromium.orge28e4982009-09-25 20:51:45 +0000287 def update(self, options, args, file_list):
288 """Runs git to update or transparently checkout the working copy.
289
290 All updated files will be appended to file_list.
291
292 Raises:
293 Error: if can't get URL for relative path.
294 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000295 if args:
296 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
297
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000298 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000299
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000300 # If a dependency is not pinned, track the default remote branch.
301 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000302 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000303 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000304 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000305 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000306 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000307 # Override the revision number.
308 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000309 if revision == 'unmanaged':
310 revision = None
311 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000312 if not revision:
313 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000314
floitsch@google.comeaab7842011-04-28 09:07:58 +0000315 if gclient_utils.IsDateRevision(revision):
316 # Date-revisions only work on git-repositories if the reflog hasn't
317 # expired yet. Use rev-list to get the corresponding revision.
318 # git rev-list -n 1 --before='time-stamp' branchname
319 if options.transitive:
320 print('Warning: --transitive only works for SVN repositories.')
321 revision = default_rev
322
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000323 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000324 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000325
326 printed_path = False
327 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000328 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000329 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000330 verbose = ['--verbose']
331 printed_path = True
332
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000333 url = self._CreateOrUpdateCache(url, options)
334
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000335 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000336 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000337 elif revision.startswith(self.remote + '/'):
338 # For compatibility with old naming, translate 'origin' to 'refs/heads'
339 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000340 rev_type = "branch"
341 else:
342 # hash is also a tag, only make a distinction at checkout
343 rev_type = "hash"
344
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000345 if (not os.path.exists(self.checkout_path) or
346 (os.path.isdir(self.checkout_path) and
347 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000348 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000349 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000350 if file_list is not None:
351 files = self._Capture(['ls-files']).splitlines()
352 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000353 if not verbose:
354 # Make the output a little prettier. It's nice to have some whitespace
355 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000356 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000357 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000358
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000359 if not managed:
mmoss@chromium.org96833fa2013-04-17 03:26:37 +0000360 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgf5cc4272012-06-21 22:38:07 +0000361 self.UpdateSubmoduleConfig()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000362 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000363 return self._Capture(['rev-parse', '--verify', 'HEAD'])
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000364
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000365 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
366 raise gclient_utils.Error('\n____ %s%s\n'
367 '\tPath is not a git repo. No .git dir.\n'
368 '\tTo resolve:\n'
369 '\t\trm -rf %s\n'
370 '\tAnd run gclient sync again\n'
371 % (self.relpath, rev_str, self.relpath))
372
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000373 # Need to do this in the normal path as well as in the post-remote-switch
374 # path.
375 self._PossiblySwitchCache(url, options)
376
msb@chromium.org5bde4852009-12-14 16:47:12 +0000377 cur_branch = self._GetCurrentBranch()
378
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000379 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000380 # 0) HEAD is detached. Probably from our initial clone.
381 # - make sure HEAD is contained by a named ref, then update.
382 # Cases 1-4. HEAD is a branch.
383 # 1) current branch is not tracking a remote branch (could be git-svn)
384 # - try to rebase onto the new hash or branch
385 # 2) current branch is tracking a remote branch with local committed
386 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000387 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000388 # 3) current branch is tracking a remote branch w/or w/out changes,
389 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000390 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000391 # 4) current branch is tracking a remote branch, switches to a different
392 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000393 # - exit
394
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000395 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
396 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000397 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
398 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000399 if cur_branch is None:
400 upstream_branch = None
401 current_type = "detached"
402 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000403 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000404 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
405 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
406 current_type = "hash"
407 logging.debug("Current branch is not tracking an upstream (remote)"
408 " branch.")
409 elif upstream_branch.startswith('refs/remotes'):
410 current_type = "branch"
411 else:
412 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000413
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000414 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000415 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000416 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000417 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000418 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000419 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000420
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000421 self._UpdateBranchHeads(options, fetch=True)
422
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000424 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000425 target = 'HEAD'
426 if options.upstream and upstream_branch:
427 target = upstream_branch
428 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000429
msb@chromium.org786fb682010-06-02 15:16:23 +0000430 if current_type == 'detached':
431 # case 0
432 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000433 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000434 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000435 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000436 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000437 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000438 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000439 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000440 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000441 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000442 newbase=revision, printed_path=printed_path)
443 printed_path = True
444 else:
445 # Can't find a merge-base since we don't know our upstream. That makes
446 # this command VERY likely to produce a rebase failure. For now we
447 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000448 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000449 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000450 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000451 self._AttemptRebase(upstream_branch, files, options,
452 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000453 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000454 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000455 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000456 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000457 newbase=revision, printed_path=printed_path)
458 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000459 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000460 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000461 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000462 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000463 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000464 switch_error = ("Switching upstream branch from %s to %s\n"
465 % (upstream_branch, new_base) +
466 "Please merge or rebase manually:\n" +
467 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
468 "OR git checkout -b <some new branch> %s" % new_base)
469 raise gclient_utils.Error(switch_error)
470 else:
471 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000472 if files is not None:
473 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000475 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000477 merge_args = ['merge']
478 if not options.merge:
479 merge_args.append('--ff-only')
480 merge_args.append(upstream_branch)
481 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000482 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000483 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
484 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000485 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000486 printed_path = True
487 while True:
488 try:
maruel@chromium.org90541732011-04-01 17:54:18 +0000489 action = ask_for_data(
490 'Cannot fast-forward merge, attempt to rebase? '
bratell@opera.com18fa4542013-05-21 13:30:46 +0000491 '(y)es / (q)uit / (s)kip : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000493 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000494 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000495 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496 printed_path=printed_path)
497 printed_path = True
498 break
499 elif re.match(r'quit|q', action, re.I):
500 raise gclient_utils.Error("Can't fast-forward, please merge or "
501 "rebase manually.\n"
502 "cd %s && git " % self.checkout_path
503 + "rebase %s" % upstream_branch)
504 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000505 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000506 return
507 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000508 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000509 elif re.match("error: Your local changes to '.*' would be "
510 "overwritten by merge. Aborting.\nPlease, commit your "
511 "changes or stash them before you can merge.\n",
512 e.stderr):
513 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000514 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000515 printed_path = True
516 raise gclient_utils.Error(e.stderr)
517 else:
518 # Some other problem happened with the merge
519 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000520 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 raise
522 else:
523 # Fast-forward merge was successful
524 if not re.match('Already up-to-date.', merge_output) or verbose:
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
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000528 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000529 if not verbose:
530 # Make the output a little prettier. It's nice to have some
531 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000532 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000533
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000534 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000535 if file_list is not None:
536 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000537
538 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000539 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000540 raise gclient_utils.Error('\n____ %s%s\n'
541 '\nConflict while rebasing this branch.\n'
542 'Fix the conflict and run gclient again.\n'
543 'See man git-rebase for details.\n'
544 % (self.relpath, rev_str))
545
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000546 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000547 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000548
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000549 # If --reset and --delete_unversioned_trees are specified, remove any
550 # untracked directories.
551 if options.reset and options.delete_unversioned_trees:
552 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
553 # merge-base by default), so doesn't include untracked files. So we use
554 # 'git ls-files --directory --others --exclude-standard' here directly.
555 paths = scm.GIT.Capture(
556 ['ls-files', '--directory', '--others', '--exclude-standard'],
557 self.checkout_path)
558 for path in (p for p in paths.splitlines() if p.endswith('/')):
559 full_path = os.path.join(self.checkout_path, path)
560 if not os.path.islink(full_path):
561 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000562 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000563
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000564 return self._Capture(['rev-parse', '--verify', 'HEAD'])
565
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000566
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000567 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000568 """Reverts local modifications.
569
570 All reverted files will be appended to file_list.
571 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000572 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000573 # revert won't work if the directory doesn't exist. It needs to
574 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000575 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000576 # Don't reuse the args.
577 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000578
579 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000580 if options.upstream:
581 if self._GetCurrentBranch():
582 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
583 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000584 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000585 if not deps_revision:
586 deps_revision = default_rev
587 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000588 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000589
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000590 if file_list is not None:
591 files = self._Capture(['diff', deps_revision, '--name-only']).split()
592
maruel@chromium.org37e89872010-09-07 16:11:33 +0000593 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000594 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000595
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000596 if file_list is not None:
597 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
598
599 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000600 """Returns revision"""
601 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000602
msb@chromium.orge28e4982009-09-25 20:51:45 +0000603 def runhooks(self, options, args, file_list):
604 self.status(options, args, file_list)
605
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000606 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000607 """Display status information."""
608 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000609 print(('\n________ couldn\'t run status in %s:\n'
610 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000611 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000612 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000613 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000614 if file_list is not None:
615 files = self._Capture(['diff', '--name-only', merge_base]).split()
616 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000617
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000618 def GetUsableRev(self, rev, options):
619 """Finds a useful revision for this repository.
620
621 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
622 will be called on the source."""
623 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000624 if not os.path.isdir(self.checkout_path):
625 raise gclient_utils.Error(
626 ( 'We could not find a valid hash for safesync_url response "%s".\n'
627 'Safesync URLs with a git checkout currently require the repo to\n'
628 'be cloned without a safesync_url before adding the safesync_url.\n'
629 'For more info, see: '
630 'http://code.google.com/p/chromium/wiki/UsingNewGit'
631 '#Initial_checkout' ) % rev)
632 elif rev.isdigit() and len(rev) < 7:
633 # Handles an SVN rev. As an optimization, only verify an SVN revision as
634 # [0-9]{1,6} for now to avoid making a network request.
635 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000636 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
637 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000638 try:
639 logging.debug('Looking for git-svn configuration optimizations.')
640 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
641 cwd=self.checkout_path):
642 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
643 except subprocess2.CalledProcessError:
644 logging.debug('git config --get svn-remote.svn.fetch failed, '
645 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000646 if options.verbose:
647 print('Running git svn fetch. This might take a while.\n')
648 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000649 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000650 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
651 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000652 except gclient_utils.Error, e:
653 sha1 = e.message
654 print('\nWarning: Could not find a git revision with accurate\n'
655 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
656 'the closest sane git revision, which is:\n'
657 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000658 if not sha1:
659 raise gclient_utils.Error(
660 ( 'It appears that either your git-svn remote is incorrectly\n'
661 'configured or the revision in your safesync_url is\n'
662 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
663 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000664 else:
665 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
666 sha1 = rev
667 else:
668 # May exist in origin, but we don't have it yet, so fetch and look
669 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000670 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000671 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
672 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000673
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000674 if not sha1:
675 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000676 ( 'We could not find a valid hash for safesync_url response "%s".\n'
677 'Safesync URLs with a git checkout currently require a git-svn\n'
678 'remote or a safesync_url that provides git sha1s. Please add a\n'
679 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000680 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000681 '#Initial_checkout' ) % rev)
682
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000683 return sha1
684
msb@chromium.orge6f78352010-01-13 17:05:33 +0000685 def FullUrlForRelativeUrl(self, url):
686 # Strip from last '/'
687 # Equivalent to unix basename
688 base_url = self.url
689 return base_url[:base_url.rfind('/')] + url
690
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000691 @staticmethod
692 def _NormalizeGitURL(url):
693 '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
694 idx = url.find('://')
695 if idx != -1:
696 url = url[idx+3:]
697 if not url.endswith('.git'):
698 url += '.git'
699 return url
700
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000701 def _PossiblySwitchCache(self, url, options):
702 """Handles switching a repo from with-cache to direct, or vice versa.
703
704 When we go from direct to with-cache, the remote url changes from the
705 'real' url to the local file url (in cache_dir). Therefore, this function
706 assumes that |url| points to the correctly-switched-over local file url, if
707 we're in cache_mode.
708
709 When we go from with-cache to direct, assume that the normal url-switching
710 code already flipped the remote over, and we just need to repack and break
711 the dependency to the cache.
712 """
713
714 altfile = os.path.join(
715 self.checkout_path, '.git', 'objects', 'info', 'alternates')
716 if self.cache_dir:
717 if not os.path.exists(altfile):
718 try:
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000719 with open(altfile, 'w') as f:
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000720 f.write(os.path.join(url, 'objects'))
721 # pylint: disable=C0301
722 # This dance is necessary according to emperical evidence, also at:
723 # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
724 self._Run(['repack', '-ad'], options)
725 self._Run(['repack', '-adl'], options)
726 except Exception:
727 # If something goes wrong, try to remove the altfile so we'll go down
728 # this path again next time.
729 try:
730 os.remove(altfile)
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000731 except OSError as e:
732 print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000733 raise
734 else:
735 if os.path.exists(altfile):
736 self._Run(['repack', '-a'], options)
737 os.remove(altfile)
738
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000739 def _CreateOrUpdateCache(self, url, options):
740 """Make a new git mirror or update existing mirror for |url|, and return the
741 mirror URI to clone from.
742
743 If no cache-dir is specified, just return |url| unchanged.
744 """
745 if not self.cache_dir:
746 return url
747
748 # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
749 folder = os.path.join(
750 self.cache_dir,
751 self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000752 altfile = os.path.join(folder, 'objects', 'info', 'alternates')
753
754 # If we're bringing an old cache up to date or cloning a new cache, and the
755 # existing repo is currently a direct clone, use its objects to help out
756 # the fetch here.
757 checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
758 checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
759 use_reference = (
760 os.path.exists(checkout_objects) and
761 not os.path.exists(checkout_altfile))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000762
763 v = ['-v'] if options.verbose else []
764 filter_fn = lambda l: '[up to date]' not in l
765 with self.cache_locks[folder]:
766 gclient_utils.safe_makedirs(self.cache_dir)
767 if not os.path.exists(os.path.join(folder, 'config')):
768 gclient_utils.rmtree(folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000769 cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
770 '--progress', '--mirror']
771
772 if use_reference:
773 cmd += ['--reference', os.path.abspath(self.checkout_path)]
774
775 self._Run(cmd + [url, folder],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000776 options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000777 else:
778 # For now, assert that host/path/to/repo.git is identical. We may want
779 # to relax this restriction in the future to allow for smarter cache
780 # repo update schemes (such as pulling the same repo, but from a
781 # different host).
borenet@google.comb75a8352014-01-17 01:08:40 +0000782 existing_url = self.GetRemoteURL(options, cwd=folder)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000783 assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
784
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000785 if use_reference:
786 with open(altfile, 'w') as f:
787 f.write(os.path.abspath(checkout_objects))
788
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000789 # Would normally use `git remote update`, but it doesn't support
790 # --progress, so use fetch instead.
791 self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000792 options, filter_fn=filter_fn, cwd=folder, retry=True)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000793
794 # If the clone has an object dependency on the existing repo, break it
795 # with repack and remove the linkage.
796 if os.path.exists(altfile):
797 self._Run(['repack', '-a'], options, cwd=folder)
798 os.remove(altfile)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000799 return folder
800
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000801 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000802 """Clone a git repository from the given URL.
803
msb@chromium.org786fb682010-06-02 15:16:23 +0000804 Once we've cloned the repo, we checkout a working branch if the specified
805 revision is a branch head. If it is a tag or a specific commit, then we
806 leave HEAD detached as it makes future updates simpler -- in this case the
807 user should first create a new branch or switch to an existing branch before
808 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000809 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000810 # git clone doesn't seem to insert a newline properly before printing
811 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000812 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000813 template_path = os.path.join(
814 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000815 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
816 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000817 if self.cache_dir:
818 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000819 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000820 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000821 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000822 # If the parent directory does not exist, Git clone on Windows will not
823 # create it, so we need to do it manually.
824 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000825 gclient_utils.safe_makedirs(parent_dir)
826 tmp_dir = tempfile.mkdtemp(
827 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
828 dir=parent_dir)
829 try:
830 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000831 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000832 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000833 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
834 os.path.join(self.checkout_path, '.git'))
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000835 finally:
836 if os.listdir(tmp_dir):
837 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
838 gclient_utils.rmtree(tmp_dir)
839 if revision.startswith('refs/heads/'):
840 self._Run(
841 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
842 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000843 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000844 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000845 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000846 ('Checked out %s to a detached HEAD. Before making any commits\n'
847 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000848 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
849 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000850
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000851 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000852 branch=None, printed_path=False):
853 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000854 if files is not None:
855 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000856 revision = upstream
857 if newbase:
858 revision = newbase
859 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000860 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000861 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000862 printed_path = True
863 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000864 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000865
866 # Build the rebase command here using the args
867 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
868 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000869 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000870 rebase_cmd.append('--verbose')
871 if newbase:
872 rebase_cmd.extend(['--onto', newbase])
873 rebase_cmd.append(upstream)
874 if branch:
875 rebase_cmd.append(branch)
876
877 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000878 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000879 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000880 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
881 re.match(r'cannot rebase: your index contains uncommitted changes',
882 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000883 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000884 rebase_action = ask_for_data(
885 'Cannot rebase because of unstaged changes.\n'
886 '\'git reset --hard HEAD\' ?\n'
887 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000888 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000889 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000890 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000891 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000892 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000893 break
894 elif re.match(r'quit|q', rebase_action, re.I):
895 raise gclient_utils.Error("Please merge or rebase manually\n"
896 "cd %s && git " % self.checkout_path
897 + "%s" % ' '.join(rebase_cmd))
898 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000899 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000900 continue
901 else:
902 gclient_utils.Error("Input not recognized")
903 continue
904 elif re.search(r'^CONFLICT', e.stdout, re.M):
905 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
906 "Fix the conflict and run gclient again.\n"
907 "See 'man git-rebase' for details.\n")
908 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000909 print(e.stdout.strip())
910 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000911 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
912 "manually.\ncd %s && git " %
913 self.checkout_path
914 + "%s" % ' '.join(rebase_cmd))
915
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000916 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000917 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000918 # Make the output a little prettier. It's nice to have some
919 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000920 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000921
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000922 @staticmethod
923 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000924 (ok, current_version) = scm.GIT.AssertVersion(min_version)
925 if not ok:
926 raise gclient_utils.Error('git version %s < minimum required %s' %
927 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000928
msb@chromium.org786fb682010-06-02 15:16:23 +0000929 def _IsRebasing(self):
930 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
931 # have a plumbing command to determine whether a rebase is in progress, so
932 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
933 g = os.path.join(self.checkout_path, '.git')
934 return (
935 os.path.isdir(os.path.join(g, "rebase-merge")) or
936 os.path.isdir(os.path.join(g, "rebase-apply")))
937
938 def _CheckClean(self, rev_str):
939 # Make sure the tree is clean; see git-rebase.sh for reference
940 try:
941 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000942 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000943 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000944 raise gclient_utils.Error('\n____ %s%s\n'
945 '\tYou have unstaged changes.\n'
946 '\tPlease commit, stash, or reset.\n'
947 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000948 try:
949 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000950 '--ignore-submodules', 'HEAD', '--'],
951 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000952 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000953 raise gclient_utils.Error('\n____ %s%s\n'
954 '\tYour index contains uncommitted changes\n'
955 '\tPlease commit, stash, or reset.\n'
956 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000957
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000958 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000959 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
960 # reference by a commit). If not, error out -- most likely a rebase is
961 # in progress, try to detect so we can give a better error.
962 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000963 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
964 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000965 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000966 # Commit is not contained by any rev. See if the user is rebasing:
967 if self._IsRebasing():
968 # Punt to the user
969 raise gclient_utils.Error('\n____ %s%s\n'
970 '\tAlready in a conflict, i.e. (no branch).\n'
971 '\tFix the conflict and run gclient again.\n'
972 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
973 '\tSee man git-rebase for details.\n'
974 % (self.relpath, rev_str))
975 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000976 name = ('saved-by-gclient-' +
977 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000978 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000979 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000980 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000981
msb@chromium.org5bde4852009-12-14 16:47:12 +0000982 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000983 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000984 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000985 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000986 return None
987 return branch
988
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000989 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000990 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +0000991 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000992 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000993 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000994
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000995 def _UpdateBranchHeads(self, options, fetch=False):
996 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
997 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000998 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000999 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1000 '^\\+refs/branch-heads/\\*:.*$']
1001 self._Run(config_cmd, options)
1002 if fetch:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001003 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001004 if options.verbose:
1005 fetch_cmd.append('--verbose')
1006 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001007
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001008 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001009 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001010 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001011 if git_filter:
scottmg@chromium.orgf547c802013-09-27 17:55:26 +00001012 kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001013 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001014 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +00001015 # By default, git will use an interactive terminal prompt when a username/
1016 # password is needed. That shouldn't happen in the chromium workflow,
1017 # and if it does, then gclient may hide the prompt in the midst of a flood
1018 # of terminal spew. The only indication that something has gone wrong
1019 # will be when gclient hangs unresponsively. Instead, we disable the
1020 # password prompt and simply allow git to fail noisily. The error
1021 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001022 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1023 env.setdefault('GIT_ASKPASS', 'true')
1024 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001025 else:
1026 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +00001027 stdout = kwargs.get('stdout', sys.stdout)
1028 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
1029 ' '.join(args), kwargs['cwd']))
1030 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001031
1032
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001033class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001034 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001035 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001036
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001037 @staticmethod
1038 def BinaryExists():
1039 """Returns true if the command exists."""
1040 try:
1041 result, version = scm.SVN.AssertVersion('1.4')
1042 if not result:
1043 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1044 return result
1045 except OSError:
1046 return False
1047
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001048 def GetCheckoutRoot(self):
1049 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1050
borenet@google.comb75a8352014-01-17 01:08:40 +00001051 def GetRemoteURL(self, options):
1052 try:
1053 local_info = scm.SVN.CaptureLocalInfo([os.curdir], self.checkout_path)
1054 except (OSError, subprocess2.CalledProcessError):
1055 return None
1056 return local_info.get('URL')
1057
floitsch@google.comeaab7842011-04-28 09:07:58 +00001058 def GetRevisionDate(self, revision):
1059 """Returns the given revision's date in ISO-8601 format (which contains the
1060 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001061 date = scm.SVN.Capture(
1062 ['propget', '--revprop', 'svn:date', '-r', revision],
1063 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001064 return date.strip()
1065
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001066 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001067 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001068 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001069
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001070 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001071 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001072 if not os.path.isdir(self.checkout_path):
1073 raise gclient_utils.Error('Directory %s is not present.' %
1074 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001075 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001076
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001077 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001078 """Generates a patch file which can be applied to the root of the
1079 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001080 if not os.path.isdir(self.checkout_path):
1081 raise gclient_utils.Error('Directory %s is not present.' %
1082 self.checkout_path)
1083 gclient_utils.CheckCallAndFilter(
1084 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1085 cwd=self.checkout_path,
1086 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001087 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001088
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001089 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001090 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001091
1092 All updated files will be appended to file_list.
1093
1094 Raises:
1095 Error: if can't get URL for relative path.
1096 """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001097 if args:
1098 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1099
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001100 # revision is the revision to match. It is None if no revision is specified,
1101 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001102 url, revision = gclient_utils.SplitUrlRevision(self.url)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001103 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001104 if options.revision:
1105 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001106 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001107 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001108 if revision != 'unmanaged':
1109 forced_revision = True
1110 # Reconstruct the url.
1111 url = '%s@%s' % (url, revision)
1112 rev_str = ' at %s' % revision
1113 else:
1114 managed = False
1115 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001116 else:
1117 forced_revision = False
1118 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001119
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001120 # Get the existing scm url and the revision number of the current checkout.
1121 exists = os.path.exists(self.checkout_path)
1122 if exists and managed:
1123 try:
1124 from_info = scm.SVN.CaptureLocalInfo(
1125 [], os.path.join(self.checkout_path, '.'))
1126 except (gclient_utils.Error, subprocess2.CalledProcessError):
1127 if options.reset and options.delete_unversioned_trees:
1128 print 'Removing troublesome path %s' % self.checkout_path
1129 gclient_utils.rmtree(self.checkout_path)
1130 exists = False
1131 else:
1132 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1133 'present. Delete the directory and try again.')
1134 raise gclient_utils.Error(msg % self.checkout_path)
1135
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001136 BASE_URLS = {
1137 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1138 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1139 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001140 WHITELISTED_ROOTS = [
1141 'svn://svn.chromium.org',
1142 'svn://svn-mirror.golo.chromium.org',
1143 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001144 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001145 try:
1146 # Split out the revision number since it's not useful for us.
1147 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001148 # Check to see if we're on a whitelisted root. We do this because
1149 # only some svn servers have matching UUIDs.
1150 local_parsed = urlparse.urlparse(url)
1151 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001152 if ('CHROME_HEADLESS' in os.environ
1153 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001154 and base_path in BASE_URLS
1155 and local_root in WHITELISTED_ROOTS):
1156
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001157 # Use a tarball for initial sync if we are on a bot.
1158 # Get an unauthenticated gsutil instance.
1159 gsutil = download_from_google_storage.Gsutil(
1160 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1161
1162 gs_path = BASE_URLS[base_path]
1163 _, out, _ = gsutil.check_call('ls', gs_path)
1164 # So that we can get the most recent revision.
1165 sorted_items = sorted(out.splitlines())
1166 latest_checkout = sorted_items[-1]
1167
1168 tempdir = tempfile.mkdtemp()
1169 print 'Downloading %s...' % latest_checkout
1170 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1171 if code:
1172 print '%s\n%s' % (out, err)
1173 raise Exception()
1174 filename = latest_checkout.split('/')[-1]
1175 tarball = os.path.join(tempdir, filename)
1176 print 'Unpacking into %s...' % self.checkout_path
1177 gclient_utils.safe_makedirs(self.checkout_path)
1178 # TODO(hinoka): Use 7z for windows.
1179 cmd = ['tar', '--extract', '--ungzip',
1180 '--directory', self.checkout_path,
1181 '--file', tarball]
1182 gclient_utils.CheckCallAndFilter(
1183 cmd, stdout=sys.stdout, print_stdout=True)
1184
1185 print 'Deleting temp file'
1186 gclient_utils.rmtree(tempdir)
1187
1188 # Rewrite the repository root to match.
1189 tarball_url = scm.SVN.CaptureLocalInfo(
1190 ['.'], self.checkout_path)['Repository Root']
1191 tarball_parsed = urlparse.urlparse(tarball_url)
1192 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1193 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001194
1195 if tarball_root != local_root:
1196 print 'Switching repository root to %s' % local_root
1197 self._Run(['switch', '--relocate', tarball_root,
1198 local_root, self.checkout_path],
1199 options)
1200 except Exception as e:
1201 print 'We tried to get a source tarball but failed.'
1202 print 'Resuming normal operations.'
1203 print str(e)
1204
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001205 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001206 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001207 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001208 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001209 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001210 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001211
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001212 if not managed:
1213 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001214 return self.Svnversion()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001215
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001216 if 'URL' not in from_info:
1217 raise gclient_utils.Error(
1218 ('gclient is confused. Couldn\'t get the url for %s.\n'
1219 'Try using @unmanaged.\n%s') % (
1220 self.checkout_path, from_info))
1221
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001222 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001223 dir_info = scm.SVN.CaptureStatus(
1224 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001225 if any(d[0][2] == 'L' for d in dir_info):
1226 try:
1227 self._Run(['cleanup', self.checkout_path], options)
1228 except subprocess2.CalledProcessError, e:
1229 # Get the status again, svn cleanup may have cleaned up at least
1230 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001231 dir_info = scm.SVN.CaptureStatus(
1232 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001233
1234 # Try to fix the failures by removing troublesome files.
1235 for d in dir_info:
1236 if d[0][2] == 'L':
1237 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001238 # We don't pass any files/directories to CaptureStatus and set
1239 # cwd=self.checkout_path, so we should get relative paths here.
1240 assert not os.path.isabs(d[1])
1241 path_to_remove = os.path.normpath(
1242 os.path.join(self.checkout_path, d[1]))
1243 print 'Removing troublesome path %s' % path_to_remove
1244 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001245 else:
1246 print 'Not removing troublesome path %s automatically.' % d[1]
1247 if d[0][0] == '!':
1248 print 'You can pass --force to enable automatic removal.'
1249 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001250
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001251 # Retrieve the current HEAD version because svn is slow at null updates.
1252 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001253 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001254 revision = str(from_info_live['Revision'])
1255 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001256
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001257 # If the provided url has a revision number that matches the revision
1258 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001259 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001260 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001261 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001262 else:
1263 command = ['update', self.checkout_path]
1264 command = self._AddAdditionalUpdateFlags(command, options, revision)
1265 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001266
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001267 # If --reset and --delete_unversioned_trees are specified, remove any
1268 # untracked files and directories.
1269 if options.reset and options.delete_unversioned_trees:
1270 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1271 full_path = os.path.join(self.checkout_path, status[1])
1272 if (status[0][0] == '?'
1273 and os.path.isdir(full_path)
1274 and not os.path.islink(full_path)):
1275 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001276 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001277 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001278
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001279 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001280 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001281 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001282 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001283 # Create an empty checkout and then update the one file we want. Future
1284 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001285 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001286 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001287 if os.path.exists(os.path.join(self.checkout_path, filename)):
1288 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001289 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001290 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001291 # After the initial checkout, we can use update as if it were any other
1292 # dep.
1293 self.update(options, args, file_list)
1294 else:
1295 # If the installed version of SVN doesn't support --depth, fallback to
1296 # just exporting the file. This has the downside that revision
1297 # information is not stored next to the file, so we will have to
1298 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001299 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001300 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001301 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001302 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001303 command = self._AddAdditionalUpdateFlags(command, options,
1304 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001305 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001306
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001307 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001308 """Reverts local modifications. Subversion specific.
1309
1310 All reverted files will be appended to file_list, even if Subversion
1311 doesn't know about them.
1312 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001313 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001314 if os.path.exists(self.checkout_path):
1315 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001316 # svn revert won't work if the directory doesn't exist. It needs to
1317 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001318 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001319 # Don't reuse the args.
1320 return self.update(options, [], file_list)
1321
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001322 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001323 if not options.force:
1324 raise gclient_utils.Error('Invalid checkout path, aborting')
1325 print(
1326 '\n_____ %s is not a valid svn checkout, synching instead' %
1327 self.relpath)
1328 gclient_utils.rmtree(self.checkout_path)
1329 # Don't reuse the args.
1330 return self.update(options, [], file_list)
1331
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001332 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001333 if file_list is not None:
1334 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001335 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001336 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001337 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001338 print(os.path.join(self.checkout_path, file_status[1]))
1339 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001340
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001341 # Revert() may delete the directory altogether.
1342 if not os.path.isdir(self.checkout_path):
1343 # Don't reuse the args.
1344 return self.update(options, [], file_list)
1345
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001346 try:
1347 # svn revert is so broken we don't even use it. Using
1348 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001349 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001350 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1351 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001352 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001353 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001354 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001355
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001356 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001357 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001358 try:
1359 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001360 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001361 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001362
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001363 def runhooks(self, options, args, file_list):
1364 self.status(options, args, file_list)
1365
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001366 def status(self, options, args, file_list):
1367 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001368 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001369 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001370 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001371 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1372 'The directory does not exist.') %
1373 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001374 # There's no file list to retrieve.
1375 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001376 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001377
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001378 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001379 """Verifies the validity of the revision for this repository."""
1380 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1381 raise gclient_utils.Error(
1382 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1383 'correct.') % rev)
1384 return rev
1385
msb@chromium.orge6f78352010-01-13 17:05:33 +00001386 def FullUrlForRelativeUrl(self, url):
1387 # Find the forth '/' and strip from there. A bit hackish.
1388 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001389
maruel@chromium.org669600d2010-09-01 19:06:31 +00001390 def _Run(self, args, options, **kwargs):
1391 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001392 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001393 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001394 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001395
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001396 def Svnversion(self):
1397 """Runs the lowest checked out revision in the current project."""
1398 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1399 return info['Revision']
1400
maruel@chromium.org669600d2010-09-01 19:06:31 +00001401 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1402 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001403 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001404 scm.SVN.RunAndGetFileList(
1405 options.verbose,
1406 args + ['--ignore-externals'],
1407 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001408 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001409
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001410 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001411 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001412 """Add additional flags to command depending on what options are set.
1413 command should be a list of strings that represents an svn command.
1414
1415 This method returns a new list to be used as a command."""
1416 new_command = command[:]
1417 if revision:
1418 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001419 # We don't want interaction when jobs are used.
1420 if options.jobs > 1:
1421 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001422 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001423 # --accept was added to 'svn update' in svn 1.6.
1424 if not scm.SVN.AssertVersion('1.5')[0]:
1425 return new_command
1426
1427 # It's annoying to have it block in the middle of a sync, just sensible
1428 # defaults.
1429 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001430 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001431 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1432 new_command.extend(('--accept', 'theirs-conflict'))
1433 elif options.manually_grab_svn_rev:
1434 new_command.append('--force')
1435 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1436 new_command.extend(('--accept', 'postpone'))
1437 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1438 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001439 return new_command