blob: 8572f094a38befc1f5741b235b3d03f8ca51c1ff [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',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000258 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000259 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000260 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000261 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000262 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000263 kwargs = {'cwd': self.checkout_path,
264 'print_stdout': False,
265 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000266 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000267 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
268 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000269 except subprocess2.CalledProcessError:
270 # Not a fatal error, or even very interesting in a non-git-submodule
271 # world. So just keep it quiet.
272 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000273 try:
274 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
275 except subprocess2.CalledProcessError:
276 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000277
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000278 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
279
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000280 def _FetchAndReset(self, revision, file_list, options):
281 """Equivalent to git fetch; git reset."""
282 quiet = []
283 if not options.verbose:
284 quiet = ['--quiet']
285 self._UpdateBranchHeads(options, fetch=False)
iannucci@chromium.orgb8376882013-07-01 20:08:10 +0000286
287 fetch_cmd = [
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000288 '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote, '--prune']
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000289 self._Run(fetch_cmd + quiet, options, retry=True)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000290 self._Run(['reset', '--hard', revision] + quiet, options)
291 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000292 if file_list is not None:
293 files = self._Capture(['ls-files']).splitlines()
294 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000295
msb@chromium.orge28e4982009-09-25 20:51:45 +0000296 def update(self, options, args, file_list):
297 """Runs git to update or transparently checkout the working copy.
298
299 All updated files will be appended to file_list.
300
301 Raises:
302 Error: if can't get URL for relative path.
303 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000304 if args:
305 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
306
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000307 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000308
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000309 # If a dependency is not pinned, track the default remote branch.
310 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000311 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000312 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000313 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000314 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000315 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000316 # Override the revision number.
317 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000318 if revision == 'unmanaged':
319 revision = None
320 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000321 if not revision:
322 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000323
floitsch@google.comeaab7842011-04-28 09:07:58 +0000324 if gclient_utils.IsDateRevision(revision):
325 # Date-revisions only work on git-repositories if the reflog hasn't
326 # expired yet. Use rev-list to get the corresponding revision.
327 # git rev-list -n 1 --before='time-stamp' branchname
328 if options.transitive:
329 print('Warning: --transitive only works for SVN repositories.')
330 revision = default_rev
331
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000332 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000333 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000334
335 printed_path = False
336 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000337 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000338 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000339 verbose = ['--verbose']
340 printed_path = True
341
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000342 url = self._CreateOrUpdateCache(url, options)
343
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000344 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000345 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000346 elif revision.startswith(self.remote + '/'):
347 # For compatibility with old naming, translate 'origin' to 'refs/heads'
348 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000349 rev_type = "branch"
350 else:
351 # hash is also a tag, only make a distinction at checkout
352 rev_type = "hash"
353
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000354 if (not os.path.exists(self.checkout_path) or
355 (os.path.isdir(self.checkout_path) and
356 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000357 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000358 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000359 if file_list is not None:
360 files = self._Capture(['ls-files']).splitlines()
361 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000362 if not verbose:
363 # Make the output a little prettier. It's nice to have some whitespace
364 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000365 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000366 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000367
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000368 if not managed:
mmoss@chromium.org96833fa2013-04-17 03:26:37 +0000369 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgf5cc4272012-06-21 22:38:07 +0000370 self.UpdateSubmoduleConfig()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000371 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000372 return self._Capture(['rev-parse', '--verify', 'HEAD'])
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000373
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000374 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
375 raise gclient_utils.Error('\n____ %s%s\n'
376 '\tPath is not a git repo. No .git dir.\n'
377 '\tTo resolve:\n'
378 '\t\trm -rf %s\n'
379 '\tAnd run gclient sync again\n'
380 % (self.relpath, rev_str, self.relpath))
381
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000382 # See if the url has changed (the unittests use git://foo for the url, let
383 # that through).
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000384 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000385 return_early = False
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000386 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
387 # unit test pass. (and update the comment above)
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000388 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
389 # This allows devs to use experimental repos which have a different url
390 # but whose branch(s) are the same as official repos.
391 if (current_url != url and
392 url != 'git://foo' and
393 subprocess2.capture(
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000394 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000395 cwd=self.checkout_path).strip() != 'False'):
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000396 print('_____ switching %s to a new upstream' % self.relpath)
397 # Make sure it's clean
398 self._CheckClean(rev_str)
399 # Switch over to the new upstream
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000400 self._Run(['remote', 'set-url', self.remote, url], options)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000401 self._FetchAndReset(revision, file_list, options)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000402 return_early = True
403
404 # Need to do this in the normal path as well as in the post-remote-switch
405 # path.
406 self._PossiblySwitchCache(url, options)
407
408 if return_early:
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000409 return self._Capture(['rev-parse', '--verify', 'HEAD'])
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000410
msb@chromium.org5bde4852009-12-14 16:47:12 +0000411 cur_branch = self._GetCurrentBranch()
412
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000413 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000414 # 0) HEAD is detached. Probably from our initial clone.
415 # - make sure HEAD is contained by a named ref, then update.
416 # Cases 1-4. HEAD is a branch.
417 # 1) current branch is not tracking a remote branch (could be git-svn)
418 # - try to rebase onto the new hash or branch
419 # 2) current branch is tracking a remote branch with local committed
420 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000421 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000422 # 3) current branch is tracking a remote branch w/or w/out changes,
423 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000424 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000425 # 4) current branch is tracking a remote branch, switches to a different
426 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000427 # - exit
428
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000429 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
430 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000431 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
432 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000433 if cur_branch is None:
434 upstream_branch = None
435 current_type = "detached"
436 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000437 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000438 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
439 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
440 current_type = "hash"
441 logging.debug("Current branch is not tracking an upstream (remote)"
442 " branch.")
443 elif upstream_branch.startswith('refs/remotes'):
444 current_type = "branch"
445 else:
446 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000447
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000448 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000449 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000450 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000451 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000452 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000453 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000454
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000455 self._UpdateBranchHeads(options, fetch=True)
456
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000457 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000458 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000459 target = 'HEAD'
460 if options.upstream and upstream_branch:
461 target = upstream_branch
462 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000463
msb@chromium.org786fb682010-06-02 15:16:23 +0000464 if current_type == 'detached':
465 # case 0
466 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000467 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000468 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000469 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000470 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000471 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000472 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000473 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000475 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 newbase=revision, printed_path=printed_path)
477 printed_path = True
478 else:
479 # Can't find a merge-base since we don't know our upstream. That makes
480 # this command VERY likely to produce a rebase failure. For now we
481 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000482 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000483 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000484 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000485 self._AttemptRebase(upstream_branch, files, options,
486 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000487 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000488 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000489 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000490 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000491 newbase=revision, printed_path=printed_path)
492 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000493 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000494 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000495 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000497 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 switch_error = ("Switching upstream branch from %s to %s\n"
499 % (upstream_branch, new_base) +
500 "Please merge or rebase manually:\n" +
501 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
502 "OR git checkout -b <some new branch> %s" % new_base)
503 raise gclient_utils.Error(switch_error)
504 else:
505 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000506 if files is not None:
507 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000508 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000509 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000511 merge_args = ['merge']
512 if not options.merge:
513 merge_args.append('--ff-only')
514 merge_args.append(upstream_branch)
515 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000516 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000517 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
518 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000519 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000520 printed_path = True
521 while True:
522 try:
maruel@chromium.org90541732011-04-01 17:54:18 +0000523 action = ask_for_data(
524 'Cannot fast-forward merge, attempt to rebase? '
bratell@opera.com18fa4542013-05-21 13:30:46 +0000525 '(y)es / (q)uit / (s)kip : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000526 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000527 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000528 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000529 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000530 printed_path=printed_path)
531 printed_path = True
532 break
533 elif re.match(r'quit|q', action, re.I):
534 raise gclient_utils.Error("Can't fast-forward, please merge or "
535 "rebase manually.\n"
536 "cd %s && git " % self.checkout_path
537 + "rebase %s" % upstream_branch)
538 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000539 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000540 return
541 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000542 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000543 elif re.match("error: Your local changes to '.*' would be "
544 "overwritten by merge. Aborting.\nPlease, commit your "
545 "changes or stash them before you can merge.\n",
546 e.stderr):
547 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000548 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000549 printed_path = True
550 raise gclient_utils.Error(e.stderr)
551 else:
552 # Some other problem happened with the merge
553 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000554 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000555 raise
556 else:
557 # Fast-forward merge was successful
558 if not re.match('Already up-to-date.', merge_output) or verbose:
559 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000560 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000561 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000562 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000563 if not verbose:
564 # Make the output a little prettier. It's nice to have some
565 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000566 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000567
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000568 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000569 if file_list is not None:
570 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000571
572 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000573 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000574 raise gclient_utils.Error('\n____ %s%s\n'
575 '\nConflict while rebasing this branch.\n'
576 'Fix the conflict and run gclient again.\n'
577 'See man git-rebase for details.\n'
578 % (self.relpath, rev_str))
579
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000580 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000581 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000582
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000583 # If --reset and --delete_unversioned_trees are specified, remove any
584 # untracked directories.
585 if options.reset and options.delete_unversioned_trees:
586 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
587 # merge-base by default), so doesn't include untracked files. So we use
588 # 'git ls-files --directory --others --exclude-standard' here directly.
589 paths = scm.GIT.Capture(
590 ['ls-files', '--directory', '--others', '--exclude-standard'],
591 self.checkout_path)
592 for path in (p for p in paths.splitlines() if p.endswith('/')):
593 full_path = os.path.join(self.checkout_path, path)
594 if not os.path.islink(full_path):
595 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000596 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000597
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000598 return self._Capture(['rev-parse', '--verify', 'HEAD'])
599
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000600
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000601 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000602 """Reverts local modifications.
603
604 All reverted files will be appended to file_list.
605 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000606 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000607 # revert won't work if the directory doesn't exist. It needs to
608 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000609 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000610 # Don't reuse the args.
611 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000612
613 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000614 if options.upstream:
615 if self._GetCurrentBranch():
616 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
617 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000618 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000619 if not deps_revision:
620 deps_revision = default_rev
621 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000622 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000623
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000624 if file_list is not None:
625 files = self._Capture(['diff', deps_revision, '--name-only']).split()
626
maruel@chromium.org37e89872010-09-07 16:11:33 +0000627 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000628 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000629
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000630 if file_list is not None:
631 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
632
633 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000634 """Returns revision"""
635 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000636
msb@chromium.orge28e4982009-09-25 20:51:45 +0000637 def runhooks(self, options, args, file_list):
638 self.status(options, args, file_list)
639
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000640 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000641 """Display status information."""
642 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000643 print(('\n________ couldn\'t run status in %s:\n'
644 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000645 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000646 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000647 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000648 if file_list is not None:
649 files = self._Capture(['diff', '--name-only', merge_base]).split()
650 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000651
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000652 def GetUsableRev(self, rev, options):
653 """Finds a useful revision for this repository.
654
655 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
656 will be called on the source."""
657 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000658 if not os.path.isdir(self.checkout_path):
659 raise gclient_utils.Error(
660 ( 'We could not find a valid hash for safesync_url response "%s".\n'
661 'Safesync URLs with a git checkout currently require the repo to\n'
662 'be cloned without a safesync_url before adding the safesync_url.\n'
663 'For more info, see: '
664 'http://code.google.com/p/chromium/wiki/UsingNewGit'
665 '#Initial_checkout' ) % rev)
666 elif rev.isdigit() and len(rev) < 7:
667 # Handles an SVN rev. As an optimization, only verify an SVN revision as
668 # [0-9]{1,6} for now to avoid making a network request.
669 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000670 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
671 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000672 try:
673 logging.debug('Looking for git-svn configuration optimizations.')
674 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
675 cwd=self.checkout_path):
676 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
677 except subprocess2.CalledProcessError:
678 logging.debug('git config --get svn-remote.svn.fetch failed, '
679 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000680 if options.verbose:
681 print('Running git svn fetch. This might take a while.\n')
682 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000683 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000684 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
685 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000686 except gclient_utils.Error, e:
687 sha1 = e.message
688 print('\nWarning: Could not find a git revision with accurate\n'
689 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
690 'the closest sane git revision, which is:\n'
691 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000692 if not sha1:
693 raise gclient_utils.Error(
694 ( 'It appears that either your git-svn remote is incorrectly\n'
695 'configured or the revision in your safesync_url is\n'
696 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
697 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000698 else:
699 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
700 sha1 = rev
701 else:
702 # May exist in origin, but we don't have it yet, so fetch and look
703 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000704 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000705 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
706 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000707
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000708 if not sha1:
709 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000710 ( 'We could not find a valid hash for safesync_url response "%s".\n'
711 'Safesync URLs with a git checkout currently require a git-svn\n'
712 'remote or a safesync_url that provides git sha1s. Please add a\n'
713 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000714 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000715 '#Initial_checkout' ) % rev)
716
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000717 return sha1
718
msb@chromium.orge6f78352010-01-13 17:05:33 +0000719 def FullUrlForRelativeUrl(self, url):
720 # Strip from last '/'
721 # Equivalent to unix basename
722 base_url = self.url
723 return base_url[:base_url.rfind('/')] + url
724
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000725 @staticmethod
726 def _NormalizeGitURL(url):
727 '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
728 idx = url.find('://')
729 if idx != -1:
730 url = url[idx+3:]
731 if not url.endswith('.git'):
732 url += '.git'
733 return url
734
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000735 def _PossiblySwitchCache(self, url, options):
736 """Handles switching a repo from with-cache to direct, or vice versa.
737
738 When we go from direct to with-cache, the remote url changes from the
739 'real' url to the local file url (in cache_dir). Therefore, this function
740 assumes that |url| points to the correctly-switched-over local file url, if
741 we're in cache_mode.
742
743 When we go from with-cache to direct, assume that the normal url-switching
744 code already flipped the remote over, and we just need to repack and break
745 the dependency to the cache.
746 """
747
748 altfile = os.path.join(
749 self.checkout_path, '.git', 'objects', 'info', 'alternates')
750 if self.cache_dir:
751 if not os.path.exists(altfile):
752 try:
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000753 with open(altfile, 'w') as f:
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000754 f.write(os.path.join(url, 'objects'))
755 # pylint: disable=C0301
756 # This dance is necessary according to emperical evidence, also at:
757 # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
758 self._Run(['repack', '-ad'], options)
759 self._Run(['repack', '-adl'], options)
760 except Exception:
761 # If something goes wrong, try to remove the altfile so we'll go down
762 # this path again next time.
763 try:
764 os.remove(altfile)
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000765 except OSError as e:
766 print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000767 raise
768 else:
769 if os.path.exists(altfile):
770 self._Run(['repack', '-a'], options)
771 os.remove(altfile)
772
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000773 def _CreateOrUpdateCache(self, url, options):
774 """Make a new git mirror or update existing mirror for |url|, and return the
775 mirror URI to clone from.
776
777 If no cache-dir is specified, just return |url| unchanged.
778 """
779 if not self.cache_dir:
780 return url
781
782 # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
783 folder = os.path.join(
784 self.cache_dir,
785 self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000786 altfile = os.path.join(folder, 'objects', 'info', 'alternates')
787
788 # If we're bringing an old cache up to date or cloning a new cache, and the
789 # existing repo is currently a direct clone, use its objects to help out
790 # the fetch here.
791 checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
792 checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
793 use_reference = (
794 os.path.exists(checkout_objects) and
795 not os.path.exists(checkout_altfile))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000796
797 v = ['-v'] if options.verbose else []
798 filter_fn = lambda l: '[up to date]' not in l
799 with self.cache_locks[folder]:
800 gclient_utils.safe_makedirs(self.cache_dir)
801 if not os.path.exists(os.path.join(folder, 'config')):
802 gclient_utils.rmtree(folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000803 cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
804 '--progress', '--mirror']
805
806 if use_reference:
807 cmd += ['--reference', os.path.abspath(self.checkout_path)]
808
809 self._Run(cmd + [url, folder],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000810 options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000811 else:
812 # For now, assert that host/path/to/repo.git is identical. We may want
813 # to relax this restriction in the future to allow for smarter cache
814 # repo update schemes (such as pulling the same repo, but from a
815 # different host).
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000816 existing_url = self._Capture(['config', 'remote.%s.url' % self.remote],
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000817 cwd=folder)
818 assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
819
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000820 if use_reference:
821 with open(altfile, 'w') as f:
822 f.write(os.path.abspath(checkout_objects))
823
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000824 # Would normally use `git remote update`, but it doesn't support
825 # --progress, so use fetch instead.
826 self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000827 options, filter_fn=filter_fn, cwd=folder, retry=True)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000828
829 # If the clone has an object dependency on the existing repo, break it
830 # with repack and remove the linkage.
831 if os.path.exists(altfile):
832 self._Run(['repack', '-a'], options, cwd=folder)
833 os.remove(altfile)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000834 return folder
835
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000836 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000837 """Clone a git repository from the given URL.
838
msb@chromium.org786fb682010-06-02 15:16:23 +0000839 Once we've cloned the repo, we checkout a working branch if the specified
840 revision is a branch head. If it is a tag or a specific commit, then we
841 leave HEAD detached as it makes future updates simpler -- in this case the
842 user should first create a new branch or switch to an existing branch before
843 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000844 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000845 # git clone doesn't seem to insert a newline properly before printing
846 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000847 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000848 template_path = os.path.join(
849 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000850 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
851 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000852 if self.cache_dir:
853 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000854 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000855 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000856 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000857 # If the parent directory does not exist, Git clone on Windows will not
858 # create it, so we need to do it manually.
859 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000860 gclient_utils.safe_makedirs(parent_dir)
861 tmp_dir = tempfile.mkdtemp(
862 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
863 dir=parent_dir)
864 try:
865 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000866 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000867 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000868 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
869 os.path.join(self.checkout_path, '.git'))
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
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000886 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000887 branch=None, printed_path=False):
888 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000889 if files is not None:
890 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000891 revision = upstream
892 if newbase:
893 revision = newbase
894 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000895 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000896 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000897 printed_path = True
898 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000899 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000900
901 # Build the rebase command here using the args
902 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
903 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000904 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000905 rebase_cmd.append('--verbose')
906 if newbase:
907 rebase_cmd.extend(['--onto', newbase])
908 rebase_cmd.append(upstream)
909 if branch:
910 rebase_cmd.append(branch)
911
912 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000913 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000914 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000915 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
916 re.match(r'cannot rebase: your index contains uncommitted changes',
917 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000918 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000919 rebase_action = ask_for_data(
920 'Cannot rebase because of unstaged changes.\n'
921 '\'git reset --hard HEAD\' ?\n'
922 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000923 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000924 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000925 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000926 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000927 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000928 break
929 elif re.match(r'quit|q', rebase_action, re.I):
930 raise gclient_utils.Error("Please merge or rebase manually\n"
931 "cd %s && git " % self.checkout_path
932 + "%s" % ' '.join(rebase_cmd))
933 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000934 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000935 continue
936 else:
937 gclient_utils.Error("Input not recognized")
938 continue
939 elif re.search(r'^CONFLICT', e.stdout, re.M):
940 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
941 "Fix the conflict and run gclient again.\n"
942 "See 'man git-rebase' for details.\n")
943 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000944 print(e.stdout.strip())
945 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000946 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
947 "manually.\ncd %s && git " %
948 self.checkout_path
949 + "%s" % ' '.join(rebase_cmd))
950
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000951 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000952 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000953 # Make the output a little prettier. It's nice to have some
954 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000955 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000956
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000957 @staticmethod
958 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000959 (ok, current_version) = scm.GIT.AssertVersion(min_version)
960 if not ok:
961 raise gclient_utils.Error('git version %s < minimum required %s' %
962 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000963
msb@chromium.org786fb682010-06-02 15:16:23 +0000964 def _IsRebasing(self):
965 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
966 # have a plumbing command to determine whether a rebase is in progress, so
967 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
968 g = os.path.join(self.checkout_path, '.git')
969 return (
970 os.path.isdir(os.path.join(g, "rebase-merge")) or
971 os.path.isdir(os.path.join(g, "rebase-apply")))
972
973 def _CheckClean(self, rev_str):
974 # Make sure the tree is clean; see git-rebase.sh for reference
975 try:
976 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000977 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000978 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000979 raise gclient_utils.Error('\n____ %s%s\n'
980 '\tYou have unstaged changes.\n'
981 '\tPlease commit, stash, or reset.\n'
982 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000983 try:
984 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000985 '--ignore-submodules', 'HEAD', '--'],
986 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000987 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000988 raise gclient_utils.Error('\n____ %s%s\n'
989 '\tYour index contains uncommitted changes\n'
990 '\tPlease commit, stash, or reset.\n'
991 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000992
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000993 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000994 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
995 # reference by a commit). If not, error out -- most likely a rebase is
996 # in progress, try to detect so we can give a better error.
997 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000998 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
999 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001000 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +00001001 # Commit is not contained by any rev. See if the user is rebasing:
1002 if self._IsRebasing():
1003 # Punt to the user
1004 raise gclient_utils.Error('\n____ %s%s\n'
1005 '\tAlready in a conflict, i.e. (no branch).\n'
1006 '\tFix the conflict and run gclient again.\n'
1007 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1008 '\tSee man git-rebase for details.\n'
1009 % (self.relpath, rev_str))
1010 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001011 name = ('saved-by-gclient-' +
1012 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001013 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001014 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001015 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001016
msb@chromium.org5bde4852009-12-14 16:47:12 +00001017 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001018 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001019 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001020 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001021 return None
1022 return branch
1023
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001024 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001025 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +00001026 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +00001027 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001028 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001029
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001030 def _UpdateBranchHeads(self, options, fetch=False):
1031 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1032 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001033 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001034 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1035 '^\\+refs/branch-heads/\\*:.*$']
1036 self._Run(config_cmd, options)
1037 if fetch:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001038 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001039 if options.verbose:
1040 fetch_cmd.append('--verbose')
1041 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001042
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001043 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001044 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001045 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001046 if git_filter:
scottmg@chromium.orgf547c802013-09-27 17:55:26 +00001047 kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001048 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001049 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +00001050 # By default, git will use an interactive terminal prompt when a username/
1051 # password is needed. That shouldn't happen in the chromium workflow,
1052 # and if it does, then gclient may hide the prompt in the midst of a flood
1053 # of terminal spew. The only indication that something has gone wrong
1054 # will be when gclient hangs unresponsively. Instead, we disable the
1055 # password prompt and simply allow git to fail noisily. The error
1056 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001057 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1058 env.setdefault('GIT_ASKPASS', 'true')
1059 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001060 else:
1061 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +00001062 stdout = kwargs.get('stdout', sys.stdout)
1063 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
1064 ' '.join(args), kwargs['cwd']))
1065 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001066
1067
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001068class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001069 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001070 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001071
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001072 @staticmethod
1073 def BinaryExists():
1074 """Returns true if the command exists."""
1075 try:
1076 result, version = scm.SVN.AssertVersion('1.4')
1077 if not result:
1078 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1079 return result
1080 except OSError:
1081 return False
1082
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001083 def GetCheckoutRoot(self):
1084 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1085
floitsch@google.comeaab7842011-04-28 09:07:58 +00001086 def GetRevisionDate(self, revision):
1087 """Returns the given revision's date in ISO-8601 format (which contains the
1088 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001089 date = scm.SVN.Capture(
1090 ['propget', '--revprop', 'svn:date', '-r', revision],
1091 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001092 return date.strip()
1093
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001094 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001095 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001096 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001097
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001098 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001099 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001100 if not os.path.isdir(self.checkout_path):
1101 raise gclient_utils.Error('Directory %s is not present.' %
1102 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001103 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001104
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001105 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001106 """Generates a patch file which can be applied to the root of the
1107 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001108 if not os.path.isdir(self.checkout_path):
1109 raise gclient_utils.Error('Directory %s is not present.' %
1110 self.checkout_path)
1111 gclient_utils.CheckCallAndFilter(
1112 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1113 cwd=self.checkout_path,
1114 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001115 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001116
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001117 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001118 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001119
1120 All updated files will be appended to file_list.
1121
1122 Raises:
1123 Error: if can't get URL for relative path.
1124 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001125 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001126 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001127 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001128 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001129 return
1130
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001131 hg_path = os.path.join(self.checkout_path, '.hg')
1132 if os.path.exists(hg_path):
1133 print('________ found .hg directory; skipping %s' % self.relpath)
1134 return
1135
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001136 if args:
1137 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1138
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001139 # revision is the revision to match. It is None if no revision is specified,
1140 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001141 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001142 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001143 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001144 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001145 if options.revision:
1146 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001147 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001148 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001149 if revision != 'unmanaged':
1150 forced_revision = True
1151 # Reconstruct the url.
1152 url = '%s@%s' % (url, revision)
1153 rev_str = ' at %s' % revision
1154 else:
1155 managed = False
1156 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001157 else:
1158 forced_revision = False
1159 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001160
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001161 # Get the existing scm url and the revision number of the current checkout.
1162 exists = os.path.exists(self.checkout_path)
1163 if exists and managed:
1164 try:
1165 from_info = scm.SVN.CaptureLocalInfo(
1166 [], os.path.join(self.checkout_path, '.'))
1167 except (gclient_utils.Error, subprocess2.CalledProcessError):
1168 if options.reset and options.delete_unversioned_trees:
1169 print 'Removing troublesome path %s' % self.checkout_path
1170 gclient_utils.rmtree(self.checkout_path)
1171 exists = False
1172 else:
1173 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1174 'present. Delete the directory and try again.')
1175 raise gclient_utils.Error(msg % self.checkout_path)
1176
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001177 BASE_URLS = {
1178 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1179 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1180 }
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001181 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001182 try:
1183 # Split out the revision number since it's not useful for us.
1184 base_path = urlparse.urlparse(url).path.split('@')[0]
1185 if ('CHROME_HEADLESS' in os.environ
1186 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
1187 and base_path in BASE_URLS):
1188 # Use a tarball for initial sync if we are on a bot.
1189 # Get an unauthenticated gsutil instance.
1190 gsutil = download_from_google_storage.Gsutil(
1191 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1192
1193 gs_path = BASE_URLS[base_path]
1194 _, out, _ = gsutil.check_call('ls', gs_path)
1195 # So that we can get the most recent revision.
1196 sorted_items = sorted(out.splitlines())
1197 latest_checkout = sorted_items[-1]
1198
1199 tempdir = tempfile.mkdtemp()
1200 print 'Downloading %s...' % latest_checkout
1201 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1202 if code:
1203 print '%s\n%s' % (out, err)
1204 raise Exception()
1205 filename = latest_checkout.split('/')[-1]
1206 tarball = os.path.join(tempdir, filename)
1207 print 'Unpacking into %s...' % self.checkout_path
1208 gclient_utils.safe_makedirs(self.checkout_path)
1209 # TODO(hinoka): Use 7z for windows.
1210 cmd = ['tar', '--extract', '--ungzip',
1211 '--directory', self.checkout_path,
1212 '--file', tarball]
1213 gclient_utils.CheckCallAndFilter(
1214 cmd, stdout=sys.stdout, print_stdout=True)
1215
1216 print 'Deleting temp file'
1217 gclient_utils.rmtree(tempdir)
1218
1219 # Rewrite the repository root to match.
1220 tarball_url = scm.SVN.CaptureLocalInfo(
1221 ['.'], self.checkout_path)['Repository Root']
1222 tarball_parsed = urlparse.urlparse(tarball_url)
1223 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1224 tarball_parsed.netloc)
1225 local_parsed = urlparse.urlparse(url)
1226 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
1227
1228 if tarball_root != local_root:
1229 print 'Switching repository root to %s' % local_root
1230 self._Run(['switch', '--relocate', tarball_root,
1231 local_root, self.checkout_path],
1232 options)
1233 except Exception as e:
1234 print 'We tried to get a source tarball but failed.'
1235 print 'Resuming normal operations.'
1236 print str(e)
1237
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001238 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001239 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001240 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001241 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001242 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001243 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001244
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001245 if not managed:
1246 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001247 return self.Svnversion()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001248
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001249 if 'URL' not in from_info:
1250 raise gclient_utils.Error(
1251 ('gclient is confused. Couldn\'t get the url for %s.\n'
1252 'Try using @unmanaged.\n%s') % (
1253 self.checkout_path, from_info))
1254
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001255 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001256 dir_info = scm.SVN.CaptureStatus(
1257 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001258 if any(d[0][2] == 'L' for d in dir_info):
1259 try:
1260 self._Run(['cleanup', self.checkout_path], options)
1261 except subprocess2.CalledProcessError, e:
1262 # Get the status again, svn cleanup may have cleaned up at least
1263 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001264 dir_info = scm.SVN.CaptureStatus(
1265 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001266
1267 # Try to fix the failures by removing troublesome files.
1268 for d in dir_info:
1269 if d[0][2] == 'L':
1270 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001271 # We don't pass any files/directories to CaptureStatus and set
1272 # cwd=self.checkout_path, so we should get relative paths here.
1273 assert not os.path.isabs(d[1])
1274 path_to_remove = os.path.normpath(
1275 os.path.join(self.checkout_path, d[1]))
1276 print 'Removing troublesome path %s' % path_to_remove
1277 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001278 else:
1279 print 'Not removing troublesome path %s automatically.' % d[1]
1280 if d[0][0] == '!':
1281 print 'You can pass --force to enable automatic removal.'
1282 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001283
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001284 # Retrieve the current HEAD version because svn is slow at null updates.
1285 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001286 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001287 revision = str(from_info_live['Revision'])
1288 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001289
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001290 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001291 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +00001292 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001293 to_info = scm.SVN.CaptureRemoteInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001294 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +00001295 # The url is invalid or the server is not accessible, it's safer to bail
1296 # out right now.
1297 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001298 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1299 and (from_info['UUID'] == to_info['UUID']))
1300 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001301 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001302 # We have different roots, so check if we can switch --relocate.
1303 # Subversion only permits this if the repository UUIDs match.
1304 # Perform the switch --relocate, then rewrite the from_url
1305 # to reflect where we "are now." (This is the same way that
1306 # Subversion itself handles the metadata when switch --relocate
1307 # is used.) This makes the checks below for whether we
1308 # can update to a revision or have to switch to a different
1309 # branch work as expected.
1310 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001311 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001312 from_info['Repository Root'],
1313 to_info['Repository Root'],
1314 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001315 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001316 from_info['URL'] = from_info['URL'].replace(
1317 from_info['Repository Root'],
1318 to_info['Repository Root'])
1319 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +00001320 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001321 # Look for local modifications but ignore unversioned files.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001322 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001323 if status[0][0] != '?':
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001324 raise gclient_utils.Error(
1325 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1326 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001327 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001328 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001329 print('\n_____ switching %s to a new checkout' % self.relpath)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001330 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001331 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001332 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001333 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001334 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001335 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001336
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001337 # If the provided url has a revision number that matches the revision
1338 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001339 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001340 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001341 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001342 else:
1343 command = ['update', self.checkout_path]
1344 command = self._AddAdditionalUpdateFlags(command, options, revision)
1345 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001346
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001347 # If --reset and --delete_unversioned_trees are specified, remove any
1348 # untracked files and directories.
1349 if options.reset and options.delete_unversioned_trees:
1350 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1351 full_path = os.path.join(self.checkout_path, status[1])
1352 if (status[0][0] == '?'
1353 and os.path.isdir(full_path)
1354 and not os.path.islink(full_path)):
1355 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001356 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001357 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001358
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001359 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001360 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001361 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001362 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001363 # Create an empty checkout and then update the one file we want. Future
1364 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001365 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001366 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001367 if os.path.exists(os.path.join(self.checkout_path, filename)):
1368 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001369 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001370 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001371 # After the initial checkout, we can use update as if it were any other
1372 # dep.
1373 self.update(options, args, file_list)
1374 else:
1375 # If the installed version of SVN doesn't support --depth, fallback to
1376 # just exporting the file. This has the downside that revision
1377 # information is not stored next to the file, so we will have to
1378 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001379 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001380 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001381 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001382 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001383 command = self._AddAdditionalUpdateFlags(command, options,
1384 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001385 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001386
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001387 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001388 """Reverts local modifications. Subversion specific.
1389
1390 All reverted files will be appended to file_list, even if Subversion
1391 doesn't know about them.
1392 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001393 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001394 if os.path.exists(self.checkout_path):
1395 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001396 # svn revert won't work if the directory doesn't exist. It needs to
1397 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001398 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001399 # Don't reuse the args.
1400 return self.update(options, [], file_list)
1401
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001402 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
1403 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1404 print('________ found .git directory; skipping %s' % self.relpath)
1405 return
1406 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1407 print('________ found .hg directory; skipping %s' % self.relpath)
1408 return
1409 if not options.force:
1410 raise gclient_utils.Error('Invalid checkout path, aborting')
1411 print(
1412 '\n_____ %s is not a valid svn checkout, synching instead' %
1413 self.relpath)
1414 gclient_utils.rmtree(self.checkout_path)
1415 # Don't reuse the args.
1416 return self.update(options, [], file_list)
1417
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001418 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001419 if file_list is not None:
1420 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001421 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001422 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001423 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001424 print(os.path.join(self.checkout_path, file_status[1]))
1425 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001426
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001427 # Revert() may delete the directory altogether.
1428 if not os.path.isdir(self.checkout_path):
1429 # Don't reuse the args.
1430 return self.update(options, [], file_list)
1431
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001432 try:
1433 # svn revert is so broken we don't even use it. Using
1434 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001435 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001436 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1437 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001438 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001439 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001440 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001441
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001442 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001443 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001444 try:
1445 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001446 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001447 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001448
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001449 def runhooks(self, options, args, file_list):
1450 self.status(options, args, file_list)
1451
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001452 def status(self, options, args, file_list):
1453 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001454 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001455 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001456 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001457 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1458 'The directory does not exist.') %
1459 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001460 # There's no file list to retrieve.
1461 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001462 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001463
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001464 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001465 """Verifies the validity of the revision for this repository."""
1466 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1467 raise gclient_utils.Error(
1468 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1469 'correct.') % rev)
1470 return rev
1471
msb@chromium.orge6f78352010-01-13 17:05:33 +00001472 def FullUrlForRelativeUrl(self, url):
1473 # Find the forth '/' and strip from there. A bit hackish.
1474 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001475
maruel@chromium.org669600d2010-09-01 19:06:31 +00001476 def _Run(self, args, options, **kwargs):
1477 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001478 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001479 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001480 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001481
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001482 def Svnversion(self):
1483 """Runs the lowest checked out revision in the current project."""
1484 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1485 return info['Revision']
1486
maruel@chromium.org669600d2010-09-01 19:06:31 +00001487 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1488 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001489 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001490 scm.SVN.RunAndGetFileList(
1491 options.verbose,
1492 args + ['--ignore-externals'],
1493 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001494 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001495
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001496 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001497 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001498 """Add additional flags to command depending on what options are set.
1499 command should be a list of strings that represents an svn command.
1500
1501 This method returns a new list to be used as a command."""
1502 new_command = command[:]
1503 if revision:
1504 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001505 # We don't want interaction when jobs are used.
1506 if options.jobs > 1:
1507 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001508 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001509 # --accept was added to 'svn update' in svn 1.6.
1510 if not scm.SVN.AssertVersion('1.5')[0]:
1511 return new_command
1512
1513 # It's annoying to have it block in the middle of a sync, just sensible
1514 # defaults.
1515 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001516 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001517 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1518 new_command.extend(('--accept', 'theirs-conflict'))
1519 elif options.manually_grab_svn_rev:
1520 new_command.append('--force')
1521 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1522 new_command.extend(('--accept', 'postpone'))
1523 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1524 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001525 return new_command