blob: 4befa33386cf5780de454a076e5bd6d67e8ae041 [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
zty@chromium.org6279e8a2014-02-13 01:45:25 +000016import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000017import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000018
hinoka@google.com2f2ca142014-01-07 03:59:18 +000019import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000020import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000021import scm
22import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000023
24
szager@chromium.org71cbb502013-04-19 23:30:15 +000025THIS_FILE_PATH = os.path.abspath(__file__)
26
hinoka@google.com2f2ca142014-01-07 03:59:18 +000027GSUTIL_DEFAULT_PATH = os.path.join(
28 os.path.dirname(os.path.abspath(__file__)),
29 'third_party', 'gsutil', 'gsutil')
30
szager@chromium.org71cbb502013-04-19 23:30:15 +000031
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000032class DiffFiltererWrapper(object):
33 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000034 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000035 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000036 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000037 original_prefix = "--- "
38 working_prefix = "+++ "
39
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000040 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000041 # Note that we always use '/' as the path separator to be
42 # consistent with svn's cygwin-style output on Windows
43 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000044 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000045
maruel@chromium.org6e29d572010-06-04 17:32:20 +000046 def SetCurrentFile(self, current_file):
47 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000048
iannucci@chromium.org3830a672013-02-19 20:15:14 +000049 @property
50 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000051 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000052
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000053 def _Replace(self, line):
54 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000055
56 def Filter(self, line):
57 if (line.startswith(self.index_string)):
58 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000059 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000060 else:
61 if (line.startswith(self.original_prefix) or
62 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000063 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000064 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000065
66
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000067class SvnDiffFilterer(DiffFiltererWrapper):
68 index_string = "Index: "
69
70
71class GitDiffFilterer(DiffFiltererWrapper):
72 index_string = "diff --git "
73
74 def SetCurrentFile(self, current_file):
75 # Get filename by parsing "a/<filename> b/<filename>"
76 self._current_file = current_file[:(len(current_file)/2)][2:]
77
78 def _Replace(self, line):
79 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
80
81
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000082### SCM abstraction layer
83
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000084# Factory Method for SCM wrapper creation
85
maruel@chromium.org9eda4112010-06-11 18:56:10 +000086def GetScmName(url):
87 if url:
88 url, _ = gclient_utils.SplitUrlRevision(url)
89 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000090 url.startswith('git+http://') or url.startswith('git+https://') or
mariakhomenko@chromium.orga2ede5c2014-02-05 22:05:17 +000091 url.endswith('.git') or url.startswith('sso://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000092 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000093 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000094 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000095 return 'svn'
96 return None
97
98
99def CreateSCM(url, root_dir=None, relpath=None):
100 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000101 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000102 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000103 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000104
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000105 scm_name = GetScmName(url)
106 if not scm_name in SCM_MAP:
107 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000108 scm_class = SCM_MAP[scm_name]
109 if not scm_class.BinaryExists():
110 raise gclient_utils.Error('%s command not found' % scm_name)
111 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000112
113
114# SCMWrapper base class
115
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000116class SCMWrapper(object):
117 """Add necessary glue between all the supported SCM.
118
msb@chromium.orgd6504212010-01-13 17:34:31 +0000119 This is the abstraction layer to bind to different SCM.
120 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000121 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000122 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000123 self._root_dir = root_dir
124 if self._root_dir:
125 self._root_dir = self._root_dir.replace('/', os.sep)
126 self.relpath = relpath
127 if self.relpath:
128 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000129 if self.relpath and self._root_dir:
130 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000131
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000132 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000133 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000134 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000135
136 if not command in commands:
137 raise gclient_utils.Error('Unknown command %s' % command)
138
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000139 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000140 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000141 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000142
143 return getattr(self, command)(options, args, file_list)
144
145
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000146class GitFilter(object):
147 """A filter_fn implementation for quieting down git output messages.
148
149 Allows a custom function to skip certain lines (predicate), and will throttle
150 the output of percentage completed lines to only output every X seconds.
151 """
152 PERCENT_RE = re.compile('.* ([0-9]{1,2})% .*')
153
154 def __init__(self, time_throttle=0, predicate=None):
155 """
156 Args:
157 time_throttle (int): GitFilter will throttle 'noisy' output (such as the
158 XX% complete messages) to only be printed at least |time_throttle|
159 seconds apart.
160 predicate (f(line)): An optional function which is invoked for every line.
161 The line will be skipped if predicate(line) returns False.
162 """
163 self.last_time = 0
164 self.time_throttle = time_throttle
165 self.predicate = predicate
166
167 def __call__(self, line):
168 # git uses an escape sequence to clear the line; elide it.
169 esc = line.find(unichr(033))
170 if esc > -1:
171 line = line[:esc]
172 if self.predicate and not self.predicate(line):
173 return
174 now = time.time()
175 match = self.PERCENT_RE.match(line)
176 if not match:
177 self.last_time = 0
178 if (now - self.last_time) >= self.time_throttle:
179 self.last_time = now
180 print line
181
182
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000183class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000184 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000185 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000186 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000187
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000188 cache_dir = None
189 # If a given cache is used in a solution more than once, prevent multiple
190 # threads from updating it simultaneously.
191 cache_locks = collections.defaultdict(threading.Lock)
192
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000193 def __init__(self, url=None, root_dir=None, relpath=None):
194 """Removes 'git+' fake prefix from git URL."""
195 if url.startswith('git+http://') or url.startswith('git+https://'):
196 url = url[4:]
197 SCMWrapper.__init__(self, url, root_dir, relpath)
198
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000199 @staticmethod
200 def BinaryExists():
201 """Returns true if the command exists."""
202 try:
203 # We assume git is newer than 1.7. See: crbug.com/114483
204 result, version = scm.GIT.AssertVersion('1.7')
205 if not result:
206 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
207 return result
208 except OSError:
209 return False
210
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000211 def GetCheckoutRoot(self):
212 return scm.GIT.GetCheckoutRoot(self.checkout_path)
213
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000214 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000215 """Returns the given revision's date in ISO-8601 format (which contains the
216 time zone)."""
217 # TODO(floitsch): get the time-stamp of the given revision and not just the
218 # time-stamp of the currently checked out revision.
219 return self._Capture(['log', '-n', '1', '--format=%ai'])
220
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000221 @staticmethod
222 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000223 """'Cleanup' the repo.
224
225 There's no real git equivalent for the svn cleanup command, do a no-op.
226 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000227
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000228 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000229 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000230 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000231
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000232 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000233 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000234 repository.
235
236 The patch file is generated from a diff of the merge base of HEAD and
237 its upstream branch.
238 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000239 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000240 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000241 ['git', 'diff', merge_base],
242 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000243 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000244
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000245 def UpdateSubmoduleConfig(self):
246 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000247 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000248 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000249 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000250 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000251 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000252 kwargs = {'cwd': self.checkout_path,
253 'print_stdout': False,
254 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000255 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000256 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
257 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000258 except subprocess2.CalledProcessError:
259 # Not a fatal error, or even very interesting in a non-git-submodule
260 # world. So just keep it quiet.
261 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000262 try:
263 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
264 except subprocess2.CalledProcessError:
265 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000266
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000267 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
268
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000269 def _FetchAndReset(self, revision, file_list, options):
270 """Equivalent to git fetch; git reset."""
271 quiet = []
272 if not options.verbose:
273 quiet = ['--quiet']
274 self._UpdateBranchHeads(options, fetch=False)
275
276 fetch_cmd = [
277 '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote, '--prune']
278 self._Run(fetch_cmd + quiet, options, retry=True)
279 self._Run(['reset', '--hard', revision] + quiet, options)
280 self.UpdateSubmoduleConfig()
281 if file_list is not None:
282 files = self._Capture(['ls-files']).splitlines()
283 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
284
msb@chromium.orge28e4982009-09-25 20:51:45 +0000285 def update(self, options, args, file_list):
286 """Runs git to update or transparently checkout the working copy.
287
288 All updated files will be appended to file_list.
289
290 Raises:
291 Error: if can't get URL for relative path.
292 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000293 if args:
294 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
295
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000296 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000297
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000298 # If a dependency is not pinned, track the default remote branch.
299 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000300 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000301 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000302 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000303 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000304 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000305 # Override the revision number.
306 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000307 if revision == 'unmanaged':
308 revision = None
309 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000310 if not revision:
311 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000312
floitsch@google.comeaab7842011-04-28 09:07:58 +0000313 if gclient_utils.IsDateRevision(revision):
314 # Date-revisions only work on git-repositories if the reflog hasn't
315 # expired yet. Use rev-list to get the corresponding revision.
316 # git rev-list -n 1 --before='time-stamp' branchname
317 if options.transitive:
318 print('Warning: --transitive only works for SVN repositories.')
319 revision = default_rev
320
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000321 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000322 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000323
324 printed_path = False
325 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000326 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000327 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000328 verbose = ['--verbose']
329 printed_path = True
330
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000331 url = self._CreateOrUpdateCache(url, options)
332
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000333 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000334 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000335 elif revision.startswith(self.remote + '/'):
336 # For compatibility with old naming, translate 'origin' to 'refs/heads'
337 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000338 rev_type = "branch"
339 else:
340 # hash is also a tag, only make a distinction at checkout
341 rev_type = "hash"
342
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000343 if (not os.path.exists(self.checkout_path) or
344 (os.path.isdir(self.checkout_path) and
345 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000346 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000347 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000348 if file_list is not None:
349 files = self._Capture(['ls-files']).splitlines()
350 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000351 if not verbose:
352 # Make the output a little prettier. It's nice to have some whitespace
353 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000354 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000355 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000356
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000357 if not managed:
mmoss@chromium.org96833fa2013-04-17 03:26:37 +0000358 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgf5cc4272012-06-21 22:38:07 +0000359 self.UpdateSubmoduleConfig()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000360 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000361 return self._Capture(['rev-parse', '--verify', 'HEAD'])
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000362
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000363 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
364 raise gclient_utils.Error('\n____ %s%s\n'
365 '\tPath is not a git repo. No .git dir.\n'
366 '\tTo resolve:\n'
367 '\t\trm -rf %s\n'
368 '\tAnd run gclient sync again\n'
369 % (self.relpath, rev_str, self.relpath))
370
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000371 # See if the url has changed (the unittests use git://foo for the url, let
372 # that through).
373 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
374 return_early = False
375 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
376 # unit test pass. (and update the comment above)
377 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
378 # This allows devs to use experimental repos which have a different url
379 # but whose branch(s) are the same as official repos.
380 if (current_url != url and
381 url != 'git://foo' and
382 subprocess2.capture(
383 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
384 cwd=self.checkout_path).strip() != 'False'):
385 print('_____ switching %s to a new upstream' % self.relpath)
386 # Make sure it's clean
387 self._CheckClean(rev_str)
388 # Switch over to the new upstream
389 self._Run(['remote', 'set-url', self.remote, url], options)
390 self._FetchAndReset(revision, file_list, options)
391 return_early = True
392
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000393 # Need to do this in the normal path as well as in the post-remote-switch
394 # path.
395 self._PossiblySwitchCache(url, options)
396
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000397 if return_early:
398 return self._Capture(['rev-parse', '--verify', 'HEAD'])
399
msb@chromium.org5bde4852009-12-14 16:47:12 +0000400 cur_branch = self._GetCurrentBranch()
401
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000402 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000403 # 0) HEAD is detached. Probably from our initial clone.
404 # - make sure HEAD is contained by a named ref, then update.
405 # Cases 1-4. HEAD is a branch.
406 # 1) current branch is not tracking a remote branch (could be git-svn)
407 # - try to rebase onto the new hash or branch
408 # 2) current branch is tracking a remote branch with local committed
409 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000410 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000411 # 3) current branch is tracking a remote branch w/or w/out changes,
412 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000413 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000414 # 4) current branch is tracking a remote branch, switches to a different
415 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000416 # - exit
417
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000418 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
419 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000420 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
421 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000422 if cur_branch is None:
423 upstream_branch = None
424 current_type = "detached"
425 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000426 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000427 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
428 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
429 current_type = "hash"
430 logging.debug("Current branch is not tracking an upstream (remote)"
431 " branch.")
432 elif upstream_branch.startswith('refs/remotes'):
433 current_type = "branch"
434 else:
435 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000436
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000437 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000438 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000439 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000440 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000441 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000442 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000443
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000444 self._UpdateBranchHeads(options, fetch=True)
445
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000446 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000447 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000448 target = 'HEAD'
449 if options.upstream and upstream_branch:
450 target = upstream_branch
451 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000452
msb@chromium.org786fb682010-06-02 15:16:23 +0000453 if current_type == 'detached':
454 # case 0
455 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000456 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000457 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000458 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000459 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000460 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000461 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000462 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000463 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000464 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000465 newbase=revision, printed_path=printed_path,
466 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000467 printed_path = True
468 else:
469 # Can't find a merge-base since we don't know our upstream. That makes
470 # this command VERY likely to produce a rebase failure. For now we
471 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000472 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000473 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000474 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000475 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000476 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000477 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000478 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000479 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000480 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000481 newbase=revision, printed_path=printed_path,
482 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000483 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000484 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000485 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000486 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000487 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000488 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000489 switch_error = ("Switching upstream branch from %s to %s\n"
490 % (upstream_branch, new_base) +
491 "Please merge or rebase manually:\n" +
492 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
493 "OR git checkout -b <some new branch> %s" % new_base)
494 raise gclient_utils.Error(switch_error)
495 else:
496 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000497 if files is not None:
498 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000499 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000500 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000501 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000502 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000503 if options.merge:
504 merge_args.append('--ff')
505 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000506 merge_args.append('--ff-only')
507 merge_args.append(upstream_branch)
508 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000509 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000511 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000512 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000513 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000514 printed_path = True
515 while True:
516 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000517 action = self._AskForData(
518 'Cannot %s, attempt to rebase? '
519 '(y)es / (q)uit / (s)kip : ' %
520 ('merge' if options.merge else 'fast-forward merge'),
521 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000522 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000523 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000524 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000525 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000526 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000527 printed_path = True
528 break
529 elif re.match(r'quit|q', action, re.I):
530 raise gclient_utils.Error("Can't fast-forward, please merge or "
531 "rebase manually.\n"
532 "cd %s && git " % self.checkout_path
533 + "rebase %s" % upstream_branch)
534 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000535 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000536 return
537 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000538 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000539 elif re.match("error: Your local changes to '.*' would be "
540 "overwritten by merge. Aborting.\nPlease, commit your "
541 "changes or stash them before you can merge.\n",
542 e.stderr):
543 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000544 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000545 printed_path = True
546 raise gclient_utils.Error(e.stderr)
547 else:
548 # Some other problem happened with the merge
549 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000550 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000551 raise
552 else:
553 # Fast-forward merge was successful
554 if not re.match('Already up-to-date.', merge_output) or verbose:
555 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000556 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000557 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000558 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000559 if not verbose:
560 # Make the output a little prettier. It's nice to have some
561 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000562 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000563
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000564 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000565 if file_list is not None:
566 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000567
568 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000569 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000570 raise gclient_utils.Error('\n____ %s%s\n'
571 '\nConflict while rebasing this branch.\n'
572 'Fix the conflict and run gclient again.\n'
573 'See man git-rebase for details.\n'
574 % (self.relpath, rev_str))
575
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000576 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000577 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000578
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000579 # If --reset and --delete_unversioned_trees are specified, remove any
580 # untracked directories.
581 if options.reset and options.delete_unversioned_trees:
582 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
583 # merge-base by default), so doesn't include untracked files. So we use
584 # 'git ls-files --directory --others --exclude-standard' here directly.
585 paths = scm.GIT.Capture(
586 ['ls-files', '--directory', '--others', '--exclude-standard'],
587 self.checkout_path)
588 for path in (p for p in paths.splitlines() if p.endswith('/')):
589 full_path = os.path.join(self.checkout_path, path)
590 if not os.path.islink(full_path):
591 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000592 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000593
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000594 return self._Capture(['rev-parse', '--verify', 'HEAD'])
595
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000596
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000597 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000598 """Reverts local modifications.
599
600 All reverted files will be appended to file_list.
601 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000602 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000603 # revert won't work if the directory doesn't exist. It needs to
604 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000605 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000606 # Don't reuse the args.
607 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000608
609 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000610 if options.upstream:
611 if self._GetCurrentBranch():
612 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
613 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000614 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000615 if not deps_revision:
616 deps_revision = default_rev
617 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000618 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000619 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000620
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000621 if file_list is not None:
622 files = self._Capture(['diff', deps_revision, '--name-only']).split()
623
maruel@chromium.org37e89872010-09-07 16:11:33 +0000624 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000625 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000626
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000627 if file_list is not None:
628 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
629
630 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000631 """Returns revision"""
632 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000633
msb@chromium.orge28e4982009-09-25 20:51:45 +0000634 def runhooks(self, options, args, file_list):
635 self.status(options, args, file_list)
636
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000637 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000638 """Display status information."""
639 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000640 print(('\n________ couldn\'t run status in %s:\n'
641 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000642 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000643 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000644 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000645 if file_list is not None:
646 files = self._Capture(['diff', '--name-only', merge_base]).split()
647 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000648
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000649 def GetUsableRev(self, rev, options):
650 """Finds a useful revision for this repository.
651
652 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
653 will be called on the source."""
654 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000655 if not os.path.isdir(self.checkout_path):
656 raise gclient_utils.Error(
657 ( 'We could not find a valid hash for safesync_url response "%s".\n'
658 'Safesync URLs with a git checkout currently require the repo to\n'
659 'be cloned without a safesync_url before adding the safesync_url.\n'
660 'For more info, see: '
661 'http://code.google.com/p/chromium/wiki/UsingNewGit'
662 '#Initial_checkout' ) % rev)
663 elif rev.isdigit() and len(rev) < 7:
664 # Handles an SVN rev. As an optimization, only verify an SVN revision as
665 # [0-9]{1,6} for now to avoid making a network request.
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000666 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000667 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
668 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000669 try:
670 logging.debug('Looking for git-svn configuration optimizations.')
671 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
672 cwd=self.checkout_path):
673 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
674 except subprocess2.CalledProcessError:
675 logging.debug('git config --get svn-remote.svn.fetch failed, '
676 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000677 if options.verbose:
678 print('Running git svn fetch. This might take a while.\n')
679 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000680 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000681 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
682 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000683 except gclient_utils.Error, e:
684 sha1 = e.message
685 print('\nWarning: Could not find a git revision with accurate\n'
686 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
687 'the closest sane git revision, which is:\n'
688 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000689 if not sha1:
690 raise gclient_utils.Error(
691 ( 'It appears that either your git-svn remote is incorrectly\n'
692 'configured or the revision in your safesync_url is\n'
693 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
694 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000695 else:
696 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
697 sha1 = rev
698 else:
699 # May exist in origin, but we don't have it yet, so fetch and look
700 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000701 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000702 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
703 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000704
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000705 if not sha1:
706 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000707 ( 'We could not find a valid hash for safesync_url response "%s".\n'
708 'Safesync URLs with a git checkout currently require a git-svn\n'
709 'remote or a safesync_url that provides git sha1s. Please add a\n'
710 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000711 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000712 '#Initial_checkout' ) % rev)
713
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000714 return sha1
715
msb@chromium.orge6f78352010-01-13 17:05:33 +0000716 def FullUrlForRelativeUrl(self, url):
717 # Strip from last '/'
718 # Equivalent to unix basename
719 base_url = self.url
720 return base_url[:base_url.rfind('/')] + url
721
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000722 @staticmethod
723 def _NormalizeGitURL(url):
724 '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
725 idx = url.find('://')
726 if idx != -1:
727 url = url[idx+3:]
728 if not url.endswith('.git'):
729 url += '.git'
730 return url
731
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000732 def _PossiblySwitchCache(self, url, options):
733 """Handles switching a repo from with-cache to direct, or vice versa.
734
735 When we go from direct to with-cache, the remote url changes from the
736 'real' url to the local file url (in cache_dir). Therefore, this function
737 assumes that |url| points to the correctly-switched-over local file url, if
738 we're in cache_mode.
739
740 When we go from with-cache to direct, assume that the normal url-switching
741 code already flipped the remote over, and we just need to repack and break
742 the dependency to the cache.
743 """
744
745 altfile = os.path.join(
746 self.checkout_path, '.git', 'objects', 'info', 'alternates')
747 if self.cache_dir:
748 if not os.path.exists(altfile):
749 try:
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000750 with open(altfile, 'w') as f:
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000751 f.write(os.path.join(url, 'objects'))
752 # pylint: disable=C0301
753 # This dance is necessary according to emperical evidence, also at:
754 # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
755 self._Run(['repack', '-ad'], options)
756 self._Run(['repack', '-adl'], options)
757 except Exception:
758 # If something goes wrong, try to remove the altfile so we'll go down
759 # this path again next time.
760 try:
761 os.remove(altfile)
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000762 except OSError as e:
763 print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000764 raise
765 else:
766 if os.path.exists(altfile):
767 self._Run(['repack', '-a'], options)
768 os.remove(altfile)
769
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000770 def _CreateOrUpdateCache(self, url, options):
771 """Make a new git mirror or update existing mirror for |url|, and return the
772 mirror URI to clone from.
773
774 If no cache-dir is specified, just return |url| unchanged.
775 """
776 if not self.cache_dir:
777 return url
778
779 # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
780 folder = os.path.join(
781 self.cache_dir,
782 self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000783 altfile = os.path.join(folder, 'objects', 'info', 'alternates')
784
785 # If we're bringing an old cache up to date or cloning a new cache, and the
786 # existing repo is currently a direct clone, use its objects to help out
787 # the fetch here.
788 checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
789 checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
790 use_reference = (
791 os.path.exists(checkout_objects) and
792 not os.path.exists(checkout_altfile))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000793
794 v = ['-v'] if options.verbose else []
795 filter_fn = lambda l: '[up to date]' not in l
796 with self.cache_locks[folder]:
797 gclient_utils.safe_makedirs(self.cache_dir)
798 if not os.path.exists(os.path.join(folder, 'config')):
799 gclient_utils.rmtree(folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000800 cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
hinoka@google.com78d78f32014-02-11 23:25:31 +0000801 '--progress', '--bare']
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000802
803 if use_reference:
804 cmd += ['--reference', os.path.abspath(self.checkout_path)]
805
806 self._Run(cmd + [url, folder],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000807 options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000808 else:
809 # For now, assert that host/path/to/repo.git is identical. We may want
810 # to relax this restriction in the future to allow for smarter cache
811 # repo update schemes (such as pulling the same repo, but from a
812 # different host).
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000813 existing_url = self._Capture(['config', 'remote.%s.url' % self.remote],
814 cwd=folder)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000815 assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
816
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000817 if use_reference:
818 with open(altfile, 'w') as f:
819 f.write(os.path.abspath(checkout_objects))
820
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000821 # Would normally use `git remote update`, but it doesn't support
822 # --progress, so use fetch instead.
823 self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000824 options, filter_fn=filter_fn, cwd=folder, retry=True)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000825
826 # If the clone has an object dependency on the existing repo, break it
827 # with repack and remove the linkage.
828 if os.path.exists(altfile):
829 self._Run(['repack', '-a'], options, cwd=folder)
830 os.remove(altfile)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000831 return folder
832
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000833 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000834 """Clone a git repository from the given URL.
835
msb@chromium.org786fb682010-06-02 15:16:23 +0000836 Once we've cloned the repo, we checkout a working branch if the specified
837 revision is a branch head. If it is a tag or a specific commit, then we
838 leave HEAD detached as it makes future updates simpler -- in this case the
839 user should first create a new branch or switch to an existing branch before
840 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000841 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000842 # git clone doesn't seem to insert a newline properly before printing
843 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000844 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000845 template_path = os.path.join(
846 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000847 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
848 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000849 if self.cache_dir:
850 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000851 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000852 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000853 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000854 # If the parent directory does not exist, Git clone on Windows will not
855 # create it, so we need to do it manually.
856 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000857 gclient_utils.safe_makedirs(parent_dir)
858 tmp_dir = tempfile.mkdtemp(
859 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
860 dir=parent_dir)
861 try:
862 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000863 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000864 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000865 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
866 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000867 except:
868 traceback.print_exc(file=sys.stderr)
869 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000870 finally:
871 if os.listdir(tmp_dir):
872 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
873 gclient_utils.rmtree(tmp_dir)
874 if revision.startswith('refs/heads/'):
875 self._Run(
876 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
877 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000878 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000879 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000880 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000881 ('Checked out %s to a detached HEAD. Before making any commits\n'
882 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000883 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
884 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000885
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000886 @staticmethod
887 def _AskForData(prompt, options):
888 if options.jobs > 1:
889 raise gclient_utils.Error("Background task requires input. Rerun "
890 "gclient with --jobs=1 so that\n"
891 "interaction is possible.")
892 try:
893 return raw_input(prompt)
894 except KeyboardInterrupt:
895 # Hide the exception.
896 sys.exit(1)
897
898
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000899 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000900 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000901 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000902 if files is not None:
903 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000904 revision = upstream
905 if newbase:
906 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000907 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000908 if not printed_path:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000909 print('\n_____ %s : Attempting %s onto %s...' % (
910 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000911 printed_path = True
912 else:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000913 print('Attempting %s onto %s...' % (action, revision))
914
915 if merge:
916 merge_output = self._Capture(['merge', revision])
917 if options.verbose:
918 print(merge_output)
919 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000920
921 # Build the rebase command here using the args
922 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
923 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000924 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000925 rebase_cmd.append('--verbose')
926 if newbase:
927 rebase_cmd.extend(['--onto', newbase])
928 rebase_cmd.append(upstream)
929 if branch:
930 rebase_cmd.append(branch)
931
932 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000933 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000934 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000935 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
936 re.match(r'cannot rebase: your index contains uncommitted changes',
937 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000938 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000939 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000940 'Cannot rebase because of unstaged changes.\n'
941 '\'git reset --hard HEAD\' ?\n'
942 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000943 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000944 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000945 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000946 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000947 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000948 break
949 elif re.match(r'quit|q', rebase_action, re.I):
950 raise gclient_utils.Error("Please merge or rebase manually\n"
951 "cd %s && git " % self.checkout_path
952 + "%s" % ' '.join(rebase_cmd))
953 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000954 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000955 continue
956 else:
957 gclient_utils.Error("Input not recognized")
958 continue
959 elif re.search(r'^CONFLICT', e.stdout, re.M):
960 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
961 "Fix the conflict and run gclient again.\n"
962 "See 'man git-rebase' for details.\n")
963 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000964 print(e.stdout.strip())
965 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000966 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
967 "manually.\ncd %s && git " %
968 self.checkout_path
969 + "%s" % ' '.join(rebase_cmd))
970
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000971 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000972 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000973 # Make the output a little prettier. It's nice to have some
974 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000975 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000976
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000977 @staticmethod
978 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000979 (ok, current_version) = scm.GIT.AssertVersion(min_version)
980 if not ok:
981 raise gclient_utils.Error('git version %s < minimum required %s' %
982 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000983
msb@chromium.org786fb682010-06-02 15:16:23 +0000984 def _IsRebasing(self):
985 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
986 # have a plumbing command to determine whether a rebase is in progress, so
987 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
988 g = os.path.join(self.checkout_path, '.git')
989 return (
990 os.path.isdir(os.path.join(g, "rebase-merge")) or
991 os.path.isdir(os.path.join(g, "rebase-apply")))
992
993 def _CheckClean(self, rev_str):
994 # Make sure the tree is clean; see git-rebase.sh for reference
995 try:
996 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000997 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000998 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000999 raise gclient_utils.Error('\n____ %s%s\n'
1000 '\tYou have unstaged changes.\n'
1001 '\tPlease commit, stash, or reset.\n'
1002 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001003 try:
1004 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001005 '--ignore-submodules', 'HEAD', '--'],
1006 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001007 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001008 raise gclient_utils.Error('\n____ %s%s\n'
1009 '\tYour index contains uncommitted changes\n'
1010 '\tPlease commit, stash, or reset.\n'
1011 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +00001012
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001013 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +00001014 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
1015 # reference by a commit). If not, error out -- most likely a rebase is
1016 # in progress, try to detect so we can give a better error.
1017 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +00001018 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
1019 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001020 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001021 # Commit is not contained by any rev. See if the user is rebasing:
1022 if self._IsRebasing():
1023 # Punt to the user
1024 raise gclient_utils.Error('\n____ %s%s\n'
1025 '\tAlready in a conflict, i.e. (no branch).\n'
1026 '\tFix the conflict and run gclient again.\n'
1027 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1028 '\tSee man git-rebase for details.\n'
1029 % (self.relpath, rev_str))
1030 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001031 name = ('saved-by-gclient-' +
1032 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001033 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001034 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001035 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001036
msb@chromium.org5bde4852009-12-14 16:47:12 +00001037 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001038 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001039 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001040 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001041 return None
1042 return branch
1043
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001044 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001045 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +00001046 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +00001047 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001048 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001049
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001050 def _UpdateBranchHeads(self, options, fetch=False):
1051 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1052 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001053 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001054 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1055 '^\\+refs/branch-heads/\\*:.*$']
1056 self._Run(config_cmd, options)
1057 if fetch:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001058 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001059 if options.verbose:
1060 fetch_cmd.append('--verbose')
1061 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001062
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001063 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001064 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001065 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001066 if git_filter:
scottmg@chromium.orgf547c802013-09-27 17:55:26 +00001067 kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001068 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001069 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +00001070 # By default, git will use an interactive terminal prompt when a username/
1071 # password is needed. That shouldn't happen in the chromium workflow,
1072 # and if it does, then gclient may hide the prompt in the midst of a flood
1073 # of terminal spew. The only indication that something has gone wrong
1074 # will be when gclient hangs unresponsively. Instead, we disable the
1075 # password prompt and simply allow git to fail noisily. The error
1076 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001077 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1078 env.setdefault('GIT_ASKPASS', 'true')
1079 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001080 else:
1081 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +00001082 stdout = kwargs.get('stdout', sys.stdout)
1083 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
1084 ' '.join(args), kwargs['cwd']))
1085 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001086
1087
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001088class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001089 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001090 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001091
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001092 @staticmethod
1093 def BinaryExists():
1094 """Returns true if the command exists."""
1095 try:
1096 result, version = scm.SVN.AssertVersion('1.4')
1097 if not result:
1098 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1099 return result
1100 except OSError:
1101 return False
1102
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001103 def GetCheckoutRoot(self):
1104 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1105
floitsch@google.comeaab7842011-04-28 09:07:58 +00001106 def GetRevisionDate(self, revision):
1107 """Returns the given revision's date in ISO-8601 format (which contains the
1108 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001109 date = scm.SVN.Capture(
1110 ['propget', '--revprop', 'svn:date', '-r', revision],
1111 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001112 return date.strip()
1113
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001114 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001115 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001116 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001117
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001118 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001119 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001120 if not os.path.isdir(self.checkout_path):
1121 raise gclient_utils.Error('Directory %s is not present.' %
1122 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001123 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001124
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001125 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001126 """Generates a patch file which can be applied to the root of the
1127 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001128 if not os.path.isdir(self.checkout_path):
1129 raise gclient_utils.Error('Directory %s is not present.' %
1130 self.checkout_path)
1131 gclient_utils.CheckCallAndFilter(
1132 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1133 cwd=self.checkout_path,
1134 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001135 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001136
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001137 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001138 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001139
1140 All updated files will be appended to file_list.
1141
1142 Raises:
1143 Error: if can't get URL for relative path.
1144 """
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001145 # Only update if git or hg is not controlling the directory.
1146 git_path = os.path.join(self.checkout_path, '.git')
1147 if os.path.exists(git_path):
1148 print('________ found .git directory; skipping %s' % self.relpath)
1149 return
thakis@chromium.org0a0e3102014-01-17 16:57:09 +00001150
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001151 hg_path = os.path.join(self.checkout_path, '.hg')
1152 if os.path.exists(hg_path):
1153 print('________ found .hg directory; skipping %s' % self.relpath)
thakis@chromium.org0a0e3102014-01-17 16:57:09 +00001154 return
1155
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001156 if args:
1157 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1158
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001159 # revision is the revision to match. It is None if no revision is specified,
1160 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001161 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001162 # Keep the original unpinned url for reference in case the repo is switched.
1163 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001164 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001165 if options.revision:
1166 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001167 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001168 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001169 if revision != 'unmanaged':
1170 forced_revision = True
1171 # Reconstruct the url.
1172 url = '%s@%s' % (url, revision)
1173 rev_str = ' at %s' % revision
1174 else:
1175 managed = False
1176 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001177 else:
1178 forced_revision = False
1179 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001180
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001181 # Get the existing scm url and the revision number of the current checkout.
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001182 exists = os.path.exists(self.checkout_path)
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001183 if exists and managed:
1184 try:
1185 from_info = scm.SVN.CaptureLocalInfo(
1186 [], os.path.join(self.checkout_path, '.'))
1187 except (gclient_utils.Error, subprocess2.CalledProcessError):
1188 if options.reset and options.delete_unversioned_trees:
1189 print 'Removing troublesome path %s' % self.checkout_path
1190 gclient_utils.rmtree(self.checkout_path)
1191 exists = False
1192 else:
1193 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1194 'present. Delete the directory and try again.')
1195 raise gclient_utils.Error(msg % self.checkout_path)
1196
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001197 BASE_URLS = {
1198 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1199 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1200 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001201 WHITELISTED_ROOTS = [
1202 'svn://svn.chromium.org',
1203 'svn://svn-mirror.golo.chromium.org',
1204 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001205 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001206 try:
1207 # Split out the revision number since it's not useful for us.
1208 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001209 # Check to see if we're on a whitelisted root. We do this because
1210 # only some svn servers have matching UUIDs.
1211 local_parsed = urlparse.urlparse(url)
1212 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001213 if ('CHROME_HEADLESS' in os.environ
1214 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001215 and base_path in BASE_URLS
1216 and local_root in WHITELISTED_ROOTS):
1217
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001218 # Use a tarball for initial sync if we are on a bot.
1219 # Get an unauthenticated gsutil instance.
1220 gsutil = download_from_google_storage.Gsutil(
1221 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1222
1223 gs_path = BASE_URLS[base_path]
1224 _, out, _ = gsutil.check_call('ls', gs_path)
1225 # So that we can get the most recent revision.
1226 sorted_items = sorted(out.splitlines())
1227 latest_checkout = sorted_items[-1]
1228
1229 tempdir = tempfile.mkdtemp()
1230 print 'Downloading %s...' % latest_checkout
1231 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1232 if code:
1233 print '%s\n%s' % (out, err)
1234 raise Exception()
1235 filename = latest_checkout.split('/')[-1]
1236 tarball = os.path.join(tempdir, filename)
1237 print 'Unpacking into %s...' % self.checkout_path
1238 gclient_utils.safe_makedirs(self.checkout_path)
1239 # TODO(hinoka): Use 7z for windows.
1240 cmd = ['tar', '--extract', '--ungzip',
1241 '--directory', self.checkout_path,
1242 '--file', tarball]
1243 gclient_utils.CheckCallAndFilter(
1244 cmd, stdout=sys.stdout, print_stdout=True)
1245
1246 print 'Deleting temp file'
1247 gclient_utils.rmtree(tempdir)
1248
1249 # Rewrite the repository root to match.
1250 tarball_url = scm.SVN.CaptureLocalInfo(
1251 ['.'], self.checkout_path)['Repository Root']
1252 tarball_parsed = urlparse.urlparse(tarball_url)
1253 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1254 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001255
1256 if tarball_root != local_root:
1257 print 'Switching repository root to %s' % local_root
1258 self._Run(['switch', '--relocate', tarball_root,
1259 local_root, self.checkout_path],
1260 options)
1261 except Exception as e:
1262 print 'We tried to get a source tarball but failed.'
1263 print 'Resuming normal operations.'
1264 print str(e)
1265
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001266 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001267 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001268 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001269 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001270 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001271 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001272
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001273 if not managed:
1274 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001275 return self.Svnversion()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001276
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001277 if 'URL' not in from_info:
1278 raise gclient_utils.Error(
1279 ('gclient is confused. Couldn\'t get the url for %s.\n'
1280 'Try using @unmanaged.\n%s') % (
1281 self.checkout_path, from_info))
1282
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001283 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001284 dir_info = scm.SVN.CaptureStatus(
1285 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001286 if any(d[0][2] == 'L' for d in dir_info):
1287 try:
1288 self._Run(['cleanup', self.checkout_path], options)
1289 except subprocess2.CalledProcessError, e:
1290 # Get the status again, svn cleanup may have cleaned up at least
1291 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001292 dir_info = scm.SVN.CaptureStatus(
1293 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001294
1295 # Try to fix the failures by removing troublesome files.
1296 for d in dir_info:
1297 if d[0][2] == 'L':
1298 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001299 # We don't pass any files/directories to CaptureStatus and set
1300 # cwd=self.checkout_path, so we should get relative paths here.
1301 assert not os.path.isabs(d[1])
1302 path_to_remove = os.path.normpath(
1303 os.path.join(self.checkout_path, d[1]))
1304 print 'Removing troublesome path %s' % path_to_remove
1305 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001306 else:
1307 print 'Not removing troublesome path %s automatically.' % d[1]
1308 if d[0][0] == '!':
1309 print 'You can pass --force to enable automatic removal.'
1310 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001311
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001312 # Retrieve the current HEAD version because svn is slow at null updates.
1313 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001314 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001315 revision = str(from_info_live['Revision'])
1316 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001317
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001318 if from_info['URL'] != base_url:
1319 # The repository url changed, need to switch.
1320 try:
1321 to_info = scm.SVN.CaptureRemoteInfo(url)
1322 except (gclient_utils.Error, subprocess2.CalledProcessError):
1323 # The url is invalid or the server is not accessible, it's safer to bail
1324 # out right now.
1325 raise gclient_utils.Error('This url is unreachable: %s' % url)
1326 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1327 and (from_info['UUID'] == to_info['UUID']))
1328 if can_switch:
1329 print('\n_____ relocating %s to a new checkout' % self.relpath)
1330 # We have different roots, so check if we can switch --relocate.
1331 # Subversion only permits this if the repository UUIDs match.
1332 # Perform the switch --relocate, then rewrite the from_url
1333 # to reflect where we "are now." (This is the same way that
1334 # Subversion itself handles the metadata when switch --relocate
1335 # is used.) This makes the checks below for whether we
1336 # can update to a revision or have to switch to a different
1337 # branch work as expected.
1338 # TODO(maruel): TEST ME !
1339 command = ['switch', '--relocate',
1340 from_info['Repository Root'],
1341 to_info['Repository Root'],
1342 self.relpath]
1343 self._Run(command, options, cwd=self._root_dir)
1344 from_info['URL'] = from_info['URL'].replace(
1345 from_info['Repository Root'],
1346 to_info['Repository Root'])
1347 else:
1348 if not options.force and not options.reset:
1349 # Look for local modifications but ignore unversioned files.
1350 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1351 if status[0][0] != '?':
1352 raise gclient_utils.Error(
1353 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1354 'there is local changes in %s. Delete the directory and '
1355 'try again.') % (url, self.checkout_path))
1356 # Ok delete it.
1357 print('\n_____ switching %s to a new checkout' % self.relpath)
1358 gclient_utils.rmtree(self.checkout_path)
1359 # We need to checkout.
1360 command = ['checkout', url, self.checkout_path]
1361 command = self._AddAdditionalUpdateFlags(command, options, revision)
1362 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1363 return self.Svnversion()
1364
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001365 # If the provided url has a revision number that matches the revision
1366 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001367 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001368 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001369 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001370 else:
1371 command = ['update', self.checkout_path]
1372 command = self._AddAdditionalUpdateFlags(command, options, revision)
1373 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001374
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001375 # If --reset and --delete_unversioned_trees are specified, remove any
1376 # untracked files and directories.
1377 if options.reset and options.delete_unversioned_trees:
1378 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1379 full_path = os.path.join(self.checkout_path, status[1])
1380 if (status[0][0] == '?'
1381 and os.path.isdir(full_path)
1382 and not os.path.islink(full_path)):
1383 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001384 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001385 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001386
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001387 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001388 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001389 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001390 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001391 # Create an empty checkout and then update the one file we want. Future
1392 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001393 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001394 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001395 if os.path.exists(os.path.join(self.checkout_path, filename)):
1396 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001397 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001398 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001399 # After the initial checkout, we can use update as if it were any other
1400 # dep.
1401 self.update(options, args, file_list)
1402 else:
1403 # If the installed version of SVN doesn't support --depth, fallback to
1404 # just exporting the file. This has the downside that revision
1405 # information is not stored next to the file, so we will have to
1406 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001407 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001408 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001409 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001410 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001411 command = self._AddAdditionalUpdateFlags(command, options,
1412 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001413 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001414
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001415 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001416 """Reverts local modifications. Subversion specific.
1417
1418 All reverted files will be appended to file_list, even if Subversion
1419 doesn't know about them.
1420 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001421 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001422 if os.path.exists(self.checkout_path):
1423 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001424 # svn revert won't work if the directory doesn't exist. It needs to
1425 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001426 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001427 # Don't reuse the args.
1428 return self.update(options, [], file_list)
1429
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001430 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001431 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1432 print('________ found .git directory; skipping %s' % self.relpath)
1433 return
1434 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1435 print('________ found .hg directory; skipping %s' % self.relpath)
thakis@chromium.org0a0e3102014-01-17 16:57:09 +00001436 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001437 if not options.force:
1438 raise gclient_utils.Error('Invalid checkout path, aborting')
1439 print(
1440 '\n_____ %s is not a valid svn checkout, synching instead' %
1441 self.relpath)
1442 gclient_utils.rmtree(self.checkout_path)
1443 # Don't reuse the args.
1444 return self.update(options, [], file_list)
1445
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001446 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001447 if file_list is not None:
1448 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001449 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001450 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001451 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001452 print(os.path.join(self.checkout_path, file_status[1]))
1453 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001454
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001455 # Revert() may delete the directory altogether.
1456 if not os.path.isdir(self.checkout_path):
1457 # Don't reuse the args.
1458 return self.update(options, [], file_list)
1459
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001460 try:
1461 # svn revert is so broken we don't even use it. Using
1462 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001463 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001464 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1465 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001466 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001467 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001468 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001469
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001470 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001471 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001472 try:
1473 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001474 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001475 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001476
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001477 def runhooks(self, options, args, file_list):
1478 self.status(options, args, file_list)
1479
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001480 def status(self, options, args, file_list):
1481 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001482 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001483 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001484 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001485 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1486 'The directory does not exist.') %
1487 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001488 # There's no file list to retrieve.
1489 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001490 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001491
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001492 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001493 """Verifies the validity of the revision for this repository."""
1494 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1495 raise gclient_utils.Error(
1496 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1497 'correct.') % rev)
1498 return rev
1499
msb@chromium.orge6f78352010-01-13 17:05:33 +00001500 def FullUrlForRelativeUrl(self, url):
1501 # Find the forth '/' and strip from there. A bit hackish.
1502 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001503
maruel@chromium.org669600d2010-09-01 19:06:31 +00001504 def _Run(self, args, options, **kwargs):
1505 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001506 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001507 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001508 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001509
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001510 def Svnversion(self):
1511 """Runs the lowest checked out revision in the current project."""
1512 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1513 return info['Revision']
1514
maruel@chromium.org669600d2010-09-01 19:06:31 +00001515 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1516 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001517 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001518 scm.SVN.RunAndGetFileList(
1519 options.verbose,
1520 args + ['--ignore-externals'],
1521 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001522 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001523
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001524 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001525 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001526 """Add additional flags to command depending on what options are set.
1527 command should be a list of strings that represents an svn command.
1528
1529 This method returns a new list to be used as a command."""
1530 new_command = command[:]
1531 if revision:
1532 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001533 # We don't want interaction when jobs are used.
1534 if options.jobs > 1:
1535 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001536 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001537 # --accept was added to 'svn update' in svn 1.6.
1538 if not scm.SVN.AssertVersion('1.5')[0]:
1539 return new_command
1540
1541 # It's annoying to have it block in the middle of a sync, just sensible
1542 # defaults.
1543 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001544 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001545 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1546 new_command.extend(('--accept', 'theirs-conflict'))
1547 elif options.manually_grab_svn_rev:
1548 new_command.append('--force')
1549 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1550 new_command.extend(('--accept', 'postpone'))
1551 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1552 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001553 return new_command