blob: 26d96585cc667c0b7fd54a62372171e1c732b7e1 [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
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00007from __future__ import print_function
8
borenet@google.comb2256212014-05-07 20:57:28 +00009import errno
maruel@chromium.org754960e2009-09-21 12:31:05 +000010import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000011import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000012import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000013import re
borenet@google.com88d10082014-03-21 17:24:48 +000014import shlex
maruel@chromium.org90541732011-04-01 17:54:18 +000015import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000016import tempfile
zty@chromium.org6279e8a2014-02-13 01:45:25 +000017import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000018import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000019
hinoka@google.com2f2ca142014-01-07 03:59:18 +000020import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000021import gclient_utils
szager@chromium.org848fd492014-04-09 19:06:44 +000022import git_cache
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000023import scm
borenet@google.comb2256212014-05-07 20:57:28 +000024import shutil
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000025import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000026
27
szager@chromium.org71cbb502013-04-19 23:30:15 +000028THIS_FILE_PATH = os.path.abspath(__file__)
29
hinoka@google.com2f2ca142014-01-07 03:59:18 +000030GSUTIL_DEFAULT_PATH = os.path.join(
31 os.path.dirname(os.path.abspath(__file__)),
32 'third_party', 'gsutil', 'gsutil')
33
szager@chromium.org848fd492014-04-09 19:06:44 +000034CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src.git'
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000035class DiffFiltererWrapper(object):
36 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000037 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000038 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000039 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000040 original_prefix = "--- "
41 working_prefix = "+++ "
42
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000043 def __init__(self, relpath, print_func):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000044 # Note that we always use '/' as the path separator to be
45 # consistent with svn's cygwin-style output on Windows
46 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000047 self._current_file = None
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000048 self._print_func = print_func
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000049
maruel@chromium.org6e29d572010-06-04 17:32:20 +000050 def SetCurrentFile(self, current_file):
51 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000052
iannucci@chromium.org3830a672013-02-19 20:15:14 +000053 @property
54 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000055 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000056
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000057 def _Replace(self, line):
58 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000059
60 def Filter(self, line):
61 if (line.startswith(self.index_string)):
62 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000063 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000064 else:
65 if (line.startswith(self.original_prefix) or
66 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000067 line = self._Replace(line)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000068 self._print_func(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000069
70
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000071class SvnDiffFilterer(DiffFiltererWrapper):
72 index_string = "Index: "
73
74
75class GitDiffFilterer(DiffFiltererWrapper):
76 index_string = "diff --git "
77
78 def SetCurrentFile(self, current_file):
79 # Get filename by parsing "a/<filename> b/<filename>"
80 self._current_file = current_file[:(len(current_file)/2)][2:]
81
82 def _Replace(self, line):
83 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
84
85
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000086### SCM abstraction layer
87
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000088# Factory Method for SCM wrapper creation
89
maruel@chromium.org9eda4112010-06-11 18:56:10 +000090def GetScmName(url):
91 if url:
92 url, _ = gclient_utils.SplitUrlRevision(url)
93 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000094 url.startswith('git+http://') or url.startswith('git+https://') or
borenet@google.coma2aec972014-04-22 21:35:15 +000095 url.endswith('.git') or url.startswith('sso://') or
96 'googlesource' in url):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000097 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
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000104def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000105 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)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000116 return scm_class(url, root_dir, relpath, out_fh, out_cb)
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 """
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000126
127 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
128 out_cb=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000129 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000130 self._root_dir = root_dir
131 if self._root_dir:
132 self._root_dir = self._root_dir.replace('/', os.sep)
133 self.relpath = relpath
134 if self.relpath:
135 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000136 if self.relpath and self._root_dir:
137 self.checkout_path = os.path.join(self._root_dir, self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000138 if out_fh is None:
139 out_fh = sys.stdout
140 self.out_fh = out_fh
141 self.out_cb = out_cb
142
143 def Print(self, *args, **kwargs):
144 kwargs.setdefault('file', self.out_fh)
145 if kwargs.pop('timestamp', True):
146 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
147 print(*args, **kwargs)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000148
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000149 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000150 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000151 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000152
153 if not command in commands:
154 raise gclient_utils.Error('Unknown command %s' % command)
155
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000156 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000157 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000158 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000159
160 return getattr(self, command)(options, args, file_list)
161
borenet@google.com4e9be262014-04-08 19:40:30 +0000162 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000163 """Attempt to determine the remote URL for this SCMWrapper."""
borenet@google.com4e9be262014-04-08 19:40:30 +0000164 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000165 if os.path.exists(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgce2fccb2014-05-02 00:57:10 +0000166 actual_remote_url = shlex.split(scm.GIT.Capture(
borenet@google.com88d10082014-03-21 17:24:48 +0000167 ['config', '--local', '--get-regexp', r'remote.*.url'],
borenet@google.comc3e09d22014-04-10 13:58:18 +0000168 cwd=self.checkout_path))[1]
borenet@google.com4e9be262014-04-08 19:40:30 +0000169
170 # If a cache_dir is used, obtain the actual remote URL from the cache.
171 if getattr(self, 'cache_dir', None):
borenet@google.com46d09f62014-04-10 18:50:23 +0000172 url, _ = gclient_utils.SplitUrlRevision(self.url)
173 mirror = git_cache.Mirror(url)
szager@chromium.org848fd492014-04-09 19:06:44 +0000174 if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
borenet@google.com4e9be262014-04-08 19:40:30 +0000175 actual_remote_url.replace('\\', '/')):
szager@chromium.orgce2fccb2014-05-02 00:57:10 +0000176 actual_remote_url = shlex.split(scm.GIT.Capture(
borenet@google.com4e9be262014-04-08 19:40:30 +0000177 ['config', '--local', '--get-regexp', r'remote.*.url'],
szager@chromium.org848fd492014-04-09 19:06:44 +0000178 cwd=mirror.mirror_path))[1]
borenet@google.com4e9be262014-04-08 19:40:30 +0000179 return actual_remote_url
180
181 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000182 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000183 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000184 return None
185
borenet@google.com4e9be262014-04-08 19:40:30 +0000186 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000187 """Determine whether the remote URL of this checkout is the expected URL."""
188 if not os.path.exists(self.checkout_path):
189 # A checkout which doesn't exist can't be broken.
190 return True
191
borenet@google.com4e9be262014-04-08 19:40:30 +0000192 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000193 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000194 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
195 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000196 else:
197 # This may occur if the self.checkout_path exists but does not contain a
198 # valid git or svn checkout.
199 return False
200
borenet@google.comb09097a2014-04-09 19:09:08 +0000201 def _DeleteOrMove(self, force):
202 """Delete the checkout directory or move it out of the way.
203
204 Args:
205 force: bool; if True, delete the directory. Otherwise, just move it.
206 """
borenet@google.comb2256212014-05-07 20:57:28 +0000207 if force and os.environ.get('CHROME_HEADLESS') == '1':
208 self.Print('_____ Conflicting directory found in %s. Removing.'
209 % self.checkout_path)
210 gclient_utils.AddWarning('Conflicting directory %s deleted.'
211 % self.checkout_path)
212 gclient_utils.rmtree(self.checkout_path)
213 else:
214 bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
215 os.path.dirname(self.relpath))
216
217 try:
218 os.makedirs(bad_scm_dir)
219 except OSError as e:
220 if e.errno != errno.EEXIST:
221 raise
222
223 dest_path = tempfile.mkdtemp(
224 prefix=os.path.basename(self.relpath),
225 dir=bad_scm_dir)
226 self.Print('_____ Conflicting directory found in %s. Moving to %s.'
227 % (self.checkout_path, dest_path))
228 gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
229 % (self.checkout_path, dest_path))
230 shutil.move(self.checkout_path, dest_path)
borenet@google.comb09097a2014-04-09 19:09:08 +0000231
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000232
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000233class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000234 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000235 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000236 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000237
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000238 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000239
szager@chromium.org848fd492014-04-09 19:06:44 +0000240 def __init__(self, url=None, *args):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000241 """Removes 'git+' fake prefix from git URL."""
242 if url.startswith('git+http://') or url.startswith('git+https://'):
243 url = url[4:]
szager@chromium.org848fd492014-04-09 19:06:44 +0000244 SCMWrapper.__init__(self, url, *args)
245 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
246 if self.out_cb:
247 filter_kwargs['predicate'] = self.out_cb
248 self.filter = gclient_utils.GitFilter(**filter_kwargs)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000249
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000250 @staticmethod
251 def BinaryExists():
252 """Returns true if the command exists."""
253 try:
254 # We assume git is newer than 1.7. See: crbug.com/114483
255 result, version = scm.GIT.AssertVersion('1.7')
256 if not result:
257 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
258 return result
259 except OSError:
260 return False
261
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000262 def GetCheckoutRoot(self):
263 return scm.GIT.GetCheckoutRoot(self.checkout_path)
264
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000265 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000266 """Returns the given revision's date in ISO-8601 format (which contains the
267 time zone)."""
268 # TODO(floitsch): get the time-stamp of the given revision and not just the
269 # time-stamp of the currently checked out revision.
270 return self._Capture(['log', '-n', '1', '--format=%ai'])
271
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000272 @staticmethod
273 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000274 """'Cleanup' the repo.
275
276 There's no real git equivalent for the svn cleanup command, do a no-op.
277 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000278
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000279 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000280 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000281 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000282
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000283 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000284 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000285 repository.
286
287 The patch file is generated from a diff of the merge base of HEAD and
288 its upstream branch.
289 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000290 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000291 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000292 ['git', 'diff', merge_base],
293 cwd=self.checkout_path,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000294 filter_fn=GitDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000295
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000296 def _FetchAndReset(self, revision, file_list, options):
297 """Equivalent to git fetch; git reset."""
298 quiet = []
299 if not options.verbose:
300 quiet = ['--quiet']
301 self._UpdateBranchHeads(options, fetch=False)
302
szager@chromium.orgff113292014-03-25 06:02:08 +0000303 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000304 fetch_cmd = cfg + ['fetch', self.remote, '--prune']
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000305 self._Run(fetch_cmd + quiet, options, retry=True)
306 self._Run(['reset', '--hard', revision] + quiet, options)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000307 if file_list is not None:
308 files = self._Capture(['ls-files']).splitlines()
309 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
310
msb@chromium.orge28e4982009-09-25 20:51:45 +0000311 def update(self, options, args, file_list):
312 """Runs git to update or transparently checkout the working copy.
313
314 All updated files will be appended to file_list.
315
316 Raises:
317 Error: if can't get URL for relative path.
318 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000319 if args:
320 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
321
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000322 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000323
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000324 # If a dependency is not pinned, track the default remote branch.
325 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000326 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000327 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000328 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000329 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000330 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000331 # Override the revision number.
332 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000333 if revision == 'unmanaged':
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000334 # Check again for a revision in case an initial ref was specified
335 # in the url, for example bla.git@refs/heads/custombranch
336 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000337 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000338 if not revision:
339 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000340
floitsch@google.comeaab7842011-04-28 09:07:58 +0000341 if gclient_utils.IsDateRevision(revision):
342 # Date-revisions only work on git-repositories if the reflog hasn't
343 # expired yet. Use rev-list to get the corresponding revision.
344 # git rev-list -n 1 --before='time-stamp' branchname
345 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000346 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000347 revision = default_rev
348
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000349 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000350 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000351
352 printed_path = False
353 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000354 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000355 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000356 verbose = ['--verbose']
357 printed_path = True
358
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000359 url = self._CreateOrUpdateCache(url, options)
360
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000361 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000362 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000363 elif revision.startswith(self.remote + '/'):
agable@chromium.org69995f42014-04-25 21:43:29 +0000364 # Rewrite remote refs to their local equivalents.
365 revision = 'refs/remotes/' + revision
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000366 rev_type = "branch"
367 else:
368 # hash is also a tag, only make a distinction at checkout
369 rev_type = "hash"
370
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000371 if (not os.path.exists(self.checkout_path) or
372 (os.path.isdir(self.checkout_path) and
373 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
borenet@google.com90fe58b2014-05-01 18:22:00 +0000374 try:
375 self._Clone(revision, url, options)
376 except subprocess2.CalledProcessError:
377 self._DeleteOrMove(options.force)
378 self._Clone(revision, url, options)
jochen@chromium.org048da082014-05-06 08:32:40 +0000379 if deps_revision and deps_revision.startswith('branch-heads/'):
380 deps_branch = deps_revision.replace('branch-heads/', '')
381 self._Capture(['branch', deps_branch, deps_revision])
382 self._Capture(['checkout', '--quiet', deps_branch])
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000383 if file_list is not None:
384 files = self._Capture(['ls-files']).splitlines()
385 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000386 if not verbose:
387 # Make the output a little prettier. It's nice to have some whitespace
388 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000389 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000390 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000391
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000392 if not managed:
393 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000394 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000395 return self._Capture(['rev-parse', '--verify', 'HEAD'])
396
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000397 # See if the url has changed (the unittests use git://foo for the url, let
398 # that through).
399 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
400 return_early = False
401 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
402 # unit test pass. (and update the comment above)
403 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
404 # This allows devs to use experimental repos which have a different url
405 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000406 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000407 url != 'git://foo' and
408 subprocess2.capture(
409 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
410 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000411 self.Print('_____ switching %s to a new upstream' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000412 # Make sure it's clean
413 self._CheckClean(rev_str)
414 # Switch over to the new upstream
415 self._Run(['remote', 'set-url', self.remote, url], options)
416 self._FetchAndReset(revision, file_list, options)
417 return_early = True
418
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000419 if return_early:
420 return self._Capture(['rev-parse', '--verify', 'HEAD'])
421
msb@chromium.org5bde4852009-12-14 16:47:12 +0000422 cur_branch = self._GetCurrentBranch()
423
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000424 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000425 # 0) HEAD is detached. Probably from our initial clone.
426 # - make sure HEAD is contained by a named ref, then update.
427 # Cases 1-4. HEAD is a branch.
428 # 1) current branch is not tracking a remote branch (could be git-svn)
429 # - try to rebase onto the new hash or branch
430 # 2) current branch is tracking a remote branch with local committed
431 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000432 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000433 # 3) current branch is tracking a remote branch w/or w/out changes,
434 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000435 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000436 # 4) current branch is tracking a remote branch, switches to a different
437 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000438 # - exit
439
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000440 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
441 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000442 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
443 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000444 if cur_branch is None:
445 upstream_branch = None
446 current_type = "detached"
447 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000448 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000449 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
450 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
451 current_type = "hash"
452 logging.debug("Current branch is not tracking an upstream (remote)"
453 " branch.")
454 elif upstream_branch.startswith('refs/remotes'):
455 current_type = "branch"
456 else:
457 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000458
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000459 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000460 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000461 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000462 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000463 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000464 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000465
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000466 self._UpdateBranchHeads(options, fetch=True)
467
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000468 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000469 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000470 target = 'HEAD'
471 if options.upstream and upstream_branch:
472 target = upstream_branch
473 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474
msb@chromium.org786fb682010-06-02 15:16:23 +0000475 if current_type == 'detached':
476 # case 0
477 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000478 self._CheckDetachedHead(rev_str, options)
szager@chromium.org848fd492014-04-09 19:06:44 +0000479 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
480 self.Print('Up-to-date; skipping checkout.')
481 else:
482 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000483 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000484 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000485 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000486 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000487 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000488 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000489 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000490 newbase=revision, printed_path=printed_path,
491 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 printed_path = True
493 else:
494 # Can't find a merge-base since we don't know our upstream. That makes
495 # this command VERY likely to produce a rebase failure. For now we
496 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000497 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000498 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000499 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000500 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000501 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000502 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000503 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000504 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000505 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000506 newbase=revision, printed_path=printed_path,
507 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000508 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000509 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000511 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000512 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000513 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000514 switch_error = ("Switching upstream branch from %s to %s\n"
515 % (upstream_branch, new_base) +
516 "Please merge or rebase manually:\n" +
517 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
518 "OR git checkout -b <some new branch> %s" % new_base)
519 raise gclient_utils.Error(switch_error)
520 else:
521 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000522 if files is not None:
523 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000524 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000525 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000526 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000527 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000528 if options.merge:
529 merge_args.append('--ff')
530 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000531 merge_args.append('--ff-only')
532 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000533 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000534 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000535 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000536 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000537 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000538 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000539 printed_path = True
540 while True:
541 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000542 action = self._AskForData(
543 'Cannot %s, attempt to rebase? '
544 '(y)es / (q)uit / (s)kip : ' %
545 ('merge' if options.merge else 'fast-forward merge'),
546 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000547 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000548 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000549 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000550 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000551 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000552 printed_path = True
553 break
554 elif re.match(r'quit|q', action, re.I):
555 raise gclient_utils.Error("Can't fast-forward, please merge or "
556 "rebase manually.\n"
557 "cd %s && git " % self.checkout_path
558 + "rebase %s" % upstream_branch)
559 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000560 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000561 return
562 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000563 self.Print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000564 elif re.match("error: Your local changes to '.*' would be "
565 "overwritten by merge. Aborting.\nPlease, commit your "
566 "changes or stash them before you can merge.\n",
567 e.stderr):
568 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000569 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000570 printed_path = True
571 raise gclient_utils.Error(e.stderr)
572 else:
573 # Some other problem happened with the merge
574 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000575 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000576 raise
577 else:
578 # Fast-forward merge was successful
579 if not re.match('Already up-to-date.', merge_output) or verbose:
580 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000581 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000582 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000583 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000584 if not verbose:
585 # Make the output a little prettier. It's nice to have some
586 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000587 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000588
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000589 if file_list is not None:
590 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000591
592 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000593 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000594 raise gclient_utils.Error('\n____ %s%s\n'
595 '\nConflict while rebasing this branch.\n'
596 'Fix the conflict and run gclient again.\n'
597 'See man git-rebase for details.\n'
598 % (self.relpath, rev_str))
599
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000600 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000601 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
602 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000603
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000604 # If --reset and --delete_unversioned_trees are specified, remove any
605 # untracked directories.
606 if options.reset and options.delete_unversioned_trees:
607 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
608 # merge-base by default), so doesn't include untracked files. So we use
609 # 'git ls-files --directory --others --exclude-standard' here directly.
610 paths = scm.GIT.Capture(
611 ['ls-files', '--directory', '--others', '--exclude-standard'],
612 self.checkout_path)
613 for path in (p for p in paths.splitlines() if p.endswith('/')):
614 full_path = os.path.join(self.checkout_path, path)
615 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000616 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000617 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000618
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000619 return self._Capture(['rev-parse', '--verify', 'HEAD'])
620
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000621
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000622 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000623 """Reverts local modifications.
624
625 All reverted files will be appended to file_list.
626 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000627 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000628 # revert won't work if the directory doesn't exist. It needs to
629 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000630 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000631 # Don't reuse the args.
632 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000633
634 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000635 if options.upstream:
636 if self._GetCurrentBranch():
637 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
638 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000639 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000640 if not deps_revision:
641 deps_revision = default_rev
642 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000643 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000644 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000645
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000646 if file_list is not None:
647 files = self._Capture(['diff', deps_revision, '--name-only']).split()
648
maruel@chromium.org37e89872010-09-07 16:11:33 +0000649 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000650 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000651
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000652 if file_list is not None:
653 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
654
655 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000656 """Returns revision"""
657 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000658
msb@chromium.orge28e4982009-09-25 20:51:45 +0000659 def runhooks(self, options, args, file_list):
660 self.status(options, args, file_list)
661
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000662 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000663 """Display status information."""
664 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000665 self.Print('________ couldn\'t run status in %s:\n'
666 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000667 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000668 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000669 self._Run(['diff', '--name-status', merge_base], options,
670 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000671 if file_list is not None:
672 files = self._Capture(['diff', '--name-only', merge_base]).split()
673 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000674
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000675 def GetUsableRev(self, rev, options):
676 """Finds a useful revision for this repository.
677
678 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
679 will be called on the source."""
680 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000681 if not os.path.isdir(self.checkout_path):
682 raise gclient_utils.Error(
683 ( 'We could not find a valid hash for safesync_url response "%s".\n'
684 'Safesync URLs with a git checkout currently require the repo to\n'
685 'be cloned without a safesync_url before adding the safesync_url.\n'
686 'For more info, see: '
687 'http://code.google.com/p/chromium/wiki/UsingNewGit'
688 '#Initial_checkout' ) % rev)
689 elif rev.isdigit() and len(rev) < 7:
690 # Handles an SVN rev. As an optimization, only verify an SVN revision as
691 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000692 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000693 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
694 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000695 try:
696 logging.debug('Looking for git-svn configuration optimizations.')
697 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
698 cwd=self.checkout_path):
699 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
700 except subprocess2.CalledProcessError:
701 logging.debug('git config --get svn-remote.svn.fetch failed, '
702 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000703 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000704 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000705 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000706 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000707 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
708 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000709 except gclient_utils.Error, e:
710 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000711 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000712 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
713 'the closest sane git revision, which is:\n'
714 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000715 if not sha1:
716 raise gclient_utils.Error(
717 ( 'It appears that either your git-svn remote is incorrectly\n'
718 'configured or the revision in your safesync_url is\n'
719 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
720 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000721 else:
722 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
723 sha1 = rev
724 else:
725 # May exist in origin, but we don't have it yet, so fetch and look
726 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000727 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000728 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
729 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000730
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000731 if not sha1:
732 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000733 ( 'We could not find a valid hash for safesync_url response "%s".\n'
734 'Safesync URLs with a git checkout currently require a git-svn\n'
735 'remote or a safesync_url that provides git sha1s. Please add a\n'
736 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000737 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000738 '#Initial_checkout' ) % rev)
739
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000740 return sha1
741
msb@chromium.orge6f78352010-01-13 17:05:33 +0000742 def FullUrlForRelativeUrl(self, url):
743 # Strip from last '/'
744 # Equivalent to unix basename
745 base_url = self.url
746 return base_url[:base_url.rfind('/')] + url
747
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000748 def _CreateOrUpdateCache(self, url, options):
749 """Make a new git mirror or update existing mirror for |url|, and return the
750 mirror URI to clone from.
751
752 If no cache-dir is specified, just return |url| unchanged.
753 """
754 if not self.cache_dir:
755 return url
hinoka@google.comb1b54572014-04-16 22:29:23 +0000756 mirror_kwargs = {
757 'print_func': self.filter,
758 'refs': []
759 }
hinoka@google.com356cb5f2014-04-25 00:02:21 +0000760 # TODO(hinoka): This currently just fails because lkcr/lkgr are branches
761 # not tags. This also adds 20 seconds to every bot_update
762 # run, so I'm commenting this out until lkcr/lkgr become
763 # tags. (2014/4/24)
764 # if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
765 # mirror_kwargs['refs'].extend(['refs/tags/lkgr', 'refs/tags/lkcr'])
hinoka@google.comb1b54572014-04-16 22:29:23 +0000766 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
767 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org848fd492014-04-09 19:06:44 +0000768 mirror = git_cache.Mirror(url, **mirror_kwargs)
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000769 if options.shallow:
770 # HACK(hinoka): These repositories should be super shallow.
771 if 'flash' in url:
772 depth = 10
773 else:
774 depth = 10000
775 else:
776 depth = None
777 mirror.populate(verbose=options.verbose, bootstrap=True, depth=depth)
szager@chromium.org848fd492014-04-09 19:06:44 +0000778 mirror.unlock()
779 return mirror.mirror_path if mirror.exists() else None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000780
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000781 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000782 """Clone a git repository from the given URL.
783
msb@chromium.org786fb682010-06-02 15:16:23 +0000784 Once we've cloned the repo, we checkout a working branch if the specified
785 revision is a branch head. If it is a tag or a specific commit, then we
786 leave HEAD detached as it makes future updates simpler -- in this case the
787 user should first create a new branch or switch to an existing branch before
788 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000789 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000790 # git clone doesn't seem to insert a newline properly before printing
791 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000792 self.Print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000793 template_path = os.path.join(
794 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000795 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000796 clone_cmd = cfg + [
797 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000798 if self.cache_dir:
799 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000800 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000801 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000802 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000803 # If the parent directory does not exist, Git clone on Windows will not
804 # create it, so we need to do it manually.
805 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000806 gclient_utils.safe_makedirs(parent_dir)
807 tmp_dir = tempfile.mkdtemp(
808 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
809 dir=parent_dir)
810 try:
811 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000812 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000813 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000814 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
815 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000816 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000817 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000818 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000819 finally:
820 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000821 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000822 gclient_utils.rmtree(tmp_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000823 self._UpdateBranchHeads(options, fetch=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000824 self._Run(['checkout', '--quiet', revision.replace('refs/heads/', '')],
825 options)
826 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000827 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000828 self.Print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000829 ('Checked out %s to a detached HEAD. Before making any commits\n'
830 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000831 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
832 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000833
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000834 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000835 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000836 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000837 raise gclient_utils.Error("Background task requires input. Rerun "
838 "gclient with --jobs=1 so that\n"
839 "interaction is possible.")
840 try:
841 return raw_input(prompt)
842 except KeyboardInterrupt:
843 # Hide the exception.
844 sys.exit(1)
845
846
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000847 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000848 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000849 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000850 if files is not None:
851 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000852 revision = upstream
853 if newbase:
854 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000855 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000856 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000857 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000858 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000859 printed_path = True
860 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000861 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000862
863 if merge:
864 merge_output = self._Capture(['merge', revision])
865 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000866 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000867 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000868
869 # Build the rebase command here using the args
870 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
871 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000872 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000873 rebase_cmd.append('--verbose')
874 if newbase:
875 rebase_cmd.extend(['--onto', newbase])
876 rebase_cmd.append(upstream)
877 if branch:
878 rebase_cmd.append(branch)
879
880 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000881 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000882 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000883 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
884 re.match(r'cannot rebase: your index contains uncommitted changes',
885 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000886 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000887 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000888 'Cannot rebase because of unstaged changes.\n'
889 '\'git reset --hard HEAD\' ?\n'
890 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000891 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000892 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000893 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000894 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000895 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000896 break
897 elif re.match(r'quit|q', rebase_action, re.I):
898 raise gclient_utils.Error("Please merge or rebase manually\n"
899 "cd %s && git " % self.checkout_path
900 + "%s" % ' '.join(rebase_cmd))
901 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000902 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000903 continue
904 else:
905 gclient_utils.Error("Input not recognized")
906 continue
907 elif re.search(r'^CONFLICT', e.stdout, re.M):
908 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
909 "Fix the conflict and run gclient again.\n"
910 "See 'man git-rebase' for details.\n")
911 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000912 self.Print(e.stdout.strip())
913 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000914 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
915 "manually.\ncd %s && git " %
916 self.checkout_path
917 + "%s" % ' '.join(rebase_cmd))
918
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000919 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000920 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000921 # Make the output a little prettier. It's nice to have some
922 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000923 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000924
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000925 @staticmethod
926 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000927 (ok, current_version) = scm.GIT.AssertVersion(min_version)
928 if not ok:
929 raise gclient_utils.Error('git version %s < minimum required %s' %
930 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000931
msb@chromium.org786fb682010-06-02 15:16:23 +0000932 def _IsRebasing(self):
933 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
934 # have a plumbing command to determine whether a rebase is in progress, so
935 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
936 g = os.path.join(self.checkout_path, '.git')
937 return (
938 os.path.isdir(os.path.join(g, "rebase-merge")) or
939 os.path.isdir(os.path.join(g, "rebase-apply")))
940
941 def _CheckClean(self, rev_str):
942 # Make sure the tree is clean; see git-rebase.sh for reference
943 try:
944 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000945 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000946 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000947 raise gclient_utils.Error('\n____ %s%s\n'
948 '\tYou have unstaged changes.\n'
949 '\tPlease commit, stash, or reset.\n'
950 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000951 try:
952 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000953 '--ignore-submodules', 'HEAD', '--'],
954 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000955 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000956 raise gclient_utils.Error('\n____ %s%s\n'
957 '\tYour index contains uncommitted changes\n'
958 '\tPlease commit, stash, or reset.\n'
959 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000960
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000961 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000962 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
963 # reference by a commit). If not, error out -- most likely a rebase is
964 # in progress, try to detect so we can give a better error.
965 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000966 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
967 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000968 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000969 # Commit is not contained by any rev. See if the user is rebasing:
970 if self._IsRebasing():
971 # Punt to the user
972 raise gclient_utils.Error('\n____ %s%s\n'
973 '\tAlready in a conflict, i.e. (no branch).\n'
974 '\tFix the conflict and run gclient again.\n'
975 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
976 '\tSee man git-rebase for details.\n'
977 % (self.relpath, rev_str))
978 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000979 name = ('saved-by-gclient-' +
980 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000981 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000982 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000983 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000984
msb@chromium.org5bde4852009-12-14 16:47:12 +0000985 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000986 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000987 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000988 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000989 return None
990 return branch
991
borenet@google.comc3e09d22014-04-10 13:58:18 +0000992 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000993 kwargs.setdefault('cwd', self.checkout_path)
994 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +0000995 env = scm.GIT.ApplyEnvVars(kwargs)
996 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000997
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000998 def _UpdateBranchHeads(self, options, fetch=False):
999 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1000 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001001 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001002 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1003 '^\\+refs/branch-heads/\\*:.*$']
1004 self._Run(config_cmd, options)
1005 if fetch:
szager@chromium.orgff113292014-03-25 06:02:08 +00001006 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +00001007 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001008 if options.verbose:
1009 fetch_cmd.append('--verbose')
1010 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001011
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001012 def _Run(self, args, options, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001013 cwd = kwargs.setdefault('cwd', self.checkout_path)
1014 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001015 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001016 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001017 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001018 cmd = ['git'] + args
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001019 header = "running '%s' in '%s'" % (' '.join(cmd), cwd)
szager@chromium.org848fd492014-04-09 19:06:44 +00001020 self.filter(header)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001021 return gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001022
1023
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001024class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001025 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001026 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001027
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001028 @staticmethod
1029 def BinaryExists():
1030 """Returns true if the command exists."""
1031 try:
1032 result, version = scm.SVN.AssertVersion('1.4')
1033 if not result:
1034 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1035 return result
1036 except OSError:
1037 return False
1038
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001039 def GetCheckoutRoot(self):
1040 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1041
floitsch@google.comeaab7842011-04-28 09:07:58 +00001042 def GetRevisionDate(self, revision):
1043 """Returns the given revision's date in ISO-8601 format (which contains the
1044 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001045 date = scm.SVN.Capture(
1046 ['propget', '--revprop', 'svn:date', '-r', revision],
1047 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001048 return date.strip()
1049
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001050 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001051 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001052 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001053
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001054 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001055 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001056 if not os.path.isdir(self.checkout_path):
1057 raise gclient_utils.Error('Directory %s is not present.' %
1058 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001059 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001060
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001061 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001062 """Generates a patch file which can be applied to the root of the
1063 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001064 if not os.path.isdir(self.checkout_path):
1065 raise gclient_utils.Error('Directory %s is not present.' %
1066 self.checkout_path)
1067 gclient_utils.CheckCallAndFilter(
1068 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1069 cwd=self.checkout_path,
1070 print_stdout=False,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001071 filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001072
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001073 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001074 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001075
1076 All updated files will be appended to file_list.
1077
1078 Raises:
1079 Error: if can't get URL for relative path.
1080 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001081 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001082 hg_path = os.path.join(self.checkout_path, '.hg')
1083 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001084 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001085 return
1086
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001087 if args:
1088 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1089
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001090 # revision is the revision to match. It is None if no revision is specified,
1091 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001092 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001093 # Keep the original unpinned url for reference in case the repo is switched.
1094 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001095 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001096 if options.revision:
1097 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001098 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001099 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001100 if revision != 'unmanaged':
1101 forced_revision = True
1102 # Reconstruct the url.
1103 url = '%s@%s' % (url, revision)
1104 rev_str = ' at %s' % revision
1105 else:
1106 managed = False
1107 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001108 else:
1109 forced_revision = False
1110 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001111
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001112 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001113 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001114 # Git is only okay if it's a git-svn checkout of the right repo.
1115 if scm.GIT.IsGitSvn(self.checkout_path):
1116 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1117 'svn-remote.svn.url'],
1118 cwd=self.checkout_path).rstrip()
1119 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001120 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1121 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001122 return # TODO(borenet): Get the svn revision number?
1123
1124 # Get the existing scm url and the revision number of the current checkout.
1125 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001126 try:
1127 from_info = scm.SVN.CaptureLocalInfo(
1128 [], os.path.join(self.checkout_path, '.'))
1129 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001130 self._DeleteOrMove(options.force)
1131 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001132
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001133 BASE_URLS = {
1134 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1135 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1136 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001137 WHITELISTED_ROOTS = [
1138 'svn://svn.chromium.org',
1139 'svn://svn-mirror.golo.chromium.org',
1140 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001141 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001142 try:
1143 # Split out the revision number since it's not useful for us.
1144 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001145 # Check to see if we're on a whitelisted root. We do this because
1146 # only some svn servers have matching UUIDs.
1147 local_parsed = urlparse.urlparse(url)
1148 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001149 if ('CHROME_HEADLESS' in os.environ
1150 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001151 and base_path in BASE_URLS
1152 and local_root in WHITELISTED_ROOTS):
1153
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001154 # Use a tarball for initial sync if we are on a bot.
1155 # Get an unauthenticated gsutil instance.
1156 gsutil = download_from_google_storage.Gsutil(
1157 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1158
1159 gs_path = BASE_URLS[base_path]
1160 _, out, _ = gsutil.check_call('ls', gs_path)
1161 # So that we can get the most recent revision.
1162 sorted_items = sorted(out.splitlines())
1163 latest_checkout = sorted_items[-1]
1164
1165 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001166 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001167 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1168 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001169 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001170 raise Exception()
1171 filename = latest_checkout.split('/')[-1]
1172 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001173 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001174 gclient_utils.safe_makedirs(self.checkout_path)
1175 # TODO(hinoka): Use 7z for windows.
1176 cmd = ['tar', '--extract', '--ungzip',
1177 '--directory', self.checkout_path,
1178 '--file', tarball]
1179 gclient_utils.CheckCallAndFilter(
1180 cmd, stdout=sys.stdout, print_stdout=True)
1181
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001182 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001183 gclient_utils.rmtree(tempdir)
1184
1185 # Rewrite the repository root to match.
1186 tarball_url = scm.SVN.CaptureLocalInfo(
1187 ['.'], self.checkout_path)['Repository Root']
1188 tarball_parsed = urlparse.urlparse(tarball_url)
1189 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1190 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001191
1192 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001193 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001194 self._Run(['switch', '--relocate', tarball_root,
1195 local_root, self.checkout_path],
1196 options)
1197 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001198 self.Print('We tried to get a source tarball but failed.')
1199 self.Print('Resuming normal operations.')
1200 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001201
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001202 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001203 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001204 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001205 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001206 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001207 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001208
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001209 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001210 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001211 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1212 return self.Svnversion()
1213 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001214
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001215 if 'URL' not in from_info:
1216 raise gclient_utils.Error(
1217 ('gclient is confused. Couldn\'t get the url for %s.\n'
1218 'Try using @unmanaged.\n%s') % (
1219 self.checkout_path, from_info))
1220
stip@chromium.org3031d732014-04-21 22:18:02 +00001221 # Look for locked directories.
1222 dir_info = scm.SVN.CaptureStatus(
1223 None, os.path.join(self.checkout_path, '.'))
1224 if any(d[0][2] == 'L' for d in dir_info):
1225 try:
1226 self._Run(['cleanup', self.checkout_path], options)
1227 except subprocess2.CalledProcessError, e:
1228 # Get the status again, svn cleanup may have cleaned up at least
1229 # something.
1230 dir_info = scm.SVN.CaptureStatus(
1231 None, os.path.join(self.checkout_path, '.'))
1232
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001233 # Try to fix the failures by removing troublesome files.
1234 for d in dir_info:
1235 if d[0][2] == 'L':
1236 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001237 # We don't pass any files/directories to CaptureStatus and set
1238 # cwd=self.checkout_path, so we should get relative paths here.
1239 assert not os.path.isabs(d[1])
1240 path_to_remove = os.path.normpath(
1241 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001242 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001243 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001244 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001245 self.Print(
1246 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001247 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001248 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001249 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001250
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001251 # Retrieve the current HEAD version because svn is slow at null updates.
1252 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001253 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001254 revision = str(from_info_live['Revision'])
1255 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001256
borenet@google.comb09097a2014-04-09 19:09:08 +00001257 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001258 # The repository url changed, need to switch.
1259 try:
1260 to_info = scm.SVN.CaptureRemoteInfo(url)
1261 except (gclient_utils.Error, subprocess2.CalledProcessError):
1262 # The url is invalid or the server is not accessible, it's safer to bail
1263 # out right now.
1264 raise gclient_utils.Error('This url is unreachable: %s' % url)
1265 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1266 and (from_info['UUID'] == to_info['UUID']))
1267 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001268 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001269 # We have different roots, so check if we can switch --relocate.
1270 # Subversion only permits this if the repository UUIDs match.
1271 # Perform the switch --relocate, then rewrite the from_url
1272 # to reflect where we "are now." (This is the same way that
1273 # Subversion itself handles the metadata when switch --relocate
1274 # is used.) This makes the checks below for whether we
1275 # can update to a revision or have to switch to a different
1276 # branch work as expected.
1277 # TODO(maruel): TEST ME !
1278 command = ['switch', '--relocate',
1279 from_info['Repository Root'],
1280 to_info['Repository Root'],
1281 self.relpath]
1282 self._Run(command, options, cwd=self._root_dir)
1283 from_info['URL'] = from_info['URL'].replace(
1284 from_info['Repository Root'],
1285 to_info['Repository Root'])
1286 else:
1287 if not options.force and not options.reset:
1288 # Look for local modifications but ignore unversioned files.
1289 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1290 if status[0][0] != '?':
1291 raise gclient_utils.Error(
1292 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1293 'there is local changes in %s. Delete the directory and '
1294 'try again.') % (url, self.checkout_path))
1295 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001296 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001297 gclient_utils.rmtree(self.checkout_path)
1298 # We need to checkout.
1299 command = ['checkout', url, self.checkout_path]
1300 command = self._AddAdditionalUpdateFlags(command, options, revision)
1301 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1302 return self.Svnversion()
1303
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001304 # If the provided url has a revision number that matches the revision
1305 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001306 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001307 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001308 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001309 else:
1310 command = ['update', self.checkout_path]
1311 command = self._AddAdditionalUpdateFlags(command, options, revision)
1312 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001313
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001314 # If --reset and --delete_unversioned_trees are specified, remove any
1315 # untracked files and directories.
1316 if options.reset and options.delete_unversioned_trees:
1317 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1318 full_path = os.path.join(self.checkout_path, status[1])
1319 if (status[0][0] == '?'
1320 and os.path.isdir(full_path)
1321 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001322 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001323 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001324 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001325
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001326 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001327 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001328 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001329 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001330 # Create an empty checkout and then update the one file we want. Future
1331 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001332 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001333 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001334 if os.path.exists(os.path.join(self.checkout_path, filename)):
1335 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001336 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001337 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001338 # After the initial checkout, we can use update as if it were any other
1339 # dep.
1340 self.update(options, args, file_list)
1341 else:
1342 # If the installed version of SVN doesn't support --depth, fallback to
1343 # just exporting the file. This has the downside that revision
1344 # information is not stored next to the file, so we will have to
1345 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001346 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001347 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001348 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001349 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001350 command = self._AddAdditionalUpdateFlags(command, options,
1351 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001352 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001353
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001354 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001355 """Reverts local modifications. Subversion specific.
1356
1357 All reverted files will be appended to file_list, even if Subversion
1358 doesn't know about them.
1359 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001360 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001361 if os.path.exists(self.checkout_path):
1362 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001363 # svn revert won't work if the directory doesn't exist. It needs to
1364 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001365 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001366 # Don't reuse the args.
1367 return self.update(options, [], file_list)
1368
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001369 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001370 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001371 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001372 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001373 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001374 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001375 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001376 if not options.force:
1377 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001378 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001379 '\n_____ %s is not a valid svn checkout, synching instead' %
1380 self.relpath)
1381 gclient_utils.rmtree(self.checkout_path)
1382 # Don't reuse the args.
1383 return self.update(options, [], file_list)
1384
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001385 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001386 if file_list is not None:
1387 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001388 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001389 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001390 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001391 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001392 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001393
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001394 # Revert() may delete the directory altogether.
1395 if not os.path.isdir(self.checkout_path):
1396 # Don't reuse the args.
1397 return self.update(options, [], file_list)
1398
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001399 try:
1400 # svn revert is so broken we don't even use it. Using
1401 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001402 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001403 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1404 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001405 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001406 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001407 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001408
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001409 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001410 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001411 try:
1412 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001413 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001414 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001415
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001416 def runhooks(self, options, args, file_list):
1417 self.status(options, args, file_list)
1418
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001419 def status(self, options, args, file_list):
1420 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001421 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001422 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001423 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001424 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001425 'The directory does not exist.') %
1426 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001427 # There's no file list to retrieve.
1428 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001429 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001430
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001431 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001432 """Verifies the validity of the revision for this repository."""
1433 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1434 raise gclient_utils.Error(
1435 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1436 'correct.') % rev)
1437 return rev
1438
msb@chromium.orge6f78352010-01-13 17:05:33 +00001439 def FullUrlForRelativeUrl(self, url):
1440 # Find the forth '/' and strip from there. A bit hackish.
1441 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001442
maruel@chromium.org669600d2010-09-01 19:06:31 +00001443 def _Run(self, args, options, **kwargs):
1444 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001445 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001446 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001447 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001448
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001449 def Svnversion(self):
1450 """Runs the lowest checked out revision in the current project."""
1451 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1452 return info['Revision']
1453
maruel@chromium.org669600d2010-09-01 19:06:31 +00001454 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1455 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001456 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001457 scm.SVN.RunAndGetFileList(
1458 options.verbose,
1459 args + ['--ignore-externals'],
1460 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001461 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001462
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001463 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001464 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001465 """Add additional flags to command depending on what options are set.
1466 command should be a list of strings that represents an svn command.
1467
1468 This method returns a new list to be used as a command."""
1469 new_command = command[:]
1470 if revision:
1471 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001472 # We don't want interaction when jobs are used.
1473 if options.jobs > 1:
1474 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001475 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001476 # --accept was added to 'svn update' in svn 1.6.
1477 if not scm.SVN.AssertVersion('1.5')[0]:
1478 return new_command
1479
1480 # It's annoying to have it block in the middle of a sync, just sensible
1481 # defaults.
1482 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001483 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001484 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1485 new_command.extend(('--accept', 'theirs-conflict'))
1486 elif options.manually_grab_svn_rev:
1487 new_command.append('--force')
1488 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1489 new_command.extend(('--accept', 'postpone'))
1490 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1491 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001492 return new_command