blob: 67d68674e04fd5f0c42084529551a1fa35c181f5 [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
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000359 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000360 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000361 elif revision.startswith(self.remote + '/'):
agable@chromium.org69995f42014-04-25 21:43:29 +0000362 # Rewrite remote refs to their local equivalents.
363 revision = 'refs/remotes/' + revision
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000364 rev_type = "branch"
365 else:
366 # hash is also a tag, only make a distinction at checkout
367 rev_type = "hash"
368
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000369 mirror = self._GetMirror(url, options)
370 if mirror:
371 url = mirror.mirror_path
372
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000373 if (not os.path.exists(self.checkout_path) or
374 (os.path.isdir(self.checkout_path) and
375 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000376 if mirror:
377 self._UpdateMirror(mirror, options)
borenet@google.com90fe58b2014-05-01 18:22:00 +0000378 try:
379 self._Clone(revision, url, options)
380 except subprocess2.CalledProcessError:
381 self._DeleteOrMove(options.force)
382 self._Clone(revision, url, options)
jochen@chromium.org048da082014-05-06 08:32:40 +0000383 if deps_revision and deps_revision.startswith('branch-heads/'):
384 deps_branch = deps_revision.replace('branch-heads/', '')
385 self._Capture(['branch', deps_branch, deps_revision])
386 self._Capture(['checkout', '--quiet', deps_branch])
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000387 if file_list is not None:
388 files = self._Capture(['ls-files']).splitlines()
389 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000390 if not verbose:
391 # Make the output a little prettier. It's nice to have some whitespace
392 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000393 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000394 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000395
szager@chromium.org3dc5cb72014-06-17 15:06:05 +0000396 if not managed:
397 self._UpdateBranchHeads(options, fetch=False)
398 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
399 return self._Capture(['rev-parse', '--verify', 'HEAD'])
400
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000401 if mirror:
402 self._UpdateMirror(mirror, options)
403
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000404 # See if the url has changed (the unittests use git://foo for the url, let
405 # that through).
406 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
407 return_early = False
408 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
409 # unit test pass. (and update the comment above)
410 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
411 # This allows devs to use experimental repos which have a different url
412 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000413 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000414 url != 'git://foo' and
415 subprocess2.capture(
416 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
417 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000418 self.Print('_____ switching %s to a new upstream' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000419 # Make sure it's clean
420 self._CheckClean(rev_str)
421 # Switch over to the new upstream
422 self._Run(['remote', 'set-url', self.remote, url], options)
423 self._FetchAndReset(revision, file_list, options)
424 return_early = True
425
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000426 if return_early:
427 return self._Capture(['rev-parse', '--verify', 'HEAD'])
428
msb@chromium.org5bde4852009-12-14 16:47:12 +0000429 cur_branch = self._GetCurrentBranch()
430
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000431 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000432 # 0) HEAD is detached. Probably from our initial clone.
433 # - make sure HEAD is contained by a named ref, then update.
434 # Cases 1-4. HEAD is a branch.
435 # 1) current branch is not tracking a remote branch (could be git-svn)
436 # - try to rebase onto the new hash or branch
437 # 2) current branch is tracking a remote branch with local committed
438 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000439 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000440 # 3) current branch is tracking a remote branch w/or w/out changes,
441 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000442 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000443 # 4) current branch is tracking a remote branch, switches to a different
444 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000445 # - exit
446
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000447 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
448 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000449 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
450 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000451 if cur_branch is None:
452 upstream_branch = None
453 current_type = "detached"
454 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000455 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000456 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
457 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
458 current_type = "hash"
459 logging.debug("Current branch is not tracking an upstream (remote)"
460 " branch.")
461 elif upstream_branch.startswith('refs/remotes'):
462 current_type = "branch"
463 else:
464 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000465
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000466 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000467 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000468 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000469 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000470 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000471 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000472
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000473 self._UpdateBranchHeads(options, fetch=True)
474
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000475 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000476 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000477 target = 'HEAD'
478 if options.upstream and upstream_branch:
479 target = upstream_branch
480 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000481
msb@chromium.org786fb682010-06-02 15:16:23 +0000482 if current_type == 'detached':
483 # case 0
484 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000485 self._CheckDetachedHead(rev_str, options)
szager@chromium.org848fd492014-04-09 19:06:44 +0000486 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
487 self.Print('Up-to-date; skipping checkout.')
488 else:
489 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000490 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000491 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000492 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000493 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000494 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000495 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000496 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000497 newbase=revision, printed_path=printed_path,
498 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000499 printed_path = True
500 else:
501 # Can't find a merge-base since we don't know our upstream. That makes
502 # this command VERY likely to produce a rebase failure. For now we
503 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000504 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000505 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000506 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000507 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000508 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000509 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000510 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000511 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000512 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000513 newbase=revision, printed_path=printed_path,
514 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000515 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000516 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000517 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000518 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000519 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000520 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 switch_error = ("Switching upstream branch from %s to %s\n"
522 % (upstream_branch, new_base) +
523 "Please merge or rebase manually:\n" +
524 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
525 "OR git checkout -b <some new branch> %s" % new_base)
526 raise gclient_utils.Error(switch_error)
527 else:
528 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000529 if files is not None:
530 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000531 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000532 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000533 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000534 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000535 if options.merge:
536 merge_args.append('--ff')
537 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000538 merge_args.append('--ff-only')
539 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000540 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000541 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000542 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000543 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000544 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000545 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000546 printed_path = True
547 while True:
548 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000549 action = self._AskForData(
550 'Cannot %s, attempt to rebase? '
551 '(y)es / (q)uit / (s)kip : ' %
552 ('merge' if options.merge else 'fast-forward merge'),
553 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000554 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000555 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000556 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000557 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000558 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000559 printed_path = True
560 break
561 elif re.match(r'quit|q', action, re.I):
562 raise gclient_utils.Error("Can't fast-forward, please merge or "
563 "rebase manually.\n"
564 "cd %s && git " % self.checkout_path
565 + "rebase %s" % upstream_branch)
566 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000567 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000568 return
569 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000570 self.Print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000571 elif re.match("error: Your local changes to '.*' would be "
572 "overwritten by merge. Aborting.\nPlease, commit your "
573 "changes or stash them before you can merge.\n",
574 e.stderr):
575 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000576 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000577 printed_path = True
578 raise gclient_utils.Error(e.stderr)
579 else:
580 # Some other problem happened with the merge
581 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000582 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000583 raise
584 else:
585 # Fast-forward merge was successful
586 if not re.match('Already up-to-date.', merge_output) or verbose:
587 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000588 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000589 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000590 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000591 if not verbose:
592 # Make the output a little prettier. It's nice to have some
593 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000594 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000595
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000596 if file_list is not None:
597 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000598
599 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000600 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000601 raise gclient_utils.Error('\n____ %s%s\n'
602 '\nConflict while rebasing this branch.\n'
603 'Fix the conflict and run gclient again.\n'
604 'See man git-rebase for details.\n'
605 % (self.relpath, rev_str))
606
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000607 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000608 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
609 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000610
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000611 # If --reset and --delete_unversioned_trees are specified, remove any
612 # untracked directories.
613 if options.reset and options.delete_unversioned_trees:
614 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
615 # merge-base by default), so doesn't include untracked files. So we use
616 # 'git ls-files --directory --others --exclude-standard' here directly.
617 paths = scm.GIT.Capture(
618 ['ls-files', '--directory', '--others', '--exclude-standard'],
619 self.checkout_path)
620 for path in (p for p in paths.splitlines() if p.endswith('/')):
621 full_path = os.path.join(self.checkout_path, path)
622 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000623 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000624 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000625
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000626 return self._Capture(['rev-parse', '--verify', 'HEAD'])
627
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000628
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000629 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000630 """Reverts local modifications.
631
632 All reverted files will be appended to file_list.
633 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000634 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000635 # revert won't work if the directory doesn't exist. It needs to
636 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000637 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000638 # Don't reuse the args.
639 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000640
641 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000642 if options.upstream:
643 if self._GetCurrentBranch():
644 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
645 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000646 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000647 if not deps_revision:
648 deps_revision = default_rev
649 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000650 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000651 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000652
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000653 if file_list is not None:
654 files = self._Capture(['diff', deps_revision, '--name-only']).split()
655
maruel@chromium.org37e89872010-09-07 16:11:33 +0000656 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000657 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000658
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000659 if file_list is not None:
660 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
661
662 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000663 """Returns revision"""
664 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000665
msb@chromium.orge28e4982009-09-25 20:51:45 +0000666 def runhooks(self, options, args, file_list):
667 self.status(options, args, file_list)
668
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000669 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000670 """Display status information."""
671 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000672 self.Print('________ couldn\'t run status in %s:\n'
673 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000674 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000675 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000676 self._Run(['diff', '--name-status', merge_base], options,
677 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000678 if file_list is not None:
679 files = self._Capture(['diff', '--name-only', merge_base]).split()
680 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000681
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000682 def GetUsableRev(self, rev, options):
683 """Finds a useful revision for this repository.
684
685 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
686 will be called on the source."""
687 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000688 if not os.path.isdir(self.checkout_path):
689 raise gclient_utils.Error(
690 ( 'We could not find a valid hash for safesync_url response "%s".\n'
691 'Safesync URLs with a git checkout currently require the repo to\n'
692 'be cloned without a safesync_url before adding the safesync_url.\n'
693 'For more info, see: '
694 'http://code.google.com/p/chromium/wiki/UsingNewGit'
695 '#Initial_checkout' ) % rev)
696 elif rev.isdigit() and len(rev) < 7:
697 # Handles an SVN rev. As an optimization, only verify an SVN revision as
698 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000699 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000700 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
701 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000702 try:
703 logging.debug('Looking for git-svn configuration optimizations.')
704 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
705 cwd=self.checkout_path):
706 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
707 except subprocess2.CalledProcessError:
708 logging.debug('git config --get svn-remote.svn.fetch failed, '
709 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000710 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000711 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000712 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000713 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000714 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
715 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000716 except gclient_utils.Error, e:
717 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000718 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000719 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
720 'the closest sane git revision, which is:\n'
721 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000722 if not sha1:
723 raise gclient_utils.Error(
724 ( 'It appears that either your git-svn remote is incorrectly\n'
725 'configured or the revision in your safesync_url is\n'
726 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
727 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000728 else:
729 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
730 sha1 = rev
731 else:
732 # May exist in origin, but we don't have it yet, so fetch and look
733 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000734 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000735 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
736 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000737
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000738 if not sha1:
739 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000740 ( 'We could not find a valid hash for safesync_url response "%s".\n'
741 'Safesync URLs with a git checkout currently require a git-svn\n'
742 'remote or a safesync_url that provides git sha1s. Please add a\n'
743 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000744 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000745 '#Initial_checkout' ) % rev)
746
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000747 return sha1
748
msb@chromium.orge6f78352010-01-13 17:05:33 +0000749 def FullUrlForRelativeUrl(self, url):
750 # Strip from last '/'
751 # Equivalent to unix basename
752 base_url = self.url
753 return base_url[:base_url.rfind('/')] + url
754
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000755 def _GetMirror(self, url, options):
756 """Get a git_cache.Mirror object for the argument url."""
757 if not git_cache.Mirror.GetCachePath():
758 return None
hinoka@google.comb1b54572014-04-16 22:29:23 +0000759 mirror_kwargs = {
760 'print_func': self.filter,
761 'refs': []
762 }
hinoka@google.com356cb5f2014-04-25 00:02:21 +0000763 # TODO(hinoka): This currently just fails because lkcr/lkgr are branches
764 # not tags. This also adds 20 seconds to every bot_update
765 # run, so I'm commenting this out until lkcr/lkgr become
766 # tags. (2014/4/24)
767 # if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
768 # mirror_kwargs['refs'].extend(['refs/tags/lkgr', 'refs/tags/lkcr'])
hinoka@google.comb1b54572014-04-16 22:29:23 +0000769 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
770 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000771 return git_cache.Mirror(url, **mirror_kwargs)
772
773 @staticmethod
774 def _UpdateMirror(mirror, options):
775 """Update a git mirror by fetching the latest commits from the remote."""
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000776 if options.shallow:
777 # HACK(hinoka): These repositories should be super shallow.
szager@chromium.orgb0a13a22014-06-18 00:52:25 +0000778 if 'flash' in mirror.url:
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000779 depth = 10
780 else:
781 depth = 10000
782 else:
783 depth = None
784 mirror.populate(verbose=options.verbose, bootstrap=True, depth=depth)
szager@chromium.org848fd492014-04-09 19:06:44 +0000785 mirror.unlock()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000786
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000787 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000788 """Clone a git repository from the given URL.
789
msb@chromium.org786fb682010-06-02 15:16:23 +0000790 Once we've cloned the repo, we checkout a working branch if the specified
791 revision is a branch head. If it is a tag or a specific commit, then we
792 leave HEAD detached as it makes future updates simpler -- in this case the
793 user should first create a new branch or switch to an existing branch before
794 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000795 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000796 # git clone doesn't seem to insert a newline properly before printing
797 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000798 self.Print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000799 template_path = os.path.join(
800 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000801 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000802 clone_cmd = cfg + [
803 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000804 if self.cache_dir:
805 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000806 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000807 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000808 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000809 # If the parent directory does not exist, Git clone on Windows will not
810 # create it, so we need to do it manually.
811 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000812 gclient_utils.safe_makedirs(parent_dir)
813 tmp_dir = tempfile.mkdtemp(
814 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
815 dir=parent_dir)
816 try:
817 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000818 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000819 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000820 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
821 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000822 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000823 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000824 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000825 finally:
826 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000827 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000828 gclient_utils.rmtree(tmp_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000829 self._UpdateBranchHeads(options, fetch=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000830 self._Run(['checkout', '--quiet', revision.replace('refs/heads/', '')],
831 options)
832 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000833 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000834 self.Print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000835 ('Checked out %s to a detached HEAD. Before making any commits\n'
836 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000837 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
838 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000839
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000840 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000841 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000842 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000843 raise gclient_utils.Error("Background task requires input. Rerun "
844 "gclient with --jobs=1 so that\n"
845 "interaction is possible.")
846 try:
847 return raw_input(prompt)
848 except KeyboardInterrupt:
849 # Hide the exception.
850 sys.exit(1)
851
852
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000853 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000854 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000855 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000856 if files is not None:
857 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000858 revision = upstream
859 if newbase:
860 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000861 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000862 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000863 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000864 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000865 printed_path = True
866 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000867 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000868
869 if merge:
870 merge_output = self._Capture(['merge', revision])
871 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000872 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000873 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000874
875 # Build the rebase command here using the args
876 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
877 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000878 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000879 rebase_cmd.append('--verbose')
880 if newbase:
881 rebase_cmd.extend(['--onto', newbase])
882 rebase_cmd.append(upstream)
883 if branch:
884 rebase_cmd.append(branch)
885
886 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000887 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000888 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000889 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
890 re.match(r'cannot rebase: your index contains uncommitted changes',
891 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000892 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000893 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000894 'Cannot rebase because of unstaged changes.\n'
895 '\'git reset --hard HEAD\' ?\n'
896 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000897 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000898 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000899 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000900 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000901 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000902 break
903 elif re.match(r'quit|q', rebase_action, re.I):
904 raise gclient_utils.Error("Please merge or rebase manually\n"
905 "cd %s && git " % self.checkout_path
906 + "%s" % ' '.join(rebase_cmd))
907 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000908 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000909 continue
910 else:
911 gclient_utils.Error("Input not recognized")
912 continue
913 elif re.search(r'^CONFLICT', e.stdout, re.M):
914 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
915 "Fix the conflict and run gclient again.\n"
916 "See 'man git-rebase' for details.\n")
917 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000918 self.Print(e.stdout.strip())
919 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000920 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
921 "manually.\ncd %s && git " %
922 self.checkout_path
923 + "%s" % ' '.join(rebase_cmd))
924
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000925 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000926 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000927 # Make the output a little prettier. It's nice to have some
928 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000929 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000930
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000931 @staticmethod
932 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000933 (ok, current_version) = scm.GIT.AssertVersion(min_version)
934 if not ok:
935 raise gclient_utils.Error('git version %s < minimum required %s' %
936 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000937
msb@chromium.org786fb682010-06-02 15:16:23 +0000938 def _IsRebasing(self):
939 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
940 # have a plumbing command to determine whether a rebase is in progress, so
941 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
942 g = os.path.join(self.checkout_path, '.git')
943 return (
944 os.path.isdir(os.path.join(g, "rebase-merge")) or
945 os.path.isdir(os.path.join(g, "rebase-apply")))
946
947 def _CheckClean(self, rev_str):
948 # Make sure the tree is clean; see git-rebase.sh for reference
949 try:
950 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000951 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000952 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000953 raise gclient_utils.Error('\n____ %s%s\n'
954 '\tYou have unstaged changes.\n'
955 '\tPlease commit, stash, or reset.\n'
956 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000957 try:
958 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000959 '--ignore-submodules', 'HEAD', '--'],
960 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000961 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000962 raise gclient_utils.Error('\n____ %s%s\n'
963 '\tYour index contains uncommitted changes\n'
964 '\tPlease commit, stash, or reset.\n'
965 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000966
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000967 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000968 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
969 # reference by a commit). If not, error out -- most likely a rebase is
970 # in progress, try to detect so we can give a better error.
971 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000972 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
973 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000974 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000975 # Commit is not contained by any rev. See if the user is rebasing:
976 if self._IsRebasing():
977 # Punt to the user
978 raise gclient_utils.Error('\n____ %s%s\n'
979 '\tAlready in a conflict, i.e. (no branch).\n'
980 '\tFix the conflict and run gclient again.\n'
981 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
982 '\tSee man git-rebase for details.\n'
983 % (self.relpath, rev_str))
984 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000985 name = ('saved-by-gclient-' +
986 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000987 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000988 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000989 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000990
msb@chromium.org5bde4852009-12-14 16:47:12 +0000991 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000992 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000993 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000994 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000995 return None
996 return branch
997
borenet@google.comc3e09d22014-04-10 13:58:18 +0000998 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000999 kwargs.setdefault('cwd', self.checkout_path)
1000 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001001 env = scm.GIT.ApplyEnvVars(kwargs)
1002 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +00001003
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001004 def _UpdateBranchHeads(self, options, fetch=False):
1005 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1006 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001007 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001008 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1009 '^\\+refs/branch-heads/\\*:.*$']
1010 self._Run(config_cmd, options)
1011 if fetch:
szager@chromium.orgff113292014-03-25 06:02:08 +00001012 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +00001013 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001014 if options.verbose:
1015 fetch_cmd.append('--verbose')
1016 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001017
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001018 def _Run(self, args, options, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001019 cwd = kwargs.setdefault('cwd', self.checkout_path)
1020 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001021 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001022 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001023 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001024 cmd = ['git'] + args
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001025 header = "running '%s' in '%s'" % (' '.join(cmd), cwd)
szager@chromium.org848fd492014-04-09 19:06:44 +00001026 self.filter(header)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001027 return gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001028
1029
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001030class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001031 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001032 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001033
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001034 @staticmethod
1035 def BinaryExists():
1036 """Returns true if the command exists."""
1037 try:
1038 result, version = scm.SVN.AssertVersion('1.4')
1039 if not result:
1040 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1041 return result
1042 except OSError:
1043 return False
1044
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001045 def GetCheckoutRoot(self):
1046 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1047
floitsch@google.comeaab7842011-04-28 09:07:58 +00001048 def GetRevisionDate(self, revision):
1049 """Returns the given revision's date in ISO-8601 format (which contains the
1050 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001051 date = scm.SVN.Capture(
1052 ['propget', '--revprop', 'svn:date', '-r', revision],
1053 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001054 return date.strip()
1055
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001056 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001057 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001058 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001059
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001060 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001061 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001062 if not os.path.isdir(self.checkout_path):
1063 raise gclient_utils.Error('Directory %s is not present.' %
1064 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001065 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001066
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001067 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001068 """Generates a patch file which can be applied to the root of the
1069 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001070 if not os.path.isdir(self.checkout_path):
1071 raise gclient_utils.Error('Directory %s is not present.' %
1072 self.checkout_path)
1073 gclient_utils.CheckCallAndFilter(
1074 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1075 cwd=self.checkout_path,
1076 print_stdout=False,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001077 filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001078
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001079 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001080 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001081
1082 All updated files will be appended to file_list.
1083
1084 Raises:
1085 Error: if can't get URL for relative path.
1086 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001087 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001088 hg_path = os.path.join(self.checkout_path, '.hg')
1089 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001090 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001091 return
1092
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001093 if args:
1094 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1095
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001096 # revision is the revision to match. It is None if no revision is specified,
1097 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001098 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001099 # Keep the original unpinned url for reference in case the repo is switched.
1100 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001101 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001102 if options.revision:
1103 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001104 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001105 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001106 if revision != 'unmanaged':
1107 forced_revision = True
1108 # Reconstruct the url.
1109 url = '%s@%s' % (url, revision)
1110 rev_str = ' at %s' % revision
1111 else:
1112 managed = False
1113 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001114 else:
1115 forced_revision = False
1116 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001117
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001118 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001119 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001120 # Git is only okay if it's a git-svn checkout of the right repo.
1121 if scm.GIT.IsGitSvn(self.checkout_path):
1122 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1123 'svn-remote.svn.url'],
1124 cwd=self.checkout_path).rstrip()
1125 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001126 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1127 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001128 return # TODO(borenet): Get the svn revision number?
1129
1130 # Get the existing scm url and the revision number of the current checkout.
1131 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001132 try:
1133 from_info = scm.SVN.CaptureLocalInfo(
1134 [], os.path.join(self.checkout_path, '.'))
1135 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001136 self._DeleteOrMove(options.force)
1137 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001138
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001139 BASE_URLS = {
1140 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1141 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1142 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001143 WHITELISTED_ROOTS = [
1144 'svn://svn.chromium.org',
1145 'svn://svn-mirror.golo.chromium.org',
1146 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001147 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001148 try:
1149 # Split out the revision number since it's not useful for us.
1150 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001151 # Check to see if we're on a whitelisted root. We do this because
1152 # only some svn servers have matching UUIDs.
1153 local_parsed = urlparse.urlparse(url)
1154 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001155 if ('CHROME_HEADLESS' in os.environ
1156 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001157 and base_path in BASE_URLS
1158 and local_root in WHITELISTED_ROOTS):
1159
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001160 # Use a tarball for initial sync if we are on a bot.
1161 # Get an unauthenticated gsutil instance.
1162 gsutil = download_from_google_storage.Gsutil(
1163 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1164
1165 gs_path = BASE_URLS[base_path]
1166 _, out, _ = gsutil.check_call('ls', gs_path)
1167 # So that we can get the most recent revision.
1168 sorted_items = sorted(out.splitlines())
1169 latest_checkout = sorted_items[-1]
1170
1171 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001172 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001173 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1174 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001175 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001176 raise Exception()
1177 filename = latest_checkout.split('/')[-1]
1178 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001179 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001180 gclient_utils.safe_makedirs(self.checkout_path)
1181 # TODO(hinoka): Use 7z for windows.
1182 cmd = ['tar', '--extract', '--ungzip',
1183 '--directory', self.checkout_path,
1184 '--file', tarball]
1185 gclient_utils.CheckCallAndFilter(
1186 cmd, stdout=sys.stdout, print_stdout=True)
1187
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001188 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001189 gclient_utils.rmtree(tempdir)
1190
1191 # Rewrite the repository root to match.
1192 tarball_url = scm.SVN.CaptureLocalInfo(
1193 ['.'], self.checkout_path)['Repository Root']
1194 tarball_parsed = urlparse.urlparse(tarball_url)
1195 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1196 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001197
1198 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001199 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001200 self._Run(['switch', '--relocate', tarball_root,
1201 local_root, self.checkout_path],
1202 options)
1203 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001204 self.Print('We tried to get a source tarball but failed.')
1205 self.Print('Resuming normal operations.')
1206 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001207
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001208 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001209 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001210 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001211 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001212 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001213 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001214
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001215 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001216 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001217 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1218 return self.Svnversion()
1219 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001220
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001221 if 'URL' not in from_info:
1222 raise gclient_utils.Error(
1223 ('gclient is confused. Couldn\'t get the url for %s.\n'
1224 'Try using @unmanaged.\n%s') % (
1225 self.checkout_path, from_info))
1226
stip@chromium.org3031d732014-04-21 22:18:02 +00001227 # Look for locked directories.
1228 dir_info = scm.SVN.CaptureStatus(
1229 None, os.path.join(self.checkout_path, '.'))
1230 if any(d[0][2] == 'L' for d in dir_info):
1231 try:
1232 self._Run(['cleanup', self.checkout_path], options)
1233 except subprocess2.CalledProcessError, e:
1234 # Get the status again, svn cleanup may have cleaned up at least
1235 # something.
1236 dir_info = scm.SVN.CaptureStatus(
1237 None, os.path.join(self.checkout_path, '.'))
1238
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001239 # Try to fix the failures by removing troublesome files.
1240 for d in dir_info:
1241 if d[0][2] == 'L':
1242 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001243 # We don't pass any files/directories to CaptureStatus and set
1244 # cwd=self.checkout_path, so we should get relative paths here.
1245 assert not os.path.isabs(d[1])
1246 path_to_remove = os.path.normpath(
1247 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001248 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001249 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001250 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001251 self.Print(
1252 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001253 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001254 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001255 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001256
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001257 # Retrieve the current HEAD version because svn is slow at null updates.
1258 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001259 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001260 revision = str(from_info_live['Revision'])
1261 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001262
borenet@google.comb09097a2014-04-09 19:09:08 +00001263 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001264 # The repository url changed, need to switch.
1265 try:
1266 to_info = scm.SVN.CaptureRemoteInfo(url)
1267 except (gclient_utils.Error, subprocess2.CalledProcessError):
1268 # The url is invalid or the server is not accessible, it's safer to bail
1269 # out right now.
1270 raise gclient_utils.Error('This url is unreachable: %s' % url)
1271 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1272 and (from_info['UUID'] == to_info['UUID']))
1273 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001274 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001275 # We have different roots, so check if we can switch --relocate.
1276 # Subversion only permits this if the repository UUIDs match.
1277 # Perform the switch --relocate, then rewrite the from_url
1278 # to reflect where we "are now." (This is the same way that
1279 # Subversion itself handles the metadata when switch --relocate
1280 # is used.) This makes the checks below for whether we
1281 # can update to a revision or have to switch to a different
1282 # branch work as expected.
1283 # TODO(maruel): TEST ME !
1284 command = ['switch', '--relocate',
1285 from_info['Repository Root'],
1286 to_info['Repository Root'],
1287 self.relpath]
1288 self._Run(command, options, cwd=self._root_dir)
1289 from_info['URL'] = from_info['URL'].replace(
1290 from_info['Repository Root'],
1291 to_info['Repository Root'])
1292 else:
1293 if not options.force and not options.reset:
1294 # Look for local modifications but ignore unversioned files.
1295 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1296 if status[0][0] != '?':
1297 raise gclient_utils.Error(
1298 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1299 'there is local changes in %s. Delete the directory and '
1300 'try again.') % (url, self.checkout_path))
1301 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001302 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001303 gclient_utils.rmtree(self.checkout_path)
1304 # We need to checkout.
1305 command = ['checkout', url, self.checkout_path]
1306 command = self._AddAdditionalUpdateFlags(command, options, revision)
1307 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1308 return self.Svnversion()
1309
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001310 # If the provided url has a revision number that matches the revision
1311 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001312 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001313 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001314 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001315 else:
1316 command = ['update', self.checkout_path]
1317 command = self._AddAdditionalUpdateFlags(command, options, revision)
1318 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001319
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001320 # If --reset and --delete_unversioned_trees are specified, remove any
1321 # untracked files and directories.
1322 if options.reset and options.delete_unversioned_trees:
1323 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1324 full_path = os.path.join(self.checkout_path, status[1])
1325 if (status[0][0] == '?'
1326 and os.path.isdir(full_path)
1327 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001328 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001329 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001330 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001331
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001332 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001333 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001334 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001335 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001336 # Create an empty checkout and then update the one file we want. Future
1337 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001338 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001339 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001340 if os.path.exists(os.path.join(self.checkout_path, filename)):
1341 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001342 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001343 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001344 # After the initial checkout, we can use update as if it were any other
1345 # dep.
1346 self.update(options, args, file_list)
1347 else:
1348 # If the installed version of SVN doesn't support --depth, fallback to
1349 # just exporting the file. This has the downside that revision
1350 # information is not stored next to the file, so we will have to
1351 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001352 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001353 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001354 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001355 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001356 command = self._AddAdditionalUpdateFlags(command, options,
1357 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001358 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001359
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001360 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001361 """Reverts local modifications. Subversion specific.
1362
1363 All reverted files will be appended to file_list, even if Subversion
1364 doesn't know about them.
1365 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001366 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001367 if os.path.exists(self.checkout_path):
1368 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001369 # svn revert won't work if the directory doesn't exist. It needs to
1370 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001371 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001372 # Don't reuse the args.
1373 return self.update(options, [], file_list)
1374
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001375 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001376 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001377 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001378 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001379 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001380 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001381 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001382 if not options.force:
1383 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001384 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001385 '\n_____ %s is not a valid svn checkout, synching instead' %
1386 self.relpath)
1387 gclient_utils.rmtree(self.checkout_path)
1388 # Don't reuse the args.
1389 return self.update(options, [], file_list)
1390
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001391 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001392 if file_list is not None:
1393 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001394 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001395 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001396 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001397 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001398 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001399
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001400 # Revert() may delete the directory altogether.
1401 if not os.path.isdir(self.checkout_path):
1402 # Don't reuse the args.
1403 return self.update(options, [], file_list)
1404
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001405 try:
1406 # svn revert is so broken we don't even use it. Using
1407 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001408 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001409 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1410 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001411 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001412 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001413 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001414
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001415 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001416 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001417 try:
1418 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001419 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001420 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001421
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001422 def runhooks(self, options, args, file_list):
1423 self.status(options, args, file_list)
1424
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001425 def status(self, options, args, file_list):
1426 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001427 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001428 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001429 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001430 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001431 'The directory does not exist.') %
1432 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001433 # There's no file list to retrieve.
1434 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001435 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001436
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001437 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001438 """Verifies the validity of the revision for this repository."""
1439 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1440 raise gclient_utils.Error(
1441 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1442 'correct.') % rev)
1443 return rev
1444
msb@chromium.orge6f78352010-01-13 17:05:33 +00001445 def FullUrlForRelativeUrl(self, url):
1446 # Find the forth '/' and strip from there. A bit hackish.
1447 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001448
maruel@chromium.org669600d2010-09-01 19:06:31 +00001449 def _Run(self, args, options, **kwargs):
1450 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001451 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001452 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001453 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001454
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001455 def Svnversion(self):
1456 """Runs the lowest checked out revision in the current project."""
1457 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1458 return info['Revision']
1459
maruel@chromium.org669600d2010-09-01 19:06:31 +00001460 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1461 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001462 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001463 scm.SVN.RunAndGetFileList(
1464 options.verbose,
1465 args + ['--ignore-externals'],
1466 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001467 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001468
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001469 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001470 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001471 """Add additional flags to command depending on what options are set.
1472 command should be a list of strings that represents an svn command.
1473
1474 This method returns a new list to be used as a command."""
1475 new_command = command[:]
1476 if revision:
1477 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001478 # We don't want interaction when jobs are used.
1479 if options.jobs > 1:
1480 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001481 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001482 # --accept was added to 'svn update' in svn 1.6.
1483 if not scm.SVN.AssertVersion('1.5')[0]:
1484 return new_command
1485
1486 # It's annoying to have it block in the middle of a sync, just sensible
1487 # defaults.
1488 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001489 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001490 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1491 new_command.extend(('--accept', 'theirs-conflict'))
1492 elif options.manually_grab_svn_rev:
1493 new_command.append('--force')
1494 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1495 new_command.extend(('--accept', 'postpone'))
1496 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1497 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001498 return new_command