blob: c80575e0d2fae66f8a5a134443e3bd1db3d643b2 [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
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000225 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000226 """Returns the given revision's date in ISO-8601 format (which contains the
227 time zone)."""
228 # TODO(floitsch): get the time-stamp of the given revision and not just the
229 # time-stamp of the currently checked out revision.
230 return self._Capture(['log', '-n', '1', '--format=%ai'])
231
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000232 @staticmethod
233 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000234 """'Cleanup' the repo.
235
236 There's no real git equivalent for the svn cleanup command, do a no-op.
237 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000238
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000239 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000240 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000241 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000242
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000243 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000244 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000245 repository.
246
247 The patch file is generated from a diff of the merge base of HEAD and
248 its upstream branch.
249 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000250 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000251 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000252 ['git', 'diff', merge_base],
253 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000254 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000255
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000256 def UpdateSubmoduleConfig(self):
257 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
258 'submodule.$name.ignore', '||',
259 'git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000260 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000261 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000262 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000263 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000264 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000265 kwargs = {'cwd': self.checkout_path,
266 'print_stdout': False,
267 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000268 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000269 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
270 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000271 except subprocess2.CalledProcessError:
272 # Not a fatal error, or even very interesting in a non-git-submodule
273 # world. So just keep it quiet.
274 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000275 try:
276 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
277 except subprocess2.CalledProcessError:
278 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000279
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000280 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
281
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000282 def _FetchAndReset(self, revision, file_list, options):
283 """Equivalent to git fetch; git reset."""
284 quiet = []
285 if not options.verbose:
286 quiet = ['--quiet']
287 self._UpdateBranchHeads(options, fetch=False)
iannucci@chromium.orgb8376882013-07-01 20:08:10 +0000288
289 fetch_cmd = [
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000290 '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote, '--prune']
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000291 self._Run(fetch_cmd + quiet, options, retry=True)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000292 self._Run(['reset', '--hard', revision] + quiet, options)
293 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000294 if file_list is not None:
295 files = self._Capture(['ls-files']).splitlines()
296 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000297
msb@chromium.orge28e4982009-09-25 20:51:45 +0000298 def update(self, options, args, file_list):
299 """Runs git to update or transparently checkout the working copy.
300
301 All updated files will be appended to file_list.
302
303 Raises:
304 Error: if can't get URL for relative path.
305 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000306 if args:
307 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
308
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000309 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000310
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000311 # If a dependency is not pinned, track the default remote branch.
312 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000313 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000314 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000315 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000316 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000317 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000318 # Override the revision number.
319 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000320 if revision == 'unmanaged':
321 revision = None
322 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000323 if not revision:
324 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000325
floitsch@google.comeaab7842011-04-28 09:07:58 +0000326 if gclient_utils.IsDateRevision(revision):
327 # Date-revisions only work on git-repositories if the reflog hasn't
328 # expired yet. Use rev-list to get the corresponding revision.
329 # git rev-list -n 1 --before='time-stamp' branchname
330 if options.transitive:
331 print('Warning: --transitive only works for SVN repositories.')
332 revision = default_rev
333
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000334 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000335 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000336
337 printed_path = False
338 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000339 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000340 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000341 verbose = ['--verbose']
342 printed_path = True
343
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000344 url = self._CreateOrUpdateCache(url, options)
345
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000346 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000347 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000348 elif revision.startswith(self.remote + '/'):
349 # For compatibility with old naming, translate 'origin' to 'refs/heads'
350 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000351 rev_type = "branch"
352 else:
353 # hash is also a tag, only make a distinction at checkout
354 rev_type = "hash"
355
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000356 if (not os.path.exists(self.checkout_path) or
357 (os.path.isdir(self.checkout_path) and
358 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000359 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000360 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000361 if file_list is not None:
362 files = self._Capture(['ls-files']).splitlines()
363 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000364 if not verbose:
365 # Make the output a little prettier. It's nice to have some whitespace
366 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000367 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000368 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000369
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000370 if not managed:
mmoss@chromium.org96833fa2013-04-17 03:26:37 +0000371 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgf5cc4272012-06-21 22:38:07 +0000372 self.UpdateSubmoduleConfig()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000373 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000374 return self._Capture(['rev-parse', '--verify', 'HEAD'])
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000375
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000376 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
377 raise gclient_utils.Error('\n____ %s%s\n'
378 '\tPath is not a git repo. No .git dir.\n'
379 '\tTo resolve:\n'
380 '\t\trm -rf %s\n'
381 '\tAnd run gclient sync again\n'
382 % (self.relpath, rev_str, self.relpath))
383
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000384 # See if the url has changed (the unittests use git://foo for the url, let
385 # that through).
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000386 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000387 return_early = False
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000388 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
389 # unit test pass. (and update the comment above)
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000390 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
391 # This allows devs to use experimental repos which have a different url
392 # but whose branch(s) are the same as official repos.
393 if (current_url != url and
394 url != 'git://foo' and
395 subprocess2.capture(
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000396 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000397 cwd=self.checkout_path).strip() != 'False'):
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000398 print('_____ switching %s to a new upstream' % self.relpath)
399 # Make sure it's clean
400 self._CheckClean(rev_str)
401 # Switch over to the new upstream
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000402 self._Run(['remote', 'set-url', self.remote, url], options)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000403 self._FetchAndReset(revision, file_list, options)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000404 return_early = True
405
406 # Need to do this in the normal path as well as in the post-remote-switch
407 # path.
408 self._PossiblySwitchCache(url, options)
409
410 if return_early:
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000411 return self._Capture(['rev-parse', '--verify', 'HEAD'])
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000412
msb@chromium.org5bde4852009-12-14 16:47:12 +0000413 cur_branch = self._GetCurrentBranch()
414
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000415 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000416 # 0) HEAD is detached. Probably from our initial clone.
417 # - make sure HEAD is contained by a named ref, then update.
418 # Cases 1-4. HEAD is a branch.
419 # 1) current branch is not tracking a remote branch (could be git-svn)
420 # - try to rebase onto the new hash or branch
421 # 2) current branch is tracking a remote branch with local committed
422 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000424 # 3) current branch is tracking a remote branch w/or w/out changes,
425 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000426 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000427 # 4) current branch is tracking a remote branch, switches to a different
428 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000429 # - exit
430
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000431 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
432 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000433 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
434 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000435 if cur_branch is None:
436 upstream_branch = None
437 current_type = "detached"
438 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000439 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000440 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
441 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
442 current_type = "hash"
443 logging.debug("Current branch is not tracking an upstream (remote)"
444 " branch.")
445 elif upstream_branch.startswith('refs/remotes'):
446 current_type = "branch"
447 else:
448 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000449
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000450 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000451 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000452 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000453 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000454 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000455 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000456
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000457 self._UpdateBranchHeads(options, fetch=True)
458
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000459 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000460 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000461 target = 'HEAD'
462 if options.upstream and upstream_branch:
463 target = upstream_branch
464 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000465
msb@chromium.org786fb682010-06-02 15:16:23 +0000466 if current_type == 'detached':
467 # case 0
468 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000469 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000470 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000471 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000472 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000473 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000475 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000477 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000478 newbase=revision, printed_path=printed_path)
479 printed_path = True
480 else:
481 # Can't find a merge-base since we don't know our upstream. That makes
482 # this command VERY likely to produce a rebase failure. For now we
483 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000484 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000485 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000486 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000487 self._AttemptRebase(upstream_branch, files, options,
488 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000489 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000490 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000491 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000492 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000493 newbase=revision, printed_path=printed_path)
494 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000495 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000497 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000499 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000500 switch_error = ("Switching upstream branch from %s to %s\n"
501 % (upstream_branch, new_base) +
502 "Please merge or rebase manually:\n" +
503 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
504 "OR git checkout -b <some new branch> %s" % new_base)
505 raise gclient_utils.Error(switch_error)
506 else:
507 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000508 if files is not None:
509 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000511 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000512 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000513 merge_args = ['merge']
514 if not options.merge:
515 merge_args.append('--ff-only')
516 merge_args.append(upstream_branch)
517 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000518 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000519 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
520 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000521 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000522 printed_path = True
523 while True:
524 try:
maruel@chromium.org90541732011-04-01 17:54:18 +0000525 action = ask_for_data(
526 'Cannot fast-forward merge, attempt to rebase? '
bratell@opera.com18fa4542013-05-21 13:30:46 +0000527 '(y)es / (q)uit / (s)kip : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000528 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000529 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000530 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000531 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000532 printed_path=printed_path)
533 printed_path = True
534 break
535 elif re.match(r'quit|q', action, re.I):
536 raise gclient_utils.Error("Can't fast-forward, please merge or "
537 "rebase manually.\n"
538 "cd %s && git " % self.checkout_path
539 + "rebase %s" % upstream_branch)
540 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000541 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000542 return
543 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000544 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000545 elif re.match("error: Your local changes to '.*' would be "
546 "overwritten by merge. Aborting.\nPlease, commit your "
547 "changes or stash them before you can merge.\n",
548 e.stderr):
549 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000550 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000551 printed_path = True
552 raise gclient_utils.Error(e.stderr)
553 else:
554 # Some other problem happened with the merge
555 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000556 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000557 raise
558 else:
559 # Fast-forward merge was successful
560 if not re.match('Already up-to-date.', merge_output) or verbose:
561 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000562 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000563 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000564 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000565 if not verbose:
566 # Make the output a little prettier. It's nice to have some
567 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000568 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000569
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000570 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000571 if file_list is not None:
572 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000573
574 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000575 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000576 raise gclient_utils.Error('\n____ %s%s\n'
577 '\nConflict while rebasing this branch.\n'
578 'Fix the conflict and run gclient again.\n'
579 'See man git-rebase for details.\n'
580 % (self.relpath, rev_str))
581
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000582 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000583 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000584
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000585 # If --reset and --delete_unversioned_trees are specified, remove any
586 # untracked directories.
587 if options.reset and options.delete_unversioned_trees:
588 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
589 # merge-base by default), so doesn't include untracked files. So we use
590 # 'git ls-files --directory --others --exclude-standard' here directly.
591 paths = scm.GIT.Capture(
592 ['ls-files', '--directory', '--others', '--exclude-standard'],
593 self.checkout_path)
594 for path in (p for p in paths.splitlines() if p.endswith('/')):
595 full_path = os.path.join(self.checkout_path, path)
596 if not os.path.islink(full_path):
597 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000598 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000599
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000600 return self._Capture(['rev-parse', '--verify', 'HEAD'])
601
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000602
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000603 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000604 """Reverts local modifications.
605
606 All reverted files will be appended to file_list.
607 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000608 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000609 # revert won't work if the directory doesn't exist. It needs to
610 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000611 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000612 # Don't reuse the args.
613 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000614
615 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000616 if options.upstream:
617 if self._GetCurrentBranch():
618 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
619 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000620 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000621 if not deps_revision:
622 deps_revision = default_rev
623 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000624 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000625
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000626 if file_list is not None:
627 files = self._Capture(['diff', deps_revision, '--name-only']).split()
628
maruel@chromium.org37e89872010-09-07 16:11:33 +0000629 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000630 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000631
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000632 if file_list is not None:
633 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
634
635 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000636 """Returns revision"""
637 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000638
msb@chromium.orge28e4982009-09-25 20:51:45 +0000639 def runhooks(self, options, args, file_list):
640 self.status(options, args, file_list)
641
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000642 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000643 """Display status information."""
644 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000645 print(('\n________ couldn\'t run status in %s:\n'
646 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000647 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000648 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000649 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000650 if file_list is not None:
651 files = self._Capture(['diff', '--name-only', merge_base]).split()
652 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000653
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000654 def GetUsableRev(self, rev, options):
655 """Finds a useful revision for this repository.
656
657 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
658 will be called on the source."""
659 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000660 if not os.path.isdir(self.checkout_path):
661 raise gclient_utils.Error(
662 ( 'We could not find a valid hash for safesync_url response "%s".\n'
663 'Safesync URLs with a git checkout currently require the repo to\n'
664 'be cloned without a safesync_url before adding the safesync_url.\n'
665 'For more info, see: '
666 'http://code.google.com/p/chromium/wiki/UsingNewGit'
667 '#Initial_checkout' ) % rev)
668 elif rev.isdigit() and len(rev) < 7:
669 # Handles an SVN rev. As an optimization, only verify an SVN revision as
670 # [0-9]{1,6} for now to avoid making a network request.
671 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000672 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
673 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000674 try:
675 logging.debug('Looking for git-svn configuration optimizations.')
676 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
677 cwd=self.checkout_path):
678 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
679 except subprocess2.CalledProcessError:
680 logging.debug('git config --get svn-remote.svn.fetch failed, '
681 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000682 if options.verbose:
683 print('Running git svn fetch. This might take a while.\n')
684 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000685 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000686 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
687 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000688 except gclient_utils.Error, e:
689 sha1 = e.message
690 print('\nWarning: Could not find a git revision with accurate\n'
691 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
692 'the closest sane git revision, which is:\n'
693 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000694 if not sha1:
695 raise gclient_utils.Error(
696 ( 'It appears that either your git-svn remote is incorrectly\n'
697 'configured or the revision in your safesync_url is\n'
698 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
699 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000700 else:
701 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
702 sha1 = rev
703 else:
704 # May exist in origin, but we don't have it yet, so fetch and look
705 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000706 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000707 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
708 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000709
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000710 if not sha1:
711 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000712 ( 'We could not find a valid hash for safesync_url response "%s".\n'
713 'Safesync URLs with a git checkout currently require a git-svn\n'
714 'remote or a safesync_url that provides git sha1s. Please add a\n'
715 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000716 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000717 '#Initial_checkout' ) % rev)
718
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000719 return sha1
720
msb@chromium.orge6f78352010-01-13 17:05:33 +0000721 def FullUrlForRelativeUrl(self, url):
722 # Strip from last '/'
723 # Equivalent to unix basename
724 base_url = self.url
725 return base_url[:base_url.rfind('/')] + url
726
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000727 @staticmethod
728 def _NormalizeGitURL(url):
729 '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
730 idx = url.find('://')
731 if idx != -1:
732 url = url[idx+3:]
733 if not url.endswith('.git'):
734 url += '.git'
735 return url
736
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000737 def _PossiblySwitchCache(self, url, options):
738 """Handles switching a repo from with-cache to direct, or vice versa.
739
740 When we go from direct to with-cache, the remote url changes from the
741 'real' url to the local file url (in cache_dir). Therefore, this function
742 assumes that |url| points to the correctly-switched-over local file url, if
743 we're in cache_mode.
744
745 When we go from with-cache to direct, assume that the normal url-switching
746 code already flipped the remote over, and we just need to repack and break
747 the dependency to the cache.
748 """
749
750 altfile = os.path.join(
751 self.checkout_path, '.git', 'objects', 'info', 'alternates')
752 if self.cache_dir:
753 if not os.path.exists(altfile):
754 try:
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000755 with open(altfile, 'w') as f:
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000756 f.write(os.path.join(url, 'objects'))
757 # pylint: disable=C0301
758 # This dance is necessary according to emperical evidence, also at:
759 # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
760 self._Run(['repack', '-ad'], options)
761 self._Run(['repack', '-adl'], options)
762 except Exception:
763 # If something goes wrong, try to remove the altfile so we'll go down
764 # this path again next time.
765 try:
766 os.remove(altfile)
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000767 except OSError as e:
768 print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000769 raise
770 else:
771 if os.path.exists(altfile):
772 self._Run(['repack', '-a'], options)
773 os.remove(altfile)
774
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000775 def _CreateOrUpdateCache(self, url, options):
776 """Make a new git mirror or update existing mirror for |url|, and return the
777 mirror URI to clone from.
778
779 If no cache-dir is specified, just return |url| unchanged.
780 """
781 if not self.cache_dir:
782 return url
783
784 # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
785 folder = os.path.join(
786 self.cache_dir,
787 self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000788 altfile = os.path.join(folder, 'objects', 'info', 'alternates')
789
790 # If we're bringing an old cache up to date or cloning a new cache, and the
791 # existing repo is currently a direct clone, use its objects to help out
792 # the fetch here.
793 checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
794 checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
795 use_reference = (
796 os.path.exists(checkout_objects) and
797 not os.path.exists(checkout_altfile))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000798
799 v = ['-v'] if options.verbose else []
800 filter_fn = lambda l: '[up to date]' not in l
801 with self.cache_locks[folder]:
802 gclient_utils.safe_makedirs(self.cache_dir)
803 if not os.path.exists(os.path.join(folder, 'config')):
804 gclient_utils.rmtree(folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000805 cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
806 '--progress', '--mirror']
807
808 if use_reference:
809 cmd += ['--reference', os.path.abspath(self.checkout_path)]
810
811 self._Run(cmd + [url, folder],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000812 options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000813 else:
814 # For now, assert that host/path/to/repo.git is identical. We may want
815 # to relax this restriction in the future to allow for smarter cache
816 # repo update schemes (such as pulling the same repo, but from a
817 # different host).
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000818 existing_url = self._Capture(['config', 'remote.%s.url' % self.remote],
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000819 cwd=folder)
820 assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
821
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000822 if use_reference:
823 with open(altfile, 'w') as f:
824 f.write(os.path.abspath(checkout_objects))
825
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000826 # Would normally use `git remote update`, but it doesn't support
827 # --progress, so use fetch instead.
828 self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000829 options, filter_fn=filter_fn, cwd=folder, retry=True)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000830
831 # If the clone has an object dependency on the existing repo, break it
832 # with repack and remove the linkage.
833 if os.path.exists(altfile):
834 self._Run(['repack', '-a'], options, cwd=folder)
835 os.remove(altfile)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000836 return folder
837
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000838 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000839 """Clone a git repository from the given URL.
840
msb@chromium.org786fb682010-06-02 15:16:23 +0000841 Once we've cloned the repo, we checkout a working branch if the specified
842 revision is a branch head. If it is a tag or a specific commit, then we
843 leave HEAD detached as it makes future updates simpler -- in this case the
844 user should first create a new branch or switch to an existing branch before
845 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000846 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000847 # git clone doesn't seem to insert a newline properly before printing
848 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000849 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000850 template_path = os.path.join(
851 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000852 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
853 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000854 if self.cache_dir:
855 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000856 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000857 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000858 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000859 # If the parent directory does not exist, Git clone on Windows will not
860 # create it, so we need to do it manually.
861 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000862 gclient_utils.safe_makedirs(parent_dir)
863 tmp_dir = tempfile.mkdtemp(
864 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
865 dir=parent_dir)
866 try:
867 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000868 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000869 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000870 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
871 os.path.join(self.checkout_path, '.git'))
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000872 finally:
873 if os.listdir(tmp_dir):
874 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
875 gclient_utils.rmtree(tmp_dir)
876 if revision.startswith('refs/heads/'):
877 self._Run(
878 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
879 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000880 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000881 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000882 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000883 ('Checked out %s to a detached HEAD. Before making any commits\n'
884 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000885 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
886 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000887
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000888 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000889 branch=None, printed_path=False):
890 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000891 if files is not None:
892 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000893 revision = upstream
894 if newbase:
895 revision = newbase
896 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000897 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000898 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000899 printed_path = True
900 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000901 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000902
903 # Build the rebase command here using the args
904 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
905 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000906 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000907 rebase_cmd.append('--verbose')
908 if newbase:
909 rebase_cmd.extend(['--onto', newbase])
910 rebase_cmd.append(upstream)
911 if branch:
912 rebase_cmd.append(branch)
913
914 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000915 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000916 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000917 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
918 re.match(r'cannot rebase: your index contains uncommitted changes',
919 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000920 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000921 rebase_action = ask_for_data(
922 'Cannot rebase because of unstaged changes.\n'
923 '\'git reset --hard HEAD\' ?\n'
924 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000925 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000926 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000927 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000928 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000929 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000930 break
931 elif re.match(r'quit|q', rebase_action, re.I):
932 raise gclient_utils.Error("Please merge or rebase manually\n"
933 "cd %s && git " % self.checkout_path
934 + "%s" % ' '.join(rebase_cmd))
935 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000936 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000937 continue
938 else:
939 gclient_utils.Error("Input not recognized")
940 continue
941 elif re.search(r'^CONFLICT', e.stdout, re.M):
942 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
943 "Fix the conflict and run gclient again.\n"
944 "See 'man git-rebase' for details.\n")
945 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000946 print(e.stdout.strip())
947 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000948 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
949 "manually.\ncd %s && git " %
950 self.checkout_path
951 + "%s" % ' '.join(rebase_cmd))
952
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000953 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000954 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000955 # Make the output a little prettier. It's nice to have some
956 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000957 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000958
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000959 @staticmethod
960 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000961 (ok, current_version) = scm.GIT.AssertVersion(min_version)
962 if not ok:
963 raise gclient_utils.Error('git version %s < minimum required %s' %
964 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000965
msb@chromium.org786fb682010-06-02 15:16:23 +0000966 def _IsRebasing(self):
967 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
968 # have a plumbing command to determine whether a rebase is in progress, so
969 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
970 g = os.path.join(self.checkout_path, '.git')
971 return (
972 os.path.isdir(os.path.join(g, "rebase-merge")) or
973 os.path.isdir(os.path.join(g, "rebase-apply")))
974
975 def _CheckClean(self, rev_str):
976 # Make sure the tree is clean; see git-rebase.sh for reference
977 try:
978 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000979 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000980 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000981 raise gclient_utils.Error('\n____ %s%s\n'
982 '\tYou have unstaged changes.\n'
983 '\tPlease commit, stash, or reset.\n'
984 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000985 try:
986 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000987 '--ignore-submodules', 'HEAD', '--'],
988 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000989 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000990 raise gclient_utils.Error('\n____ %s%s\n'
991 '\tYour index contains uncommitted changes\n'
992 '\tPlease commit, stash, or reset.\n'
993 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000994
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000995 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000996 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
997 # reference by a commit). If not, error out -- most likely a rebase is
998 # in progress, try to detect so we can give a better error.
999 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001000 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1001 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001002 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001003 # Commit is not contained by any rev. See if the user is rebasing:
1004 if self._IsRebasing():
1005 # Punt to the user
1006 raise gclient_utils.Error('\n____ %s%s\n'
1007 '\tAlready in a conflict, i.e. (no branch).\n'
1008 '\tFix the conflict and run gclient again.\n'
1009 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1010 '\tSee man git-rebase for details.\n'
1011 % (self.relpath, rev_str))
1012 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001013 name = ('saved-by-gclient-' +
1014 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001015 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001016 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001017 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001018
msb@chromium.org5bde4852009-12-14 16:47:12 +00001019 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001020 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001021 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001022 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001023 return None
1024 return branch
1025
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001026 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001027 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +00001028 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +00001029 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001030 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001031
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001032 def _UpdateBranchHeads(self, options, fetch=False):
1033 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1034 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001035 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001036 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1037 '^\\+refs/branch-heads/\\*:.*$']
1038 self._Run(config_cmd, options)
1039 if fetch:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001040 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001041 if options.verbose:
1042 fetch_cmd.append('--verbose')
1043 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001044
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001045 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001046 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001047 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001048 if git_filter:
scottmg@chromium.orgf547c802013-09-27 17:55:26 +00001049 kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001050 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001051 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +00001052 # By default, git will use an interactive terminal prompt when a username/
1053 # password is needed. That shouldn't happen in the chromium workflow,
1054 # and if it does, then gclient may hide the prompt in the midst of a flood
1055 # of terminal spew. The only indication that something has gone wrong
1056 # will be when gclient hangs unresponsively. Instead, we disable the
1057 # password prompt and simply allow git to fail noisily. The error
1058 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001059 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1060 env.setdefault('GIT_ASKPASS', 'true')
1061 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001062 else:
1063 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +00001064 stdout = kwargs.get('stdout', sys.stdout)
1065 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
1066 ' '.join(args), kwargs['cwd']))
1067 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001068
1069
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001070class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001071 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001072 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001073
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001074 @staticmethod
1075 def BinaryExists():
1076 """Returns true if the command exists."""
1077 try:
1078 result, version = scm.SVN.AssertVersion('1.4')
1079 if not result:
1080 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1081 return result
1082 except OSError:
1083 return False
1084
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001085 def GetCheckoutRoot(self):
1086 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1087
floitsch@google.comeaab7842011-04-28 09:07:58 +00001088 def GetRevisionDate(self, revision):
1089 """Returns the given revision's date in ISO-8601 format (which contains the
1090 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001091 date = scm.SVN.Capture(
1092 ['propget', '--revprop', 'svn:date', '-r', revision],
1093 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001094 return date.strip()
1095
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001096 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001097 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001098 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001099
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001100 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001101 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001102 if not os.path.isdir(self.checkout_path):
1103 raise gclient_utils.Error('Directory %s is not present.' %
1104 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001105 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001106
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001107 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001108 """Generates a patch file which can be applied to the root of the
1109 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001110 if not os.path.isdir(self.checkout_path):
1111 raise gclient_utils.Error('Directory %s is not present.' %
1112 self.checkout_path)
1113 gclient_utils.CheckCallAndFilter(
1114 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1115 cwd=self.checkout_path,
1116 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001117 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001118
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001119 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001120 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001121
1122 All updated files will be appended to file_list.
1123
1124 Raises:
1125 Error: if can't get URL for relative path.
1126 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001127 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001128 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001129 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001130 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001131 return
1132
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001133 hg_path = os.path.join(self.checkout_path, '.hg')
1134 if os.path.exists(hg_path):
1135 print('________ found .hg directory; skipping %s' % self.relpath)
1136 return
1137
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001138 if args:
1139 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1140
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001141 # revision is the revision to match. It is None if no revision is specified,
1142 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001143 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001144 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001145 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001146 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001147 if options.revision:
1148 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001149 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001150 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001151 if revision != 'unmanaged':
1152 forced_revision = True
1153 # Reconstruct the url.
1154 url = '%s@%s' % (url, revision)
1155 rev_str = ' at %s' % revision
1156 else:
1157 managed = False
1158 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001159 else:
1160 forced_revision = False
1161 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001162
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001163 # Get the existing scm url and the revision number of the current checkout.
1164 exists = os.path.exists(self.checkout_path)
1165 if exists and managed:
1166 try:
1167 from_info = scm.SVN.CaptureLocalInfo(
1168 [], os.path.join(self.checkout_path, '.'))
1169 except (gclient_utils.Error, subprocess2.CalledProcessError):
1170 if options.reset and options.delete_unversioned_trees:
1171 print 'Removing troublesome path %s' % self.checkout_path
1172 gclient_utils.rmtree(self.checkout_path)
1173 exists = False
1174 else:
1175 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1176 'present. Delete the directory and try again.')
1177 raise gclient_utils.Error(msg % self.checkout_path)
1178
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001179 BASE_URLS = {
1180 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1181 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1182 }
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001183 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001184 try:
1185 # Split out the revision number since it's not useful for us.
1186 base_path = urlparse.urlparse(url).path.split('@')[0]
1187 if ('CHROME_HEADLESS' in os.environ
1188 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
1189 and base_path in BASE_URLS):
1190 # Use a tarball for initial sync if we are on a bot.
1191 # Get an unauthenticated gsutil instance.
1192 gsutil = download_from_google_storage.Gsutil(
1193 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1194
1195 gs_path = BASE_URLS[base_path]
1196 _, out, _ = gsutil.check_call('ls', gs_path)
1197 # So that we can get the most recent revision.
1198 sorted_items = sorted(out.splitlines())
1199 latest_checkout = sorted_items[-1]
1200
1201 tempdir = tempfile.mkdtemp()
1202 print 'Downloading %s...' % latest_checkout
1203 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1204 if code:
1205 print '%s\n%s' % (out, err)
1206 raise Exception()
1207 filename = latest_checkout.split('/')[-1]
1208 tarball = os.path.join(tempdir, filename)
1209 print 'Unpacking into %s...' % self.checkout_path
1210 gclient_utils.safe_makedirs(self.checkout_path)
1211 # TODO(hinoka): Use 7z for windows.
1212 cmd = ['tar', '--extract', '--ungzip',
1213 '--directory', self.checkout_path,
1214 '--file', tarball]
1215 gclient_utils.CheckCallAndFilter(
1216 cmd, stdout=sys.stdout, print_stdout=True)
1217
1218 print 'Deleting temp file'
1219 gclient_utils.rmtree(tempdir)
1220
1221 # Rewrite the repository root to match.
1222 tarball_url = scm.SVN.CaptureLocalInfo(
1223 ['.'], self.checkout_path)['Repository Root']
1224 tarball_parsed = urlparse.urlparse(tarball_url)
1225 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1226 tarball_parsed.netloc)
1227 local_parsed = urlparse.urlparse(url)
1228 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
1229
1230 if tarball_root != local_root:
1231 print 'Switching repository root to %s' % local_root
1232 self._Run(['switch', '--relocate', tarball_root,
1233 local_root, self.checkout_path],
1234 options)
1235 except Exception as e:
1236 print 'We tried to get a source tarball but failed.'
1237 print 'Resuming normal operations.'
1238 print str(e)
1239
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001240 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001241 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001242 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001243 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001244 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001245 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001246
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001247 if not managed:
1248 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001249 return self.Svnversion()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001250
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001251 if 'URL' not in from_info:
1252 raise gclient_utils.Error(
1253 ('gclient is confused. Couldn\'t get the url for %s.\n'
1254 'Try using @unmanaged.\n%s') % (
1255 self.checkout_path, from_info))
1256
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001257 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001258 dir_info = scm.SVN.CaptureStatus(
1259 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001260 if any(d[0][2] == 'L' for d in dir_info):
1261 try:
1262 self._Run(['cleanup', self.checkout_path], options)
1263 except subprocess2.CalledProcessError, e:
1264 # Get the status again, svn cleanup may have cleaned up at least
1265 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001266 dir_info = scm.SVN.CaptureStatus(
1267 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001268
1269 # Try to fix the failures by removing troublesome files.
1270 for d in dir_info:
1271 if d[0][2] == 'L':
1272 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001273 # We don't pass any files/directories to CaptureStatus and set
1274 # cwd=self.checkout_path, so we should get relative paths here.
1275 assert not os.path.isabs(d[1])
1276 path_to_remove = os.path.normpath(
1277 os.path.join(self.checkout_path, d[1]))
1278 print 'Removing troublesome path %s' % path_to_remove
1279 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001280 else:
1281 print 'Not removing troublesome path %s automatically.' % d[1]
1282 if d[0][0] == '!':
1283 print 'You can pass --force to enable automatic removal.'
1284 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001285
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001286 # Retrieve the current HEAD version because svn is slow at null updates.
1287 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001288 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001289 revision = str(from_info_live['Revision'])
1290 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001291
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001292 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001293 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +00001294 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001295 to_info = scm.SVN.CaptureRemoteInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001296 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +00001297 # The url is invalid or the server is not accessible, it's safer to bail
1298 # out right now.
1299 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001300 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1301 and (from_info['UUID'] == to_info['UUID']))
1302 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001303 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001304 # We have different roots, so check if we can switch --relocate.
1305 # Subversion only permits this if the repository UUIDs match.
1306 # Perform the switch --relocate, then rewrite the from_url
1307 # to reflect where we "are now." (This is the same way that
1308 # Subversion itself handles the metadata when switch --relocate
1309 # is used.) This makes the checks below for whether we
1310 # can update to a revision or have to switch to a different
1311 # branch work as expected.
1312 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001313 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001314 from_info['Repository Root'],
1315 to_info['Repository Root'],
1316 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001317 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001318 from_info['URL'] = from_info['URL'].replace(
1319 from_info['Repository Root'],
1320 to_info['Repository Root'])
1321 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +00001322 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001323 # Look for local modifications but ignore unversioned files.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001324 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001325 if status[0][0] != '?':
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001326 raise gclient_utils.Error(
1327 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1328 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001329 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001330 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001331 print('\n_____ switching %s to a new checkout' % self.relpath)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001332 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001333 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001334 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001335 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001336 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001337 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001338
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001339 # If the provided url has a revision number that matches the revision
1340 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001341 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001342 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001343 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001344 else:
1345 command = ['update', self.checkout_path]
1346 command = self._AddAdditionalUpdateFlags(command, options, revision)
1347 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001348
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001349 # If --reset and --delete_unversioned_trees are specified, remove any
1350 # untracked files and directories.
1351 if options.reset and options.delete_unversioned_trees:
1352 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1353 full_path = os.path.join(self.checkout_path, status[1])
1354 if (status[0][0] == '?'
1355 and os.path.isdir(full_path)
1356 and not os.path.islink(full_path)):
1357 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001358 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001359 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001360
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001361 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001362 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001363 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001364 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001365 # Create an empty checkout and then update the one file we want. Future
1366 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001367 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001368 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001369 if os.path.exists(os.path.join(self.checkout_path, filename)):
1370 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001371 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001372 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001373 # After the initial checkout, we can use update as if it were any other
1374 # dep.
1375 self.update(options, args, file_list)
1376 else:
1377 # If the installed version of SVN doesn't support --depth, fallback to
1378 # just exporting the file. This has the downside that revision
1379 # information is not stored next to the file, so we will have to
1380 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001381 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001382 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001383 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001384 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001385 command = self._AddAdditionalUpdateFlags(command, options,
1386 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001387 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001388
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001389 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001390 """Reverts local modifications. Subversion specific.
1391
1392 All reverted files will be appended to file_list, even if Subversion
1393 doesn't know about them.
1394 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001395 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001396 if os.path.exists(self.checkout_path):
1397 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001398 # svn revert won't work if the directory doesn't exist. It needs to
1399 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001400 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001401 # Don't reuse the args.
1402 return self.update(options, [], file_list)
1403
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001404 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
1405 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1406 print('________ found .git directory; skipping %s' % self.relpath)
1407 return
1408 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1409 print('________ found .hg directory; skipping %s' % self.relpath)
1410 return
1411 if not options.force:
1412 raise gclient_utils.Error('Invalid checkout path, aborting')
1413 print(
1414 '\n_____ %s is not a valid svn checkout, synching instead' %
1415 self.relpath)
1416 gclient_utils.rmtree(self.checkout_path)
1417 # Don't reuse the args.
1418 return self.update(options, [], file_list)
1419
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001420 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001421 if file_list is not None:
1422 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001423 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001424 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001425 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001426 print(os.path.join(self.checkout_path, file_status[1]))
1427 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001428
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001429 # Revert() may delete the directory altogether.
1430 if not os.path.isdir(self.checkout_path):
1431 # Don't reuse the args.
1432 return self.update(options, [], file_list)
1433
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001434 try:
1435 # svn revert is so broken we don't even use it. Using
1436 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001437 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001438 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1439 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001440 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001441 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001442 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001443
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001444 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001445 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001446 try:
1447 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001448 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001449 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001450
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001451 def runhooks(self, options, args, file_list):
1452 self.status(options, args, file_list)
1453
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001454 def status(self, options, args, file_list):
1455 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001456 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001457 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001458 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001459 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1460 'The directory does not exist.') %
1461 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001462 # There's no file list to retrieve.
1463 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001464 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001465
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001466 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001467 """Verifies the validity of the revision for this repository."""
1468 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1469 raise gclient_utils.Error(
1470 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1471 'correct.') % rev)
1472 return rev
1473
msb@chromium.orge6f78352010-01-13 17:05:33 +00001474 def FullUrlForRelativeUrl(self, url):
1475 # Find the forth '/' and strip from there. A bit hackish.
1476 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001477
maruel@chromium.org669600d2010-09-01 19:06:31 +00001478 def _Run(self, args, options, **kwargs):
1479 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001480 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001481 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001482 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001483
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001484 def Svnversion(self):
1485 """Runs the lowest checked out revision in the current project."""
1486 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1487 return info['Revision']
1488
maruel@chromium.org669600d2010-09-01 19:06:31 +00001489 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1490 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001491 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001492 scm.SVN.RunAndGetFileList(
1493 options.verbose,
1494 args + ['--ignore-externals'],
1495 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001496 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001497
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001498 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001499 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001500 """Add additional flags to command depending on what options are set.
1501 command should be a list of strings that represents an svn command.
1502
1503 This method returns a new list to be used as a command."""
1504 new_command = command[:]
1505 if revision:
1506 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001507 # We don't want interaction when jobs are used.
1508 if options.jobs > 1:
1509 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001510 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001511 # --accept was added to 'svn update' in svn 1.6.
1512 if not scm.SVN.AssertVersion('1.5')[0]:
1513 return new_command
1514
1515 # It's annoying to have it block in the middle of a sync, just sensible
1516 # defaults.
1517 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001518 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001519 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1520 new_command.extend(('--accept', 'theirs-conflict'))
1521 elif options.manually_grab_svn_rev:
1522 new_command.append('--force')
1523 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1524 new_command.extend(('--accept', 'postpone'))
1525 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1526 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001527 return new_command