blob: 7dc0bd8018693859b15529b74ba0fb747973c5fe [file] [log] [blame]
steveblock@chromium.org93567042012-02-15 01:02:26 +00001# Copyright (c) 2012 The Chromium Authors. All rights reserved.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00004
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00005"""Gclient-specific SCM-specific operations."""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00006
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00007import collections
maruel@chromium.org754960e2009-09-21 12:31:05 +00008import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00009import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000010import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000011import re
maruel@chromium.org90541732011-04-01 17:54:18 +000012import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000013import tempfile
iannucci@chromium.org53456aa2013-07-03 19:38:34 +000014import threading
maruel@chromium.orgfd876172010-04-30 14:01:05 +000015import time
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000016
17import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000018import scm
19import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000020
21
szager@chromium.org71cbb502013-04-19 23:30:15 +000022THIS_FILE_PATH = os.path.abspath(__file__)
23
24
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000025class DiffFiltererWrapper(object):
26 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000027 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000028 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000029 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000030 original_prefix = "--- "
31 working_prefix = "+++ "
32
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000033 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000034 # Note that we always use '/' as the path separator to be
35 # consistent with svn's cygwin-style output on Windows
36 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000037 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000038
maruel@chromium.org6e29d572010-06-04 17:32:20 +000039 def SetCurrentFile(self, current_file):
40 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000041
iannucci@chromium.org3830a672013-02-19 20:15:14 +000042 @property
43 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000044 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000045
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000046 def _Replace(self, line):
47 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000048
49 def Filter(self, line):
50 if (line.startswith(self.index_string)):
51 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000052 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000053 else:
54 if (line.startswith(self.original_prefix) or
55 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000056 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000057 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000058
59
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000060class SvnDiffFilterer(DiffFiltererWrapper):
61 index_string = "Index: "
62
63
64class GitDiffFilterer(DiffFiltererWrapper):
65 index_string = "diff --git "
66
67 def SetCurrentFile(self, current_file):
68 # Get filename by parsing "a/<filename> b/<filename>"
69 self._current_file = current_file[:(len(current_file)/2)][2:]
70
71 def _Replace(self, line):
72 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
73
74
bratell@opera.com18fa4542013-05-21 13:30:46 +000075def ask_for_data(prompt, options):
76 if options.jobs > 1:
77 raise gclient_utils.Error("Background task requires input. Rerun "
78 "gclient with --jobs=1 so that\n"
79 "interaction is possible.")
maruel@chromium.org90541732011-04-01 17:54:18 +000080 try:
81 return raw_input(prompt)
82 except KeyboardInterrupt:
83 # Hide the exception.
84 sys.exit(1)
85
86
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000087### SCM abstraction layer
88
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000089# Factory Method for SCM wrapper creation
90
maruel@chromium.org9eda4112010-06-11 18:56:10 +000091def GetScmName(url):
92 if url:
93 url, _ = gclient_utils.SplitUrlRevision(url)
94 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000095 url.startswith('git+http://') or url.startswith('git+https://') or
maruel@chromium.org9eda4112010-06-11 18:56:10 +000096 url.endswith('.git')):
97 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000098 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000099 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000100 return 'svn'
101 return None
102
103
104def CreateSCM(url, root_dir=None, relpath=None):
105 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000106 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000107 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000108 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000109
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000110 scm_name = GetScmName(url)
111 if not scm_name in SCM_MAP:
112 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000113 scm_class = SCM_MAP[scm_name]
114 if not scm_class.BinaryExists():
115 raise gclient_utils.Error('%s command not found' % scm_name)
116 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000117
118
119# SCMWrapper base class
120
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000121class SCMWrapper(object):
122 """Add necessary glue between all the supported SCM.
123
msb@chromium.orgd6504212010-01-13 17:34:31 +0000124 This is the abstraction layer to bind to different SCM.
125 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000126 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000127 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000128 self._root_dir = root_dir
129 if self._root_dir:
130 self._root_dir = self._root_dir.replace('/', os.sep)
131 self.relpath = relpath
132 if self.relpath:
133 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000134 if self.relpath and self._root_dir:
135 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000136
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000137 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000138 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000139 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000140
141 if not command in commands:
142 raise gclient_utils.Error('Unknown command %s' % command)
143
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000144 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000145 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000146 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000147
148 return getattr(self, command)(options, args, file_list)
149
150
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000151class GitFilter(object):
152 """A filter_fn implementation for quieting down git output messages.
153
154 Allows a custom function to skip certain lines (predicate), and will throttle
155 the output of percentage completed lines to only output every X seconds.
156 """
157 PERCENT_RE = re.compile('.* ([0-9]{1,2})% .*')
158
159 def __init__(self, time_throttle=0, predicate=None):
160 """
161 Args:
162 time_throttle (int): GitFilter will throttle 'noisy' output (such as the
163 XX% complete messages) to only be printed at least |time_throttle|
164 seconds apart.
165 predicate (f(line)): An optional function which is invoked for every line.
166 The line will be skipped if predicate(line) returns False.
167 """
168 self.last_time = 0
169 self.time_throttle = time_throttle
170 self.predicate = predicate
171
172 def __call__(self, line):
173 # git uses an escape sequence to clear the line; elide it.
174 esc = line.find(unichr(033))
175 if esc > -1:
176 line = line[:esc]
177 if self.predicate and not self.predicate(line):
178 return
179 now = time.time()
180 match = self.PERCENT_RE.match(line)
181 if not match:
182 self.last_time = 0
183 if (now - self.last_time) >= self.time_throttle:
184 self.last_time = now
185 print line
186
187
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000188class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000189 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000190 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000191 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000192
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000193 cache_dir = None
194 # If a given cache is used in a solution more than once, prevent multiple
195 # threads from updating it simultaneously.
196 cache_locks = collections.defaultdict(threading.Lock)
197
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000198 def __init__(self, url=None, root_dir=None, relpath=None):
199 """Removes 'git+' fake prefix from git URL."""
200 if url.startswith('git+http://') or url.startswith('git+https://'):
201 url = url[4:]
202 SCMWrapper.__init__(self, url, root_dir, relpath)
203
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000204 @staticmethod
205 def BinaryExists():
206 """Returns true if the command exists."""
207 try:
208 # We assume git is newer than 1.7. See: crbug.com/114483
209 result, version = scm.GIT.AssertVersion('1.7')
210 if not result:
211 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
212 return result
213 except OSError:
214 return False
215
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000216 def GetCheckoutRoot(self):
217 return scm.GIT.GetCheckoutRoot(self.checkout_path)
218
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000219 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000220 """Returns the given revision's date in ISO-8601 format (which contains the
221 time zone)."""
222 # TODO(floitsch): get the time-stamp of the given revision and not just the
223 # time-stamp of the currently checked out revision.
224 return self._Capture(['log', '-n', '1', '--format=%ai'])
225
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000226 @staticmethod
227 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000228 """'Cleanup' the repo.
229
230 There's no real git equivalent for the svn cleanup command, do a no-op.
231 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000232
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000233 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000234 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000235 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000236
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000237 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000238 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000239 repository.
240
241 The patch file is generated from a diff of the merge base of HEAD and
242 its upstream branch.
243 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000244 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000245 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000246 ['git', 'diff', merge_base],
247 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000248 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000249
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000250 def UpdateSubmoduleConfig(self):
251 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
252 'submodule.$name.ignore', '||',
253 'git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000254 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000255 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000256 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000257 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000258 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000259 kwargs = {'cwd': self.checkout_path,
260 'print_stdout': False,
261 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000262 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000263 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
264 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000265 except subprocess2.CalledProcessError:
266 # Not a fatal error, or even very interesting in a non-git-submodule
267 # world. So just keep it quiet.
268 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000269 try:
270 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
271 except subprocess2.CalledProcessError:
272 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000273
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000274 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
275
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000276 def _FetchAndReset(self, revision, file_list, options):
277 """Equivalent to git fetch; git reset."""
278 quiet = []
279 if not options.verbose:
280 quiet = ['--quiet']
281 self._UpdateBranchHeads(options, fetch=False)
iannucci@chromium.orgb8376882013-07-01 20:08:10 +0000282
283 fetch_cmd = [
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000284 '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote, '--prune']
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000285 self._Run(fetch_cmd + quiet, options, retry=True)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000286 self._Run(['reset', '--hard', revision] + quiet, options)
287 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000288 if file_list is not None:
289 files = self._Capture(['ls-files']).splitlines()
290 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000291
msb@chromium.orge28e4982009-09-25 20:51:45 +0000292 def update(self, options, args, file_list):
293 """Runs git to update or transparently checkout the working copy.
294
295 All updated files will be appended to file_list.
296
297 Raises:
298 Error: if can't get URL for relative path.
299 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000300 if args:
301 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
302
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000303 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000304
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000305 # If a dependency is not pinned, track the default remote branch.
306 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000307 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000308 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000309 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000310 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000311 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000312 # Override the revision number.
313 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000314 if revision == 'unmanaged':
315 revision = None
316 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000317 if not revision:
318 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000319
floitsch@google.comeaab7842011-04-28 09:07:58 +0000320 if gclient_utils.IsDateRevision(revision):
321 # Date-revisions only work on git-repositories if the reflog hasn't
322 # expired yet. Use rev-list to get the corresponding revision.
323 # git rev-list -n 1 --before='time-stamp' branchname
324 if options.transitive:
325 print('Warning: --transitive only works for SVN repositories.')
326 revision = default_rev
327
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000328 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000329 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000330
331 printed_path = False
332 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000333 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000334 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000335 verbose = ['--verbose']
336 printed_path = True
337
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000338 url = self._CreateOrUpdateCache(url, options)
339
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000340 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000341 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000342 elif revision.startswith(self.remote + '/'):
343 # For compatibility with old naming, translate 'origin' to 'refs/heads'
344 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000345 rev_type = "branch"
346 else:
347 # hash is also a tag, only make a distinction at checkout
348 rev_type = "hash"
349
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000350 if (not os.path.exists(self.checkout_path) or
351 (os.path.isdir(self.checkout_path) and
352 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000353 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000354 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000355 if file_list is not None:
356 files = self._Capture(['ls-files']).splitlines()
357 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000358 if not verbose:
359 # Make the output a little prettier. It's nice to have some whitespace
360 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000361 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000362 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000363
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000364 if not managed:
mmoss@chromium.org96833fa2013-04-17 03:26:37 +0000365 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgf5cc4272012-06-21 22:38:07 +0000366 self.UpdateSubmoduleConfig()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000367 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000368 return self._Capture(['rev-parse', '--verify', 'HEAD'])
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000369
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000370 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
371 raise gclient_utils.Error('\n____ %s%s\n'
372 '\tPath is not a git repo. No .git dir.\n'
373 '\tTo resolve:\n'
374 '\t\trm -rf %s\n'
375 '\tAnd run gclient sync again\n'
376 % (self.relpath, rev_str, self.relpath))
377
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000378 # See if the url has changed (the unittests use git://foo for the url, let
379 # that through).
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000380 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000381 return_early = False
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000382 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
383 # unit test pass. (and update the comment above)
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000384 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
385 # This allows devs to use experimental repos which have a different url
386 # but whose branch(s) are the same as official repos.
387 if (current_url != url and
388 url != 'git://foo' and
389 subprocess2.capture(
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000390 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000391 cwd=self.checkout_path).strip() != 'False'):
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000392 print('_____ switching %s to a new upstream' % self.relpath)
393 # Make sure it's clean
394 self._CheckClean(rev_str)
395 # Switch over to the new upstream
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000396 self._Run(['remote', 'set-url', self.remote, url], options)
xusydoc@chromium.orgc3761712013-06-12 00:53:36 +0000397 self._FetchAndReset(revision, file_list, options)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000398 return_early = True
399
400 # Need to do this in the normal path as well as in the post-remote-switch
401 # path.
402 self._PossiblySwitchCache(url, options)
403
404 if return_early:
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000405 return self._Capture(['rev-parse', '--verify', 'HEAD'])
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000406
msb@chromium.org5bde4852009-12-14 16:47:12 +0000407 cur_branch = self._GetCurrentBranch()
408
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000409 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000410 # 0) HEAD is detached. Probably from our initial clone.
411 # - make sure HEAD is contained by a named ref, then update.
412 # Cases 1-4. HEAD is a branch.
413 # 1) current branch is not tracking a remote branch (could be git-svn)
414 # - try to rebase onto the new hash or branch
415 # 2) current branch is tracking a remote branch with local committed
416 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000417 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000418 # 3) current branch is tracking a remote branch w/or w/out changes,
419 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000420 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000421 # 4) current branch is tracking a remote branch, switches to a different
422 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 # - exit
424
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000425 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
426 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000427 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
428 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000429 if cur_branch is None:
430 upstream_branch = None
431 current_type = "detached"
432 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000433 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000434 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
435 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
436 current_type = "hash"
437 logging.debug("Current branch is not tracking an upstream (remote)"
438 " branch.")
439 elif upstream_branch.startswith('refs/remotes'):
440 current_type = "branch"
441 else:
442 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000443
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000444 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000445 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000446 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000447 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000448 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000449 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000450
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000451 self._UpdateBranchHeads(options, fetch=True)
452
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000453 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000454 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000455 target = 'HEAD'
456 if options.upstream and upstream_branch:
457 target = upstream_branch
458 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000459
msb@chromium.org786fb682010-06-02 15:16:23 +0000460 if current_type == 'detached':
461 # case 0
462 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000463 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000464 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000465 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000466 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000467 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000468 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000469 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000470 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000471 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000472 newbase=revision, printed_path=printed_path)
473 printed_path = True
474 else:
475 # Can't find a merge-base since we don't know our upstream. That makes
476 # this command VERY likely to produce a rebase failure. For now we
477 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000478 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000479 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000480 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000481 self._AttemptRebase(upstream_branch, files, options,
482 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000483 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000484 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000485 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000486 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000487 newbase=revision, printed_path=printed_path)
488 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000489 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000490 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000491 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000493 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000494 switch_error = ("Switching upstream branch from %s to %s\n"
495 % (upstream_branch, new_base) +
496 "Please merge or rebase manually:\n" +
497 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
498 "OR git checkout -b <some new branch> %s" % new_base)
499 raise gclient_utils.Error(switch_error)
500 else:
501 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000502 if files is not None:
503 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000504 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000505 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000506 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000507 merge_args = ['merge']
508 if not options.merge:
509 merge_args.append('--ff-only')
510 merge_args.append(upstream_branch)
511 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000512 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000513 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
514 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000515 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000516 printed_path = True
517 while True:
518 try:
maruel@chromium.org90541732011-04-01 17:54:18 +0000519 action = ask_for_data(
520 'Cannot fast-forward merge, attempt to rebase? '
bratell@opera.com18fa4542013-05-21 13:30:46 +0000521 '(y)es / (q)uit / (s)kip : ', 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,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000526 printed_path=printed_path)
527 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 + '/')
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000619
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000620 if file_list is not None:
621 files = self._Capture(['diff', deps_revision, '--name-only']).split()
622
maruel@chromium.org37e89872010-09-07 16:11:33 +0000623 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000624 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000625
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000626 if file_list is not None:
627 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
628
629 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000630 """Returns revision"""
631 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000632
msb@chromium.orge28e4982009-09-25 20:51:45 +0000633 def runhooks(self, options, args, file_list):
634 self.status(options, args, file_list)
635
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000636 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000637 """Display status information."""
638 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000639 print(('\n________ couldn\'t run status in %s:\n'
640 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000641 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000642 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000643 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000644 if file_list is not None:
645 files = self._Capture(['diff', '--name-only', merge_base]).split()
646 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000647
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000648 def GetUsableRev(self, rev, options):
649 """Finds a useful revision for this repository.
650
651 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
652 will be called on the source."""
653 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000654 if not os.path.isdir(self.checkout_path):
655 raise gclient_utils.Error(
656 ( 'We could not find a valid hash for safesync_url response "%s".\n'
657 'Safesync URLs with a git checkout currently require the repo to\n'
658 'be cloned without a safesync_url before adding the safesync_url.\n'
659 'For more info, see: '
660 'http://code.google.com/p/chromium/wiki/UsingNewGit'
661 '#Initial_checkout' ) % rev)
662 elif rev.isdigit() and len(rev) < 7:
663 # Handles an SVN rev. As an optimization, only verify an SVN revision as
664 # [0-9]{1,6} for now to avoid making a network request.
665 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000666 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
667 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000668 try:
669 logging.debug('Looking for git-svn configuration optimizations.')
670 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
671 cwd=self.checkout_path):
672 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
673 except subprocess2.CalledProcessError:
674 logging.debug('git config --get svn-remote.svn.fetch failed, '
675 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000676 if options.verbose:
677 print('Running git svn fetch. This might take a while.\n')
678 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000679 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000680 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
681 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000682 except gclient_utils.Error, e:
683 sha1 = e.message
684 print('\nWarning: Could not find a git revision with accurate\n'
685 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
686 'the closest sane git revision, which is:\n'
687 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000688 if not sha1:
689 raise gclient_utils.Error(
690 ( 'It appears that either your git-svn remote is incorrectly\n'
691 'configured or the revision in your safesync_url is\n'
692 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
693 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000694 else:
695 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
696 sha1 = rev
697 else:
698 # May exist in origin, but we don't have it yet, so fetch and look
699 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000700 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000701 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
702 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000703
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000704 if not sha1:
705 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000706 ( 'We could not find a valid hash for safesync_url response "%s".\n'
707 'Safesync URLs with a git checkout currently require a git-svn\n'
708 'remote or a safesync_url that provides git sha1s. Please add a\n'
709 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000710 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000711 '#Initial_checkout' ) % rev)
712
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000713 return sha1
714
msb@chromium.orge6f78352010-01-13 17:05:33 +0000715 def FullUrlForRelativeUrl(self, url):
716 # Strip from last '/'
717 # Equivalent to unix basename
718 base_url = self.url
719 return base_url[:base_url.rfind('/')] + url
720
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000721 @staticmethod
722 def _NormalizeGitURL(url):
723 '''Takes a git url, strips the scheme, and ensures it ends with '.git'.'''
724 idx = url.find('://')
725 if idx != -1:
726 url = url[idx+3:]
727 if not url.endswith('.git'):
728 url += '.git'
729 return url
730
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000731 def _PossiblySwitchCache(self, url, options):
732 """Handles switching a repo from with-cache to direct, or vice versa.
733
734 When we go from direct to with-cache, the remote url changes from the
735 'real' url to the local file url (in cache_dir). Therefore, this function
736 assumes that |url| points to the correctly-switched-over local file url, if
737 we're in cache_mode.
738
739 When we go from with-cache to direct, assume that the normal url-switching
740 code already flipped the remote over, and we just need to repack and break
741 the dependency to the cache.
742 """
743
744 altfile = os.path.join(
745 self.checkout_path, '.git', 'objects', 'info', 'alternates')
746 if self.cache_dir:
747 if not os.path.exists(altfile):
748 try:
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000749 with open(altfile, 'w') as f:
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000750 f.write(os.path.join(url, 'objects'))
751 # pylint: disable=C0301
752 # This dance is necessary according to emperical evidence, also at:
753 # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html
754 self._Run(['repack', '-ad'], options)
755 self._Run(['repack', '-adl'], options)
756 except Exception:
757 # If something goes wrong, try to remove the altfile so we'll go down
758 # this path again next time.
759 try:
760 os.remove(altfile)
iannucci@chromium.org578e5e52013-07-18 20:55:16 +0000761 except OSError as e:
762 print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000763 raise
764 else:
765 if os.path.exists(altfile):
766 self._Run(['repack', '-a'], options)
767 os.remove(altfile)
768
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000769 def _CreateOrUpdateCache(self, url, options):
770 """Make a new git mirror or update existing mirror for |url|, and return the
771 mirror URI to clone from.
772
773 If no cache-dir is specified, just return |url| unchanged.
774 """
775 if not self.cache_dir:
776 return url
777
778 # Replace - with -- to avoid ambiguity. / with - to flatten folder structure
779 folder = os.path.join(
780 self.cache_dir,
781 self._NormalizeGitURL(url).replace('-', '--').replace('/', '-'))
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000782 altfile = os.path.join(folder, 'objects', 'info', 'alternates')
783
784 # If we're bringing an old cache up to date or cloning a new cache, and the
785 # existing repo is currently a direct clone, use its objects to help out
786 # the fetch here.
787 checkout_objects = os.path.join(self.checkout_path, '.git', 'objects')
788 checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates')
789 use_reference = (
790 os.path.exists(checkout_objects) and
791 not os.path.exists(checkout_altfile))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000792
793 v = ['-v'] if options.verbose else []
794 filter_fn = lambda l: '[up to date]' not in l
795 with self.cache_locks[folder]:
796 gclient_utils.safe_makedirs(self.cache_dir)
797 if not os.path.exists(os.path.join(folder, 'config')):
798 gclient_utils.rmtree(folder)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000799 cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g',
800 '--progress', '--mirror']
801
802 if use_reference:
803 cmd += ['--reference', os.path.abspath(self.checkout_path)]
804
805 self._Run(cmd + [url, folder],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000806 options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000807 else:
808 # For now, assert that host/path/to/repo.git is identical. We may want
809 # to relax this restriction in the future to allow for smarter cache
810 # repo update schemes (such as pulling the same repo, but from a
811 # different host).
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000812 existing_url = self._Capture(['config', 'remote.%s.url' % self.remote],
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000813 cwd=folder)
814 assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url)
815
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000816 if use_reference:
817 with open(altfile, 'w') as f:
818 f.write(os.path.abspath(checkout_objects))
819
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000820 # Would normally use `git remote update`, but it doesn't support
821 # --progress, so use fetch instead.
822 self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000823 options, filter_fn=filter_fn, cwd=folder, retry=True)
iannucci@chromium.org976a14d2013-07-17 21:56:49 +0000824
825 # If the clone has an object dependency on the existing repo, break it
826 # with repack and remove the linkage.
827 if os.path.exists(altfile):
828 self._Run(['repack', '-a'], options, cwd=folder)
829 os.remove(altfile)
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000830 return folder
831
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000832 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000833 """Clone a git repository from the given URL.
834
msb@chromium.org786fb682010-06-02 15:16:23 +0000835 Once we've cloned the repo, we checkout a working branch if the specified
836 revision is a branch head. If it is a tag or a specific commit, then we
837 leave HEAD detached as it makes future updates simpler -- in this case the
838 user should first create a new branch or switch to an existing branch before
839 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000840 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000841 # git clone doesn't seem to insert a newline properly before printing
842 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000843 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000844 template_path = os.path.join(
845 os.path.dirname(THIS_FILE_PATH), 'git-templates')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000846 clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout',
847 '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000848 if self.cache_dir:
849 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000850 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000851 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000852 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000853 # If the parent directory does not exist, Git clone on Windows will not
854 # create it, so we need to do it manually.
855 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000856 gclient_utils.safe_makedirs(parent_dir)
857 tmp_dir = tempfile.mkdtemp(
858 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
859 dir=parent_dir)
860 try:
861 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000862 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000863 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000864 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
865 os.path.join(self.checkout_path, '.git'))
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000866 finally:
867 if os.listdir(tmp_dir):
868 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
869 gclient_utils.rmtree(tmp_dir)
870 if revision.startswith('refs/heads/'):
871 self._Run(
872 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
873 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000874 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000875 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000876 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000877 ('Checked out %s to a detached HEAD. Before making any commits\n'
878 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000879 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
880 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000881
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000882 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000883 branch=None, printed_path=False):
884 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000885 if files is not None:
886 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000887 revision = upstream
888 if newbase:
889 revision = newbase
890 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000891 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000892 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000893 printed_path = True
894 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000895 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000896
897 # Build the rebase command here using the args
898 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
899 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000900 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000901 rebase_cmd.append('--verbose')
902 if newbase:
903 rebase_cmd.extend(['--onto', newbase])
904 rebase_cmd.append(upstream)
905 if branch:
906 rebase_cmd.append(branch)
907
908 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000909 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000910 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000911 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
912 re.match(r'cannot rebase: your index contains uncommitted changes',
913 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000914 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000915 rebase_action = ask_for_data(
916 'Cannot rebase because of unstaged changes.\n'
917 '\'git reset --hard HEAD\' ?\n'
918 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000919 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000920 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000921 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000922 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000923 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000924 break
925 elif re.match(r'quit|q', rebase_action, re.I):
926 raise gclient_utils.Error("Please merge or rebase manually\n"
927 "cd %s && git " % self.checkout_path
928 + "%s" % ' '.join(rebase_cmd))
929 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000930 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000931 continue
932 else:
933 gclient_utils.Error("Input not recognized")
934 continue
935 elif re.search(r'^CONFLICT', e.stdout, re.M):
936 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
937 "Fix the conflict and run gclient again.\n"
938 "See 'man git-rebase' for details.\n")
939 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000940 print(e.stdout.strip())
941 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000942 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
943 "manually.\ncd %s && git " %
944 self.checkout_path
945 + "%s" % ' '.join(rebase_cmd))
946
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000947 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000948 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000949 # Make the output a little prettier. It's nice to have some
950 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000951 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000952
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000953 @staticmethod
954 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000955 (ok, current_version) = scm.GIT.AssertVersion(min_version)
956 if not ok:
957 raise gclient_utils.Error('git version %s < minimum required %s' %
958 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000959
msb@chromium.org786fb682010-06-02 15:16:23 +0000960 def _IsRebasing(self):
961 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
962 # have a plumbing command to determine whether a rebase is in progress, so
963 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
964 g = os.path.join(self.checkout_path, '.git')
965 return (
966 os.path.isdir(os.path.join(g, "rebase-merge")) or
967 os.path.isdir(os.path.join(g, "rebase-apply")))
968
969 def _CheckClean(self, rev_str):
970 # Make sure the tree is clean; see git-rebase.sh for reference
971 try:
972 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000973 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000974 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000975 raise gclient_utils.Error('\n____ %s%s\n'
976 '\tYou have unstaged changes.\n'
977 '\tPlease commit, stash, or reset.\n'
978 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000979 try:
980 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000981 '--ignore-submodules', 'HEAD', '--'],
982 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000983 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000984 raise gclient_utils.Error('\n____ %s%s\n'
985 '\tYour index contains uncommitted changes\n'
986 '\tPlease commit, stash, or reset.\n'
987 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000988
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000989 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000990 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
991 # reference by a commit). If not, error out -- most likely a rebase is
992 # in progress, try to detect so we can give a better error.
993 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000994 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
995 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000996 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000997 # Commit is not contained by any rev. See if the user is rebasing:
998 if self._IsRebasing():
999 # Punt to the user
1000 raise gclient_utils.Error('\n____ %s%s\n'
1001 '\tAlready in a conflict, i.e. (no branch).\n'
1002 '\tFix the conflict and run gclient again.\n'
1003 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
1004 '\tSee man git-rebase for details.\n'
1005 % (self.relpath, rev_str))
1006 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001007 name = ('saved-by-gclient-' +
1008 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +00001009 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001010 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +00001011 name)
msb@chromium.org786fb682010-06-02 15:16:23 +00001012
msb@chromium.org5bde4852009-12-14 16:47:12 +00001013 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +00001014 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001015 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +00001016 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +00001017 return None
1018 return branch
1019
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001020 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +00001021 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +00001022 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +00001023 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001024 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001025
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001026 def _UpdateBranchHeads(self, options, fetch=False):
1027 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1028 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001029 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001030 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1031 '^\\+refs/branch-heads/\\*:.*$']
1032 self._Run(config_cmd, options)
1033 if fetch:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001034 fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001035 if options.verbose:
1036 fetch_cmd.append('--verbose')
1037 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001038
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001039 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001040 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001041 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001042 if git_filter:
scottmg@chromium.orgf547c802013-09-27 17:55:26 +00001043 kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001044 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001045 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +00001046 # By default, git will use an interactive terminal prompt when a username/
1047 # password is needed. That shouldn't happen in the chromium workflow,
1048 # and if it does, then gclient may hide the prompt in the midst of a flood
1049 # of terminal spew. The only indication that something has gone wrong
1050 # will be when gclient hangs unresponsively. Instead, we disable the
1051 # password prompt and simply allow git to fail noisily. The error
1052 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +00001053 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1054 env.setdefault('GIT_ASKPASS', 'true')
1055 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +00001056 else:
1057 kwargs.setdefault('print_stdout', True)
szager@google.com85d3e3a2011-10-07 17:12:00 +00001058 stdout = kwargs.get('stdout', sys.stdout)
1059 stdout.write('\n________ running \'git %s\' in \'%s\'\n' % (
1060 ' '.join(args), kwargs['cwd']))
1061 gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001062
1063
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001064class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001065 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001066 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001067
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001068 @staticmethod
1069 def BinaryExists():
1070 """Returns true if the command exists."""
1071 try:
1072 result, version = scm.SVN.AssertVersion('1.4')
1073 if not result:
1074 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1075 return result
1076 except OSError:
1077 return False
1078
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001079 def GetCheckoutRoot(self):
1080 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1081
floitsch@google.comeaab7842011-04-28 09:07:58 +00001082 def GetRevisionDate(self, revision):
1083 """Returns the given revision's date in ISO-8601 format (which contains the
1084 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001085 date = scm.SVN.Capture(
1086 ['propget', '--revprop', 'svn:date', '-r', revision],
1087 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001088 return date.strip()
1089
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001090 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001091 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001092 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001093
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001094 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001095 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001096 if not os.path.isdir(self.checkout_path):
1097 raise gclient_utils.Error('Directory %s is not present.' %
1098 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001099 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001100
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001101 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001102 """Generates a patch file which can be applied to the root of the
1103 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001104 if not os.path.isdir(self.checkout_path):
1105 raise gclient_utils.Error('Directory %s is not present.' %
1106 self.checkout_path)
1107 gclient_utils.CheckCallAndFilter(
1108 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1109 cwd=self.checkout_path,
1110 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001111 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001112
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001113 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001114 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001115
1116 All updated files will be appended to file_list.
1117
1118 Raises:
1119 Error: if can't get URL for relative path.
1120 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001121 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001122 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001123 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001124 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001125 return
1126
morrita@chromium.org21dca0e2010-10-05 00:55:12 +00001127 hg_path = os.path.join(self.checkout_path, '.hg')
1128 if os.path.exists(hg_path):
1129 print('________ found .hg directory; skipping %s' % self.relpath)
1130 return
1131
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001132 if args:
1133 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1134
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001135 # revision is the revision to match. It is None if no revision is specified,
1136 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001137 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001138 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001139 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001140 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001141 if options.revision:
1142 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001143 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001144 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001145 if revision != 'unmanaged':
1146 forced_revision = True
1147 # Reconstruct the url.
1148 url = '%s@%s' % (url, revision)
1149 rev_str = ' at %s' % revision
1150 else:
1151 managed = False
1152 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001153 else:
1154 forced_revision = False
1155 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001156
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001157 # Get the existing scm url and the revision number of the current checkout.
1158 exists = os.path.exists(self.checkout_path)
1159 if exists and managed:
1160 try:
1161 from_info = scm.SVN.CaptureLocalInfo(
1162 [], os.path.join(self.checkout_path, '.'))
1163 except (gclient_utils.Error, subprocess2.CalledProcessError):
1164 if options.reset and options.delete_unversioned_trees:
1165 print 'Removing troublesome path %s' % self.checkout_path
1166 gclient_utils.rmtree(self.checkout_path)
1167 exists = False
1168 else:
1169 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1170 'present. Delete the directory and try again.')
1171 raise gclient_utils.Error(msg % self.checkout_path)
1172
1173 if not exists:
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001174 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001175 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001176 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001177 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001178 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001179 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001180
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001181 if not managed:
1182 print ('________ unmanaged solution; skipping %s' % self.relpath)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001183 return self.Svnversion()
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001184
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001185 if 'URL' not in from_info:
1186 raise gclient_utils.Error(
1187 ('gclient is confused. Couldn\'t get the url for %s.\n'
1188 'Try using @unmanaged.\n%s') % (
1189 self.checkout_path, from_info))
1190
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001191 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001192 dir_info = scm.SVN.CaptureStatus(
1193 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001194 if any(d[0][2] == 'L' for d in dir_info):
1195 try:
1196 self._Run(['cleanup', self.checkout_path], options)
1197 except subprocess2.CalledProcessError, e:
1198 # Get the status again, svn cleanup may have cleaned up at least
1199 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001200 dir_info = scm.SVN.CaptureStatus(
1201 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001202
1203 # Try to fix the failures by removing troublesome files.
1204 for d in dir_info:
1205 if d[0][2] == 'L':
1206 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001207 # We don't pass any files/directories to CaptureStatus and set
1208 # cwd=self.checkout_path, so we should get relative paths here.
1209 assert not os.path.isabs(d[1])
1210 path_to_remove = os.path.normpath(
1211 os.path.join(self.checkout_path, d[1]))
1212 print 'Removing troublesome path %s' % path_to_remove
1213 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001214 else:
1215 print 'Not removing troublesome path %s automatically.' % d[1]
1216 if d[0][0] == '!':
1217 print 'You can pass --force to enable automatic removal.'
1218 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001219
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001220 # Retrieve the current HEAD version because svn is slow at null updates.
1221 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001222 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001223 revision = str(from_info_live['Revision'])
1224 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001225
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001226 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001227 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +00001228 try:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001229 to_info = scm.SVN.CaptureRemoteInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001230 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +00001231 # The url is invalid or the server is not accessible, it's safer to bail
1232 # out right now.
1233 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001234 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1235 and (from_info['UUID'] == to_info['UUID']))
1236 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001237 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001238 # We have different roots, so check if we can switch --relocate.
1239 # Subversion only permits this if the repository UUIDs match.
1240 # Perform the switch --relocate, then rewrite the from_url
1241 # to reflect where we "are now." (This is the same way that
1242 # Subversion itself handles the metadata when switch --relocate
1243 # is used.) This makes the checks below for whether we
1244 # can update to a revision or have to switch to a different
1245 # branch work as expected.
1246 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001247 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001248 from_info['Repository Root'],
1249 to_info['Repository Root'],
1250 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001251 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001252 from_info['URL'] = from_info['URL'].replace(
1253 from_info['Repository Root'],
1254 to_info['Repository Root'])
1255 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +00001256 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001257 # Look for local modifications but ignore unversioned files.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001258 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001259 if status[0][0] != '?':
maruel@chromium.org86f0f952010-08-10 17:17:19 +00001260 raise gclient_utils.Error(
1261 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1262 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001263 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001264 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001265 print('\n_____ switching %s to a new checkout' % self.relpath)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001266 gclient_utils.rmtree(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
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001273 # If the provided url has a revision number that matches the revision
1274 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001275 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001276 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001277 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001278 else:
1279 command = ['update', self.checkout_path]
1280 command = self._AddAdditionalUpdateFlags(command, options, revision)
1281 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001282
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001283 # If --reset and --delete_unversioned_trees are specified, remove any
1284 # untracked files and directories.
1285 if options.reset and options.delete_unversioned_trees:
1286 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1287 full_path = os.path.join(self.checkout_path, status[1])
1288 if (status[0][0] == '?'
1289 and os.path.isdir(full_path)
1290 and not os.path.islink(full_path)):
1291 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001292 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001293 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001294
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001295 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001296 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001297 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001298 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001299 # Create an empty checkout and then update the one file we want. Future
1300 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001301 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001302 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001303 if os.path.exists(os.path.join(self.checkout_path, filename)):
1304 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001305 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001306 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001307 # After the initial checkout, we can use update as if it were any other
1308 # dep.
1309 self.update(options, args, file_list)
1310 else:
1311 # If the installed version of SVN doesn't support --depth, fallback to
1312 # just exporting the file. This has the downside that revision
1313 # information is not stored next to the file, so we will have to
1314 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001315 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001316 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001317 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001318 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001319 command = self._AddAdditionalUpdateFlags(command, options,
1320 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001321 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001322
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001323 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001324 """Reverts local modifications. Subversion specific.
1325
1326 All reverted files will be appended to file_list, even if Subversion
1327 doesn't know about them.
1328 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001329 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001330 if os.path.exists(self.checkout_path):
1331 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001332 # svn revert won't work if the directory doesn't exist. It needs to
1333 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001334 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001335 # Don't reuse the args.
1336 return self.update(options, [], file_list)
1337
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001338 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
1339 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1340 print('________ found .git directory; skipping %s' % self.relpath)
1341 return
1342 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1343 print('________ found .hg directory; skipping %s' % self.relpath)
1344 return
1345 if not options.force:
1346 raise gclient_utils.Error('Invalid checkout path, aborting')
1347 print(
1348 '\n_____ %s is not a valid svn checkout, synching instead' %
1349 self.relpath)
1350 gclient_utils.rmtree(self.checkout_path)
1351 # Don't reuse the args.
1352 return self.update(options, [], file_list)
1353
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001354 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001355 if file_list is not None:
1356 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001357 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001358 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001359 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001360 print(os.path.join(self.checkout_path, file_status[1]))
1361 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001362
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001363 # Revert() may delete the directory altogether.
1364 if not os.path.isdir(self.checkout_path):
1365 # Don't reuse the args.
1366 return self.update(options, [], file_list)
1367
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001368 try:
1369 # svn revert is so broken we don't even use it. Using
1370 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001371 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001372 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1373 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001374 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001375 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001376 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001377
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001378 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001379 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001380 try:
1381 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001382 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001383 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001384
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001385 def runhooks(self, options, args, file_list):
1386 self.status(options, args, file_list)
1387
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001388 def status(self, options, args, file_list):
1389 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001390 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001391 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001392 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001393 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1394 'The directory does not exist.') %
1395 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001396 # There's no file list to retrieve.
1397 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001398 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001399
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001400 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001401 """Verifies the validity of the revision for this repository."""
1402 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1403 raise gclient_utils.Error(
1404 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1405 'correct.') % rev)
1406 return rev
1407
msb@chromium.orge6f78352010-01-13 17:05:33 +00001408 def FullUrlForRelativeUrl(self, url):
1409 # Find the forth '/' and strip from there. A bit hackish.
1410 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001411
maruel@chromium.org669600d2010-09-01 19:06:31 +00001412 def _Run(self, args, options, **kwargs):
1413 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001414 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001415 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001416 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001417
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001418 def Svnversion(self):
1419 """Runs the lowest checked out revision in the current project."""
1420 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1421 return info['Revision']
1422
maruel@chromium.org669600d2010-09-01 19:06:31 +00001423 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1424 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001425 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001426 scm.SVN.RunAndGetFileList(
1427 options.verbose,
1428 args + ['--ignore-externals'],
1429 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001430 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001431
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001432 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001433 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001434 """Add additional flags to command depending on what options are set.
1435 command should be a list of strings that represents an svn command.
1436
1437 This method returns a new list to be used as a command."""
1438 new_command = command[:]
1439 if revision:
1440 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001441 # We don't want interaction when jobs are used.
1442 if options.jobs > 1:
1443 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001444 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001445 # --accept was added to 'svn update' in svn 1.6.
1446 if not scm.SVN.AssertVersion('1.5')[0]:
1447 return new_command
1448
1449 # It's annoying to have it block in the middle of a sync, just sensible
1450 # defaults.
1451 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001452 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001453 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1454 new_command.extend(('--accept', 'theirs-conflict'))
1455 elif options.manually_grab_svn_rev:
1456 new_command.append('--force')
1457 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1458 new_command.extend(('--accept', 'postpone'))
1459 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1460 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001461 return new_command