blob: 1b50abee9c402ed74349cf2e13329f1d42f5aeb2 [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
szager@chromium.org617a1612014-06-16 23:12:28 +0000359 if not managed:
360 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
361 try:
362 return self._Capture(['rev-parse', '--verify', 'HEAD'])
363 except subprocess2.CalledProcessError:
364 return None
365
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000366 url = self._CreateOrUpdateCache(url, options)
367
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000368 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000369 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000370 elif revision.startswith(self.remote + '/'):
agable@chromium.org69995f42014-04-25 21:43:29 +0000371 # Rewrite remote refs to their local equivalents.
372 revision = 'refs/remotes/' + revision
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000373 rev_type = "branch"
374 else:
375 # hash is also a tag, only make a distinction at checkout
376 rev_type = "hash"
377
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000378 if (not os.path.exists(self.checkout_path) or
379 (os.path.isdir(self.checkout_path) and
380 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
borenet@google.com90fe58b2014-05-01 18:22:00 +0000381 try:
382 self._Clone(revision, url, options)
383 except subprocess2.CalledProcessError:
384 self._DeleteOrMove(options.force)
385 self._Clone(revision, url, options)
jochen@chromium.org048da082014-05-06 08:32:40 +0000386 if deps_revision and deps_revision.startswith('branch-heads/'):
387 deps_branch = deps_revision.replace('branch-heads/', '')
388 self._Capture(['branch', deps_branch, deps_revision])
389 self._Capture(['checkout', '--quiet', deps_branch])
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000390 if file_list is not None:
391 files = self._Capture(['ls-files']).splitlines()
392 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000393 if not verbose:
394 # Make the output a little prettier. It's nice to have some whitespace
395 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000396 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000397 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000398
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000399 # See if the url has changed (the unittests use git://foo for the url, let
400 # that through).
401 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
402 return_early = False
403 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
404 # unit test pass. (and update the comment above)
405 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
406 # This allows devs to use experimental repos which have a different url
407 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000408 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000409 url != 'git://foo' and
410 subprocess2.capture(
411 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
412 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000413 self.Print('_____ switching %s to a new upstream' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000414 # Make sure it's clean
415 self._CheckClean(rev_str)
416 # Switch over to the new upstream
417 self._Run(['remote', 'set-url', self.remote, url], options)
418 self._FetchAndReset(revision, file_list, options)
419 return_early = True
420
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000421 if return_early:
422 return self._Capture(['rev-parse', '--verify', 'HEAD'])
423
msb@chromium.org5bde4852009-12-14 16:47:12 +0000424 cur_branch = self._GetCurrentBranch()
425
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000426 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000427 # 0) HEAD is detached. Probably from our initial clone.
428 # - make sure HEAD is contained by a named ref, then update.
429 # Cases 1-4. HEAD is a branch.
430 # 1) current branch is not tracking a remote branch (could be git-svn)
431 # - try to rebase onto the new hash or branch
432 # 2) current branch is tracking a remote branch with local committed
433 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000434 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000435 # 3) current branch is tracking a remote branch w/or w/out changes,
436 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000437 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000438 # 4) current branch is tracking a remote branch, switches to a different
439 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000440 # - exit
441
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000442 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
443 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000444 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
445 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000446 if cur_branch is None:
447 upstream_branch = None
448 current_type = "detached"
449 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000450 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000451 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
452 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
453 current_type = "hash"
454 logging.debug("Current branch is not tracking an upstream (remote)"
455 " branch.")
456 elif upstream_branch.startswith('refs/remotes'):
457 current_type = "branch"
458 else:
459 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000460
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000461 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000462 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000463 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000464 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000465 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000466 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000467
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000468 self._UpdateBranchHeads(options, fetch=True)
469
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000470 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000471 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000472 target = 'HEAD'
473 if options.upstream and upstream_branch:
474 target = upstream_branch
475 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476
msb@chromium.org786fb682010-06-02 15:16:23 +0000477 if current_type == 'detached':
478 # case 0
479 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000480 self._CheckDetachedHead(rev_str, options)
szager@chromium.org848fd492014-04-09 19:06:44 +0000481 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
482 self.Print('Up-to-date; skipping checkout.')
483 else:
484 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000485 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000486 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000487 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000488 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000489 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000490 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000491 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000492 newbase=revision, printed_path=printed_path,
493 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000494 printed_path = True
495 else:
496 # Can't find a merge-base since we don't know our upstream. That makes
497 # this command VERY likely to produce a rebase failure. For now we
498 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000499 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000500 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000501 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000502 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000503 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000504 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000505 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000506 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000507 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000508 newbase=revision, printed_path=printed_path,
509 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000510 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000511 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000512 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000513 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000514 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000515 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000516 switch_error = ("Switching upstream branch from %s to %s\n"
517 % (upstream_branch, new_base) +
518 "Please merge or rebase manually:\n" +
519 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
520 "OR git checkout -b <some new branch> %s" % new_base)
521 raise gclient_utils.Error(switch_error)
522 else:
523 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000524 if files is not None:
525 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000526 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000527 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000528 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000529 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000530 if options.merge:
531 merge_args.append('--ff')
532 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000533 merge_args.append('--ff-only')
534 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000535 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000536 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000537 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000538 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000539 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000540 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000541 printed_path = True
542 while True:
543 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000544 action = self._AskForData(
545 'Cannot %s, attempt to rebase? '
546 '(y)es / (q)uit / (s)kip : ' %
547 ('merge' if options.merge else 'fast-forward merge'),
548 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000549 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000550 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000551 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000552 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000553 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000554 printed_path = True
555 break
556 elif re.match(r'quit|q', action, re.I):
557 raise gclient_utils.Error("Can't fast-forward, please merge or "
558 "rebase manually.\n"
559 "cd %s && git " % self.checkout_path
560 + "rebase %s" % upstream_branch)
561 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000562 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000563 return
564 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000565 self.Print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000566 elif re.match("error: Your local changes to '.*' would be "
567 "overwritten by merge. Aborting.\nPlease, commit your "
568 "changes or stash them before you can merge.\n",
569 e.stderr):
570 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000571 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000572 printed_path = True
573 raise gclient_utils.Error(e.stderr)
574 else:
575 # Some other problem happened with the merge
576 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000577 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000578 raise
579 else:
580 # Fast-forward merge was successful
581 if not re.match('Already up-to-date.', merge_output) or verbose:
582 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000583 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000584 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000585 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000586 if not verbose:
587 # Make the output a little prettier. It's nice to have some
588 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000589 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000590
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000591 if file_list is not None:
592 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000593
594 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000595 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000596 raise gclient_utils.Error('\n____ %s%s\n'
597 '\nConflict while rebasing this branch.\n'
598 'Fix the conflict and run gclient again.\n'
599 'See man git-rebase for details.\n'
600 % (self.relpath, rev_str))
601
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000602 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000603 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
604 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000605
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000606 # If --reset and --delete_unversioned_trees are specified, remove any
607 # untracked directories.
608 if options.reset and options.delete_unversioned_trees:
609 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
610 # merge-base by default), so doesn't include untracked files. So we use
611 # 'git ls-files --directory --others --exclude-standard' here directly.
612 paths = scm.GIT.Capture(
613 ['ls-files', '--directory', '--others', '--exclude-standard'],
614 self.checkout_path)
615 for path in (p for p in paths.splitlines() if p.endswith('/')):
616 full_path = os.path.join(self.checkout_path, path)
617 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000618 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000619 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000620
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000621 return self._Capture(['rev-parse', '--verify', 'HEAD'])
622
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000623
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000624 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000625 """Reverts local modifications.
626
627 All reverted files will be appended to file_list.
628 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000629 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000630 # revert won't work if the directory doesn't exist. It needs to
631 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000632 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000633 # Don't reuse the args.
634 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000635
636 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000637 if options.upstream:
638 if self._GetCurrentBranch():
639 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
640 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000641 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000642 if not deps_revision:
643 deps_revision = default_rev
644 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000645 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000646 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000647
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000648 if file_list is not None:
649 files = self._Capture(['diff', deps_revision, '--name-only']).split()
650
maruel@chromium.org37e89872010-09-07 16:11:33 +0000651 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000652 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000653
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000654 if file_list is not None:
655 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
656
657 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000658 """Returns revision"""
659 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000660
msb@chromium.orge28e4982009-09-25 20:51:45 +0000661 def runhooks(self, options, args, file_list):
662 self.status(options, args, file_list)
663
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000664 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000665 """Display status information."""
666 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000667 self.Print('________ couldn\'t run status in %s:\n'
668 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000669 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000670 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000671 self._Run(['diff', '--name-status', merge_base], options,
672 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000673 if file_list is not None:
674 files = self._Capture(['diff', '--name-only', merge_base]).split()
675 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000676
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000677 def GetUsableRev(self, rev, options):
678 """Finds a useful revision for this repository.
679
680 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
681 will be called on the source."""
682 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000683 if not os.path.isdir(self.checkout_path):
684 raise gclient_utils.Error(
685 ( 'We could not find a valid hash for safesync_url response "%s".\n'
686 'Safesync URLs with a git checkout currently require the repo to\n'
687 'be cloned without a safesync_url before adding the safesync_url.\n'
688 'For more info, see: '
689 'http://code.google.com/p/chromium/wiki/UsingNewGit'
690 '#Initial_checkout' ) % rev)
691 elif rev.isdigit() and len(rev) < 7:
692 # Handles an SVN rev. As an optimization, only verify an SVN revision as
693 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000694 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000695 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
696 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000697 try:
698 logging.debug('Looking for git-svn configuration optimizations.')
699 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
700 cwd=self.checkout_path):
701 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
702 except subprocess2.CalledProcessError:
703 logging.debug('git config --get svn-remote.svn.fetch failed, '
704 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000705 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000706 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000707 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000708 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000709 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
710 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000711 except gclient_utils.Error, e:
712 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000713 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000714 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
715 'the closest sane git revision, which is:\n'
716 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000717 if not sha1:
718 raise gclient_utils.Error(
719 ( 'It appears that either your git-svn remote is incorrectly\n'
720 'configured or the revision in your safesync_url is\n'
721 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
722 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000723 else:
724 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
725 sha1 = rev
726 else:
727 # May exist in origin, but we don't have it yet, so fetch and look
728 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000729 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000730 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
731 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000732
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000733 if not sha1:
734 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000735 ( 'We could not find a valid hash for safesync_url response "%s".\n'
736 'Safesync URLs with a git checkout currently require a git-svn\n'
737 'remote or a safesync_url that provides git sha1s. Please add a\n'
738 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000739 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000740 '#Initial_checkout' ) % rev)
741
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000742 return sha1
743
msb@chromium.orge6f78352010-01-13 17:05:33 +0000744 def FullUrlForRelativeUrl(self, url):
745 # Strip from last '/'
746 # Equivalent to unix basename
747 base_url = self.url
748 return base_url[:base_url.rfind('/')] + url
749
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000750 def _CreateOrUpdateCache(self, url, options):
751 """Make a new git mirror or update existing mirror for |url|, and return the
752 mirror URI to clone from.
753
754 If no cache-dir is specified, just return |url| unchanged.
755 """
756 if not self.cache_dir:
757 return url
hinoka@google.comb1b54572014-04-16 22:29:23 +0000758 mirror_kwargs = {
759 'print_func': self.filter,
760 'refs': []
761 }
hinoka@google.com356cb5f2014-04-25 00:02:21 +0000762 # TODO(hinoka): This currently just fails because lkcr/lkgr are branches
763 # not tags. This also adds 20 seconds to every bot_update
764 # run, so I'm commenting this out until lkcr/lkgr become
765 # tags. (2014/4/24)
766 # if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
767 # mirror_kwargs['refs'].extend(['refs/tags/lkgr', 'refs/tags/lkcr'])
hinoka@google.comb1b54572014-04-16 22:29:23 +0000768 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
769 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org848fd492014-04-09 19:06:44 +0000770 mirror = git_cache.Mirror(url, **mirror_kwargs)
hinoka@chromium.org46b87412014-05-15 00:42:05 +0000771 if options.shallow:
772 # HACK(hinoka): These repositories should be super shallow.
773 if 'flash' in url:
774 depth = 10
775 else:
776 depth = 10000
777 else:
778 depth = None
779 mirror.populate(verbose=options.verbose, bootstrap=True, depth=depth)
szager@chromium.org848fd492014-04-09 19:06:44 +0000780 mirror.unlock()
781 return mirror.mirror_path if mirror.exists() else None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000782
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000783 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000784 """Clone a git repository from the given URL.
785
msb@chromium.org786fb682010-06-02 15:16:23 +0000786 Once we've cloned the repo, we checkout a working branch if the specified
787 revision is a branch head. If it is a tag or a specific commit, then we
788 leave HEAD detached as it makes future updates simpler -- in this case the
789 user should first create a new branch or switch to an existing branch before
790 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000791 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000792 # git clone doesn't seem to insert a newline properly before printing
793 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000794 self.Print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000795 template_path = os.path.join(
796 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000797 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000798 clone_cmd = cfg + [
799 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000800 if self.cache_dir:
801 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000802 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000803 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000804 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000805 # If the parent directory does not exist, Git clone on Windows will not
806 # create it, so we need to do it manually.
807 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000808 gclient_utils.safe_makedirs(parent_dir)
809 tmp_dir = tempfile.mkdtemp(
810 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
811 dir=parent_dir)
812 try:
813 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000814 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000815 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000816 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
817 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000818 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000819 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000820 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000821 finally:
822 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000823 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000824 gclient_utils.rmtree(tmp_dir)
mmoss@chromium.org1a6bec02014-06-02 21:53:29 +0000825 self._UpdateBranchHeads(options, fetch=True)
romain.pokrzywka@gmail.com483a0ba2014-05-30 00:06:07 +0000826 self._Run(['checkout', '--quiet', revision.replace('refs/heads/', '')],
827 options)
828 if self._GetCurrentBranch() is None:
msb@chromium.org786fb682010-06-02 15:16:23 +0000829 # Squelch git's very verbose detached HEAD warning and use our own
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000830 self.Print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000831 ('Checked out %s to a detached HEAD. Before making any commits\n'
832 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000833 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
834 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000835
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000836 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000837 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000838 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000839 raise gclient_utils.Error("Background task requires input. Rerun "
840 "gclient with --jobs=1 so that\n"
841 "interaction is possible.")
842 try:
843 return raw_input(prompt)
844 except KeyboardInterrupt:
845 # Hide the exception.
846 sys.exit(1)
847
848
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000849 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000850 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000851 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000852 if files is not None:
853 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000854 revision = upstream
855 if newbase:
856 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000857 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000858 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000859 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000860 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000861 printed_path = True
862 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000863 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000864
865 if merge:
866 merge_output = self._Capture(['merge', revision])
867 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000868 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000869 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000870
871 # Build the rebase command here using the args
872 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
873 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000874 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000875 rebase_cmd.append('--verbose')
876 if newbase:
877 rebase_cmd.extend(['--onto', newbase])
878 rebase_cmd.append(upstream)
879 if branch:
880 rebase_cmd.append(branch)
881
882 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000883 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000884 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000885 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
886 re.match(r'cannot rebase: your index contains uncommitted changes',
887 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000888 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000889 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000890 'Cannot rebase because of unstaged changes.\n'
891 '\'git reset --hard HEAD\' ?\n'
892 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000893 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000894 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000895 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000896 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000897 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000898 break
899 elif re.match(r'quit|q', rebase_action, re.I):
900 raise gclient_utils.Error("Please merge or rebase manually\n"
901 "cd %s && git " % self.checkout_path
902 + "%s" % ' '.join(rebase_cmd))
903 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000904 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000905 continue
906 else:
907 gclient_utils.Error("Input not recognized")
908 continue
909 elif re.search(r'^CONFLICT', e.stdout, re.M):
910 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
911 "Fix the conflict and run gclient again.\n"
912 "See 'man git-rebase' for details.\n")
913 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000914 self.Print(e.stdout.strip())
915 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000916 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
917 "manually.\ncd %s && git " %
918 self.checkout_path
919 + "%s" % ' '.join(rebase_cmd))
920
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000921 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000922 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000923 # Make the output a little prettier. It's nice to have some
924 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000925 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000926
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000927 @staticmethod
928 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000929 (ok, current_version) = scm.GIT.AssertVersion(min_version)
930 if not ok:
931 raise gclient_utils.Error('git version %s < minimum required %s' %
932 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000933
msb@chromium.org786fb682010-06-02 15:16:23 +0000934 def _IsRebasing(self):
935 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
936 # have a plumbing command to determine whether a rebase is in progress, so
937 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
938 g = os.path.join(self.checkout_path, '.git')
939 return (
940 os.path.isdir(os.path.join(g, "rebase-merge")) or
941 os.path.isdir(os.path.join(g, "rebase-apply")))
942
943 def _CheckClean(self, rev_str):
944 # Make sure the tree is clean; see git-rebase.sh for reference
945 try:
946 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000947 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000948 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000949 raise gclient_utils.Error('\n____ %s%s\n'
950 '\tYou have unstaged changes.\n'
951 '\tPlease commit, stash, or reset.\n'
952 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000953 try:
954 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000955 '--ignore-submodules', 'HEAD', '--'],
956 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000957 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000958 raise gclient_utils.Error('\n____ %s%s\n'
959 '\tYour index contains uncommitted changes\n'
960 '\tPlease commit, stash, or reset.\n'
961 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000962
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000963 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000964 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
965 # reference by a commit). If not, error out -- most likely a rebase is
966 # in progress, try to detect so we can give a better error.
967 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000968 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
969 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000970 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000971 # Commit is not contained by any rev. See if the user is rebasing:
972 if self._IsRebasing():
973 # Punt to the user
974 raise gclient_utils.Error('\n____ %s%s\n'
975 '\tAlready in a conflict, i.e. (no branch).\n'
976 '\tFix the conflict and run gclient again.\n'
977 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
978 '\tSee man git-rebase for details.\n'
979 % (self.relpath, rev_str))
980 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000981 name = ('saved-by-gclient-' +
982 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000983 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000984 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000985 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000986
msb@chromium.org5bde4852009-12-14 16:47:12 +0000987 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000988 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000989 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000990 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000991 return None
992 return branch
993
borenet@google.comc3e09d22014-04-10 13:58:18 +0000994 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000995 kwargs.setdefault('cwd', self.checkout_path)
996 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +0000997 env = scm.GIT.ApplyEnvVars(kwargs)
998 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000999
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001000 def _UpdateBranchHeads(self, options, fetch=False):
1001 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
1002 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +00001003 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001004 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
1005 '^\\+refs/branch-heads/\\*:.*$']
1006 self._Run(config_cmd, options)
1007 if fetch:
szager@chromium.orgff113292014-03-25 06:02:08 +00001008 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +00001009 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001010 if options.verbose:
1011 fetch_cmd.append('--verbose')
1012 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001013
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001014 def _Run(self, args, options, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001015 cwd = kwargs.setdefault('cwd', self.checkout_path)
1016 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001017 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001018 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001019 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001020 cmd = ['git'] + args
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001021 header = "running '%s' in '%s'" % (' '.join(cmd), cwd)
szager@chromium.org848fd492014-04-09 19:06:44 +00001022 self.filter(header)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001023 return gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001024
1025
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001026class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001027 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001028 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001029
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001030 @staticmethod
1031 def BinaryExists():
1032 """Returns true if the command exists."""
1033 try:
1034 result, version = scm.SVN.AssertVersion('1.4')
1035 if not result:
1036 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1037 return result
1038 except OSError:
1039 return False
1040
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001041 def GetCheckoutRoot(self):
1042 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1043
floitsch@google.comeaab7842011-04-28 09:07:58 +00001044 def GetRevisionDate(self, revision):
1045 """Returns the given revision's date in ISO-8601 format (which contains the
1046 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001047 date = scm.SVN.Capture(
1048 ['propget', '--revprop', 'svn:date', '-r', revision],
1049 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001050 return date.strip()
1051
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001052 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001053 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001054 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001055
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001056 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001057 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001058 if not os.path.isdir(self.checkout_path):
1059 raise gclient_utils.Error('Directory %s is not present.' %
1060 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001061 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001062
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001063 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001064 """Generates a patch file which can be applied to the root of the
1065 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001066 if not os.path.isdir(self.checkout_path):
1067 raise gclient_utils.Error('Directory %s is not present.' %
1068 self.checkout_path)
1069 gclient_utils.CheckCallAndFilter(
1070 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1071 cwd=self.checkout_path,
1072 print_stdout=False,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001073 filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001074
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001075 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001076 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001077
1078 All updated files will be appended to file_list.
1079
1080 Raises:
1081 Error: if can't get URL for relative path.
1082 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001083 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001084 hg_path = os.path.join(self.checkout_path, '.hg')
1085 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001086 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001087 return
1088
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001089 if args:
1090 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1091
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001092 # revision is the revision to match. It is None if no revision is specified,
1093 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001094 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001095 # Keep the original unpinned url for reference in case the repo is switched.
1096 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001097 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001098 if options.revision:
1099 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001100 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001101 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001102 if revision != 'unmanaged':
1103 forced_revision = True
1104 # Reconstruct the url.
1105 url = '%s@%s' % (url, revision)
1106 rev_str = ' at %s' % revision
1107 else:
1108 managed = False
1109 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001110 else:
1111 forced_revision = False
1112 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001113
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001114 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001115 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001116 # Git is only okay if it's a git-svn checkout of the right repo.
1117 if scm.GIT.IsGitSvn(self.checkout_path):
1118 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1119 'svn-remote.svn.url'],
1120 cwd=self.checkout_path).rstrip()
1121 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001122 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1123 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001124 return # TODO(borenet): Get the svn revision number?
1125
1126 # Get the existing scm url and the revision number of the current checkout.
1127 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001128 try:
1129 from_info = scm.SVN.CaptureLocalInfo(
1130 [], os.path.join(self.checkout_path, '.'))
1131 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001132 self._DeleteOrMove(options.force)
1133 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001134
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001135 BASE_URLS = {
1136 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1137 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1138 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001139 WHITELISTED_ROOTS = [
1140 'svn://svn.chromium.org',
1141 'svn://svn-mirror.golo.chromium.org',
1142 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001143 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001144 try:
1145 # Split out the revision number since it's not useful for us.
1146 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001147 # Check to see if we're on a whitelisted root. We do this because
1148 # only some svn servers have matching UUIDs.
1149 local_parsed = urlparse.urlparse(url)
1150 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001151 if ('CHROME_HEADLESS' in os.environ
1152 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001153 and base_path in BASE_URLS
1154 and local_root in WHITELISTED_ROOTS):
1155
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001156 # Use a tarball for initial sync if we are on a bot.
1157 # Get an unauthenticated gsutil instance.
1158 gsutil = download_from_google_storage.Gsutil(
1159 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1160
1161 gs_path = BASE_URLS[base_path]
1162 _, out, _ = gsutil.check_call('ls', gs_path)
1163 # So that we can get the most recent revision.
1164 sorted_items = sorted(out.splitlines())
1165 latest_checkout = sorted_items[-1]
1166
1167 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001168 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001169 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1170 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001171 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001172 raise Exception()
1173 filename = latest_checkout.split('/')[-1]
1174 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001175 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001176 gclient_utils.safe_makedirs(self.checkout_path)
1177 # TODO(hinoka): Use 7z for windows.
1178 cmd = ['tar', '--extract', '--ungzip',
1179 '--directory', self.checkout_path,
1180 '--file', tarball]
1181 gclient_utils.CheckCallAndFilter(
1182 cmd, stdout=sys.stdout, print_stdout=True)
1183
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001184 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001185 gclient_utils.rmtree(tempdir)
1186
1187 # Rewrite the repository root to match.
1188 tarball_url = scm.SVN.CaptureLocalInfo(
1189 ['.'], self.checkout_path)['Repository Root']
1190 tarball_parsed = urlparse.urlparse(tarball_url)
1191 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1192 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001193
1194 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001195 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001196 self._Run(['switch', '--relocate', tarball_root,
1197 local_root, self.checkout_path],
1198 options)
1199 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001200 self.Print('We tried to get a source tarball but failed.')
1201 self.Print('Resuming normal operations.')
1202 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001203
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001204 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001205 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001206 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001207 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001208 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001209 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001210
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001211 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001212 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001213 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1214 return self.Svnversion()
1215 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001216
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001217 if 'URL' not in from_info:
1218 raise gclient_utils.Error(
1219 ('gclient is confused. Couldn\'t get the url for %s.\n'
1220 'Try using @unmanaged.\n%s') % (
1221 self.checkout_path, from_info))
1222
stip@chromium.org3031d732014-04-21 22:18:02 +00001223 # Look for locked directories.
1224 dir_info = scm.SVN.CaptureStatus(
1225 None, os.path.join(self.checkout_path, '.'))
1226 if any(d[0][2] == 'L' for d in dir_info):
1227 try:
1228 self._Run(['cleanup', self.checkout_path], options)
1229 except subprocess2.CalledProcessError, e:
1230 # Get the status again, svn cleanup may have cleaned up at least
1231 # something.
1232 dir_info = scm.SVN.CaptureStatus(
1233 None, os.path.join(self.checkout_path, '.'))
1234
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001235 # Try to fix the failures by removing troublesome files.
1236 for d in dir_info:
1237 if d[0][2] == 'L':
1238 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001239 # We don't pass any files/directories to CaptureStatus and set
1240 # cwd=self.checkout_path, so we should get relative paths here.
1241 assert not os.path.isabs(d[1])
1242 path_to_remove = os.path.normpath(
1243 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001244 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001245 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001246 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001247 self.Print(
1248 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001249 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001250 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001251 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001252
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001253 # Retrieve the current HEAD version because svn is slow at null updates.
1254 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001255 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001256 revision = str(from_info_live['Revision'])
1257 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001258
borenet@google.comb09097a2014-04-09 19:09:08 +00001259 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001260 # The repository url changed, need to switch.
1261 try:
1262 to_info = scm.SVN.CaptureRemoteInfo(url)
1263 except (gclient_utils.Error, subprocess2.CalledProcessError):
1264 # The url is invalid or the server is not accessible, it's safer to bail
1265 # out right now.
1266 raise gclient_utils.Error('This url is unreachable: %s' % url)
1267 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1268 and (from_info['UUID'] == to_info['UUID']))
1269 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001270 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001271 # We have different roots, so check if we can switch --relocate.
1272 # Subversion only permits this if the repository UUIDs match.
1273 # Perform the switch --relocate, then rewrite the from_url
1274 # to reflect where we "are now." (This is the same way that
1275 # Subversion itself handles the metadata when switch --relocate
1276 # is used.) This makes the checks below for whether we
1277 # can update to a revision or have to switch to a different
1278 # branch work as expected.
1279 # TODO(maruel): TEST ME !
1280 command = ['switch', '--relocate',
1281 from_info['Repository Root'],
1282 to_info['Repository Root'],
1283 self.relpath]
1284 self._Run(command, options, cwd=self._root_dir)
1285 from_info['URL'] = from_info['URL'].replace(
1286 from_info['Repository Root'],
1287 to_info['Repository Root'])
1288 else:
1289 if not options.force and not options.reset:
1290 # Look for local modifications but ignore unversioned files.
1291 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1292 if status[0][0] != '?':
1293 raise gclient_utils.Error(
1294 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1295 'there is local changes in %s. Delete the directory and '
1296 'try again.') % (url, self.checkout_path))
1297 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001298 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001299 gclient_utils.rmtree(self.checkout_path)
1300 # We need to checkout.
1301 command = ['checkout', url, self.checkout_path]
1302 command = self._AddAdditionalUpdateFlags(command, options, revision)
1303 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1304 return self.Svnversion()
1305
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001306 # If the provided url has a revision number that matches the revision
1307 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001308 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001309 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001310 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001311 else:
1312 command = ['update', self.checkout_path]
1313 command = self._AddAdditionalUpdateFlags(command, options, revision)
1314 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001315
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001316 # If --reset and --delete_unversioned_trees are specified, remove any
1317 # untracked files and directories.
1318 if options.reset and options.delete_unversioned_trees:
1319 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1320 full_path = os.path.join(self.checkout_path, status[1])
1321 if (status[0][0] == '?'
1322 and os.path.isdir(full_path)
1323 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001324 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001325 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001326 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001327
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001328 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001329 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001330 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001331 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001332 # Create an empty checkout and then update the one file we want. Future
1333 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001334 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001335 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001336 if os.path.exists(os.path.join(self.checkout_path, filename)):
1337 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001338 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001339 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001340 # After the initial checkout, we can use update as if it were any other
1341 # dep.
1342 self.update(options, args, file_list)
1343 else:
1344 # If the installed version of SVN doesn't support --depth, fallback to
1345 # just exporting the file. This has the downside that revision
1346 # information is not stored next to the file, so we will have to
1347 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001348 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001349 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001350 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001351 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001352 command = self._AddAdditionalUpdateFlags(command, options,
1353 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001354 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001355
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001356 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001357 """Reverts local modifications. Subversion specific.
1358
1359 All reverted files will be appended to file_list, even if Subversion
1360 doesn't know about them.
1361 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001362 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001363 if os.path.exists(self.checkout_path):
1364 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001365 # svn revert won't work if the directory doesn't exist. It needs to
1366 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001367 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001368 # Don't reuse the args.
1369 return self.update(options, [], file_list)
1370
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001371 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001372 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001373 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001374 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001375 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001376 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001377 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001378 if not options.force:
1379 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001380 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001381 '\n_____ %s is not a valid svn checkout, synching instead' %
1382 self.relpath)
1383 gclient_utils.rmtree(self.checkout_path)
1384 # Don't reuse the args.
1385 return self.update(options, [], file_list)
1386
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001387 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001388 if file_list is not None:
1389 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001390 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001391 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001392 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001393 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001394 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001395
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001396 # Revert() may delete the directory altogether.
1397 if not os.path.isdir(self.checkout_path):
1398 # Don't reuse the args.
1399 return self.update(options, [], file_list)
1400
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001401 try:
1402 # svn revert is so broken we don't even use it. Using
1403 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001404 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001405 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1406 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001407 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001408 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001409 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001410
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001411 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001412 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001413 try:
1414 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001415 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001416 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001417
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001418 def runhooks(self, options, args, file_list):
1419 self.status(options, args, file_list)
1420
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001421 def status(self, options, args, file_list):
1422 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001423 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001424 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001425 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001426 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001427 'The directory does not exist.') %
1428 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001429 # There's no file list to retrieve.
1430 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001431 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001432
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001433 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001434 """Verifies the validity of the revision for this repository."""
1435 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1436 raise gclient_utils.Error(
1437 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1438 'correct.') % rev)
1439 return rev
1440
msb@chromium.orge6f78352010-01-13 17:05:33 +00001441 def FullUrlForRelativeUrl(self, url):
1442 # Find the forth '/' and strip from there. A bit hackish.
1443 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001444
maruel@chromium.org669600d2010-09-01 19:06:31 +00001445 def _Run(self, args, options, **kwargs):
1446 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001447 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001448 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001449 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001450
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001451 def Svnversion(self):
1452 """Runs the lowest checked out revision in the current project."""
1453 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1454 return info['Revision']
1455
maruel@chromium.org669600d2010-09-01 19:06:31 +00001456 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1457 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001458 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001459 scm.SVN.RunAndGetFileList(
1460 options.verbose,
1461 args + ['--ignore-externals'],
1462 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001463 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001464
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001465 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001466 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001467 """Add additional flags to command depending on what options are set.
1468 command should be a list of strings that represents an svn command.
1469
1470 This method returns a new list to be used as a command."""
1471 new_command = command[:]
1472 if revision:
1473 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001474 # We don't want interaction when jobs are used.
1475 if options.jobs > 1:
1476 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001477 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001478 # --accept was added to 'svn update' in svn 1.6.
1479 if not scm.SVN.AssertVersion('1.5')[0]:
1480 return new_command
1481
1482 # It's annoying to have it block in the middle of a sync, just sensible
1483 # defaults.
1484 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001485 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001486 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1487 new_command.extend(('--accept', 'theirs-conflict'))
1488 elif options.manually_grab_svn_rev:
1489 new_command.append('--force')
1490 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1491 new_command.extend(('--accept', 'postpone'))
1492 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1493 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001494 return new_command