blob: 00b8145bb4adde03ddd33a16b0b5bb3836aff7bf [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':
334 revision = None
335 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000336 if not revision:
337 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000338
floitsch@google.comeaab7842011-04-28 09:07:58 +0000339 if gclient_utils.IsDateRevision(revision):
340 # Date-revisions only work on git-repositories if the reflog hasn't
341 # expired yet. Use rev-list to get the corresponding revision.
342 # git rev-list -n 1 --before='time-stamp' branchname
343 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000344 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000345 revision = default_rev
346
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000347 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000348 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000349
350 printed_path = False
351 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000352 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000353 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000354 verbose = ['--verbose']
355 printed_path = True
356
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000357 url = self._CreateOrUpdateCache(url, options)
358
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000359 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000360 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000361 elif revision.startswith(self.remote + '/'):
agable@chromium.org69995f42014-04-25 21:43:29 +0000362 # Rewrite remote refs to their local equivalents.
363 revision = 'refs/remotes/' + revision
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000364 rev_type = "branch"
365 else:
366 # hash is also a tag, only make a distinction at checkout
367 rev_type = "hash"
368
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000369 if (not os.path.exists(self.checkout_path) or
370 (os.path.isdir(self.checkout_path) and
371 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
borenet@google.com90fe58b2014-05-01 18:22:00 +0000372 try:
373 self._Clone(revision, url, options)
374 except subprocess2.CalledProcessError:
375 self._DeleteOrMove(options.force)
376 self._Clone(revision, url, options)
jochen@chromium.org3676b3f2014-04-08 21:06:11 +0000377 self._UpdateBranchHeads(options, fetch=True)
jochen@chromium.org048da082014-05-06 08:32:40 +0000378 if deps_revision and deps_revision.startswith('branch-heads/'):
379 deps_branch = deps_revision.replace('branch-heads/', '')
380 self._Capture(['branch', deps_branch, deps_revision])
381 self._Capture(['checkout', '--quiet', deps_branch])
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000382 if file_list is not None:
383 files = self._Capture(['ls-files']).splitlines()
384 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000385 if not verbose:
386 # Make the output a little prettier. It's nice to have some whitespace
387 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000388 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000389 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000390
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000391 if not managed:
392 self._UpdateBranchHeads(options, fetch=False)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000393 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000394 return self._Capture(['rev-parse', '--verify', 'HEAD'])
395
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000396 # See if the url has changed (the unittests use git://foo for the url, let
397 # that through).
398 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
399 return_early = False
400 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
401 # unit test pass. (and update the comment above)
402 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
403 # This allows devs to use experimental repos which have a different url
404 # but whose branch(s) are the same as official repos.
borenet@google.comb09097a2014-04-09 19:09:08 +0000405 if (current_url.rstrip('/') != url.rstrip('/') and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000406 url != 'git://foo' and
407 subprocess2.capture(
408 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
409 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000410 self.Print('_____ switching %s to a new upstream' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000411 # Make sure it's clean
412 self._CheckClean(rev_str)
413 # Switch over to the new upstream
414 self._Run(['remote', 'set-url', self.remote, url], options)
415 self._FetchAndReset(revision, file_list, options)
416 return_early = True
417
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000418 if return_early:
419 return self._Capture(['rev-parse', '--verify', 'HEAD'])
420
msb@chromium.org5bde4852009-12-14 16:47:12 +0000421 cur_branch = self._GetCurrentBranch()
422
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000424 # 0) HEAD is detached. Probably from our initial clone.
425 # - make sure HEAD is contained by a named ref, then update.
426 # Cases 1-4. HEAD is a branch.
427 # 1) current branch is not tracking a remote branch (could be git-svn)
428 # - try to rebase onto the new hash or branch
429 # 2) current branch is tracking a remote branch with local committed
430 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000431 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000432 # 3) current branch is tracking a remote branch w/or w/out changes,
433 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000434 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000435 # 4) current branch is tracking a remote branch, switches to a different
436 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000437 # - exit
438
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000439 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
440 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000441 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
442 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000443 if cur_branch is None:
444 upstream_branch = None
445 current_type = "detached"
446 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000447 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000448 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
449 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
450 current_type = "hash"
451 logging.debug("Current branch is not tracking an upstream (remote)"
452 " branch.")
453 elif upstream_branch.startswith('refs/remotes'):
454 current_type = "branch"
455 else:
456 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000457
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000458 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000459 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000460 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000461 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000462 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000463 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000464
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000465 self._UpdateBranchHeads(options, fetch=True)
466
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000467 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000468 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000469 target = 'HEAD'
470 if options.upstream and upstream_branch:
471 target = upstream_branch
472 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000473
msb@chromium.org786fb682010-06-02 15:16:23 +0000474 if current_type == 'detached':
475 # case 0
476 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000477 self._CheckDetachedHead(rev_str, options)
szager@chromium.org848fd492014-04-09 19:06:44 +0000478 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
479 self.Print('Up-to-date; skipping checkout.')
480 else:
481 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000482 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000483 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000484 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000485 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000486 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000487 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000488 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000489 newbase=revision, printed_path=printed_path,
490 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000491 printed_path = True
492 else:
493 # Can't find a merge-base since we don't know our upstream. That makes
494 # this command VERY likely to produce a rebase failure. For now we
495 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000496 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000497 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000498 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000499 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000500 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000501 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000502 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000503 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000504 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000505 newbase=revision, printed_path=printed_path,
506 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000507 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000508 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000509 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000510 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000511 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000512 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000513 switch_error = ("Switching upstream branch from %s to %s\n"
514 % (upstream_branch, new_base) +
515 "Please merge or rebase manually:\n" +
516 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
517 "OR git checkout -b <some new branch> %s" % new_base)
518 raise gclient_utils.Error(switch_error)
519 else:
520 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000521 if files is not None:
522 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000523 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000524 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000525 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000526 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000527 if options.merge:
528 merge_args.append('--ff')
529 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000530 merge_args.append('--ff-only')
531 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000532 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000533 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000534 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000535 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000536 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000537 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000538 printed_path = True
539 while True:
540 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000541 action = self._AskForData(
542 'Cannot %s, attempt to rebase? '
543 '(y)es / (q)uit / (s)kip : ' %
544 ('merge' if options.merge else 'fast-forward merge'),
545 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000546 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000547 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000548 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000549 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000550 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000551 printed_path = True
552 break
553 elif re.match(r'quit|q', action, re.I):
554 raise gclient_utils.Error("Can't fast-forward, please merge or "
555 "rebase manually.\n"
556 "cd %s && git " % self.checkout_path
557 + "rebase %s" % upstream_branch)
558 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000559 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000560 return
561 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000562 self.Print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000563 elif re.match("error: Your local changes to '.*' would be "
564 "overwritten by merge. Aborting.\nPlease, commit your "
565 "changes or stash them before you can merge.\n",
566 e.stderr):
567 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000568 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000569 printed_path = True
570 raise gclient_utils.Error(e.stderr)
571 else:
572 # Some other problem happened with the merge
573 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000574 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000575 raise
576 else:
577 # Fast-forward merge was successful
578 if not re.match('Already up-to-date.', merge_output) or verbose:
579 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000580 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000581 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000582 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000583 if not verbose:
584 # Make the output a little prettier. It's nice to have some
585 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000586 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000587
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000588 if file_list is not None:
589 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000590
591 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000592 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000593 raise gclient_utils.Error('\n____ %s%s\n'
594 '\nConflict while rebasing this branch.\n'
595 'Fix the conflict and run gclient again.\n'
596 'See man git-rebase for details.\n'
597 % (self.relpath, rev_str))
598
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000599 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000600 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
601 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000602
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000603 # If --reset and --delete_unversioned_trees are specified, remove any
604 # untracked directories.
605 if options.reset and options.delete_unversioned_trees:
606 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
607 # merge-base by default), so doesn't include untracked files. So we use
608 # 'git ls-files --directory --others --exclude-standard' here directly.
609 paths = scm.GIT.Capture(
610 ['ls-files', '--directory', '--others', '--exclude-standard'],
611 self.checkout_path)
612 for path in (p for p in paths.splitlines() if p.endswith('/')):
613 full_path = os.path.join(self.checkout_path, path)
614 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000615 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000616 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000617
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000618 return self._Capture(['rev-parse', '--verify', 'HEAD'])
619
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000620
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000621 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000622 """Reverts local modifications.
623
624 All reverted files will be appended to file_list.
625 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000626 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000627 # revert won't work if the directory doesn't exist. It needs to
628 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000629 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000630 # Don't reuse the args.
631 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000632
633 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000634 if options.upstream:
635 if self._GetCurrentBranch():
636 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
637 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000638 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000639 if not deps_revision:
640 deps_revision = default_rev
641 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000642 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000643 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000644
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000645 if file_list is not None:
646 files = self._Capture(['diff', deps_revision, '--name-only']).split()
647
maruel@chromium.org37e89872010-09-07 16:11:33 +0000648 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000649 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000650
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000651 if file_list is not None:
652 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
653
654 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000655 """Returns revision"""
656 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000657
msb@chromium.orge28e4982009-09-25 20:51:45 +0000658 def runhooks(self, options, args, file_list):
659 self.status(options, args, file_list)
660
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000661 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000662 """Display status information."""
663 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000664 self.Print('________ couldn\'t run status in %s:\n'
665 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000666 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000667 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000668 self._Run(['diff', '--name-status', merge_base], options,
669 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000670 if file_list is not None:
671 files = self._Capture(['diff', '--name-only', merge_base]).split()
672 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000673
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000674 def GetUsableRev(self, rev, options):
675 """Finds a useful revision for this repository.
676
677 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
678 will be called on the source."""
679 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000680 if not os.path.isdir(self.checkout_path):
681 raise gclient_utils.Error(
682 ( 'We could not find a valid hash for safesync_url response "%s".\n'
683 'Safesync URLs with a git checkout currently require the repo to\n'
684 'be cloned without a safesync_url before adding the safesync_url.\n'
685 'For more info, see: '
686 'http://code.google.com/p/chromium/wiki/UsingNewGit'
687 '#Initial_checkout' ) % rev)
688 elif rev.isdigit() and len(rev) < 7:
689 # Handles an SVN rev. As an optimization, only verify an SVN revision as
690 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000691 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000692 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
693 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000694 try:
695 logging.debug('Looking for git-svn configuration optimizations.')
696 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
697 cwd=self.checkout_path):
698 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
699 except subprocess2.CalledProcessError:
700 logging.debug('git config --get svn-remote.svn.fetch failed, '
701 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000702 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000703 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000704 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000705 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000706 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
707 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000708 except gclient_utils.Error, e:
709 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000710 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000711 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
712 'the closest sane git revision, which is:\n'
713 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000714 if not sha1:
715 raise gclient_utils.Error(
716 ( 'It appears that either your git-svn remote is incorrectly\n'
717 'configured or the revision in your safesync_url is\n'
718 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
719 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000720 else:
721 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
722 sha1 = rev
723 else:
724 # May exist in origin, but we don't have it yet, so fetch and look
725 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000726 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000727 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
728 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000729
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000730 if not sha1:
731 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000732 ( 'We could not find a valid hash for safesync_url response "%s".\n'
733 'Safesync URLs with a git checkout currently require a git-svn\n'
734 'remote or a safesync_url that provides git sha1s. Please add a\n'
735 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000736 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000737 '#Initial_checkout' ) % rev)
738
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000739 return sha1
740
msb@chromium.orge6f78352010-01-13 17:05:33 +0000741 def FullUrlForRelativeUrl(self, url):
742 # Strip from last '/'
743 # Equivalent to unix basename
744 base_url = self.url
745 return base_url[:base_url.rfind('/')] + url
746
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000747 def _CreateOrUpdateCache(self, url, options):
748 """Make a new git mirror or update existing mirror for |url|, and return the
749 mirror URI to clone from.
750
751 If no cache-dir is specified, just return |url| unchanged.
752 """
753 if not self.cache_dir:
754 return url
hinoka@google.comb1b54572014-04-16 22:29:23 +0000755 mirror_kwargs = {
756 'print_func': self.filter,
757 'refs': []
758 }
hinoka@google.com356cb5f2014-04-25 00:02:21 +0000759 # TODO(hinoka): This currently just fails because lkcr/lkgr are branches
760 # not tags. This also adds 20 seconds to every bot_update
761 # run, so I'm commenting this out until lkcr/lkgr become
762 # tags. (2014/4/24)
763 # if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
764 # mirror_kwargs['refs'].extend(['refs/tags/lkgr', 'refs/tags/lkcr'])
hinoka@google.comb1b54572014-04-16 22:29:23 +0000765 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
766 mirror_kwargs['refs'].append('refs/branch-heads/*')
szager@chromium.org848fd492014-04-09 19:06:44 +0000767 mirror = git_cache.Mirror(url, **mirror_kwargs)
768 mirror.populate(verbose=options.verbose, bootstrap=True)
769 mirror.unlock()
770 return mirror.mirror_path if mirror.exists() else None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000771
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000772 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000773 """Clone a git repository from the given URL.
774
msb@chromium.org786fb682010-06-02 15:16:23 +0000775 Once we've cloned the repo, we checkout a working branch if the specified
776 revision is a branch head. If it is a tag or a specific commit, then we
777 leave HEAD detached as it makes future updates simpler -- in this case the
778 user should first create a new branch or switch to an existing branch before
779 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000780 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000781 # git clone doesn't seem to insert a newline properly before printing
782 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000783 self.Print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000784 template_path = os.path.join(
785 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgf1d73eb2014-04-21 17:07:04 +0000786 cfg = gclient_utils.DefaultIndexPackConfig(url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000787 clone_cmd = cfg + [
788 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000789 if self.cache_dir:
790 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000791 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000792 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000793 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000794 # If the parent directory does not exist, Git clone on Windows will not
795 # create it, so we need to do it manually.
796 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000797 gclient_utils.safe_makedirs(parent_dir)
798 tmp_dir = tempfile.mkdtemp(
799 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
800 dir=parent_dir)
801 try:
802 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000803 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000804 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000805 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
806 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000807 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000808 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000809 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000810 finally:
811 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000812 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000813 gclient_utils.rmtree(tmp_dir)
814 if revision.startswith('refs/heads/'):
815 self._Run(
816 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
817 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000818 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000819 self._Run(['checkout', '--quiet', revision], options)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000820 self.Print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000821 ('Checked out %s to a detached HEAD. Before making any commits\n'
822 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000823 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
824 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000825
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000826 def _AskForData(self, prompt, options):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000827 if options.jobs > 1:
szager@chromium.org6cd41b62014-04-21 23:55:22 +0000828 self.Print(prompt)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000829 raise gclient_utils.Error("Background task requires input. Rerun "
830 "gclient with --jobs=1 so that\n"
831 "interaction is possible.")
832 try:
833 return raw_input(prompt)
834 except KeyboardInterrupt:
835 # Hide the exception.
836 sys.exit(1)
837
838
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000839 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000840 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000841 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000842 if files is not None:
843 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000844 revision = upstream
845 if newbase:
846 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000847 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000848 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000849 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000850 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000851 printed_path = True
852 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000853 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000854
855 if merge:
856 merge_output = self._Capture(['merge', revision])
857 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000858 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000859 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000860
861 # Build the rebase command here using the args
862 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
863 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000864 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000865 rebase_cmd.append('--verbose')
866 if newbase:
867 rebase_cmd.extend(['--onto', newbase])
868 rebase_cmd.append(upstream)
869 if branch:
870 rebase_cmd.append(branch)
871
872 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000873 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000874 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000875 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
876 re.match(r'cannot rebase: your index contains uncommitted changes',
877 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000878 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000879 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000880 'Cannot rebase because of unstaged changes.\n'
881 '\'git reset --hard HEAD\' ?\n'
882 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000883 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000884 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000885 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000886 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000887 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000888 break
889 elif re.match(r'quit|q', rebase_action, re.I):
890 raise gclient_utils.Error("Please merge or rebase manually\n"
891 "cd %s && git " % self.checkout_path
892 + "%s" % ' '.join(rebase_cmd))
893 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000894 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000895 continue
896 else:
897 gclient_utils.Error("Input not recognized")
898 continue
899 elif re.search(r'^CONFLICT', e.stdout, re.M):
900 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
901 "Fix the conflict and run gclient again.\n"
902 "See 'man git-rebase' for details.\n")
903 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000904 self.Print(e.stdout.strip())
905 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000906 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
907 "manually.\ncd %s && git " %
908 self.checkout_path
909 + "%s" % ' '.join(rebase_cmd))
910
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000911 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000912 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000913 # Make the output a little prettier. It's nice to have some
914 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000915 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000916
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000917 @staticmethod
918 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000919 (ok, current_version) = scm.GIT.AssertVersion(min_version)
920 if not ok:
921 raise gclient_utils.Error('git version %s < minimum required %s' %
922 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000923
msb@chromium.org786fb682010-06-02 15:16:23 +0000924 def _IsRebasing(self):
925 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
926 # have a plumbing command to determine whether a rebase is in progress, so
927 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
928 g = os.path.join(self.checkout_path, '.git')
929 return (
930 os.path.isdir(os.path.join(g, "rebase-merge")) or
931 os.path.isdir(os.path.join(g, "rebase-apply")))
932
933 def _CheckClean(self, rev_str):
934 # Make sure the tree is clean; see git-rebase.sh for reference
935 try:
936 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000937 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000938 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000939 raise gclient_utils.Error('\n____ %s%s\n'
940 '\tYou have unstaged changes.\n'
941 '\tPlease commit, stash, or reset.\n'
942 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000943 try:
944 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000945 '--ignore-submodules', 'HEAD', '--'],
946 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000947 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000948 raise gclient_utils.Error('\n____ %s%s\n'
949 '\tYour index contains uncommitted changes\n'
950 '\tPlease commit, stash, or reset.\n'
951 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000952
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000953 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000954 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
955 # reference by a commit). If not, error out -- most likely a rebase is
956 # in progress, try to detect so we can give a better error.
957 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000958 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
959 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000960 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000961 # Commit is not contained by any rev. See if the user is rebasing:
962 if self._IsRebasing():
963 # Punt to the user
964 raise gclient_utils.Error('\n____ %s%s\n'
965 '\tAlready in a conflict, i.e. (no branch).\n'
966 '\tFix the conflict and run gclient again.\n'
967 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
968 '\tSee man git-rebase for details.\n'
969 % (self.relpath, rev_str))
970 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000971 name = ('saved-by-gclient-' +
972 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000973 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000974 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000975 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000976
msb@chromium.org5bde4852009-12-14 16:47:12 +0000977 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000978 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000979 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000980 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000981 return None
982 return branch
983
borenet@google.comc3e09d22014-04-10 13:58:18 +0000984 def _Capture(self, args, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000985 kwargs.setdefault('cwd', self.checkout_path)
986 kwargs.setdefault('stderr', subprocess2.PIPE)
szager@chromium.org6d8115d2014-04-23 20:59:23 +0000987 env = scm.GIT.ApplyEnvVars(kwargs)
988 return subprocess2.check_output(['git'] + args, env=env, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000989
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000990 def _UpdateBranchHeads(self, options, fetch=False):
991 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
992 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000993 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000994 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
995 '^\\+refs/branch-heads/\\*:.*$']
996 self._Run(config_cmd, options)
997 if fetch:
szager@chromium.orgff113292014-03-25 06:02:08 +0000998 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000999 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +00001000 if options.verbose:
1001 fetch_cmd.append('--verbose')
1002 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +00001003
agable@chromium.orgfd5b6382013-10-25 20:54:34 +00001004 def _Run(self, args, options, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001005 cwd = kwargs.setdefault('cwd', self.checkout_path)
1006 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +00001007 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001008 kwargs.setdefault('print_stdout', False)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001009 env = scm.GIT.ApplyEnvVars(kwargs)
agable@chromium.org772efaf2014-04-01 02:35:44 +00001010 cmd = ['git'] + args
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001011 header = "running '%s' in '%s'" % (' '.join(cmd), cwd)
szager@chromium.org848fd492014-04-09 19:06:44 +00001012 self.filter(header)
szager@chromium.org6d8115d2014-04-23 20:59:23 +00001013 return gclient_utils.CheckCallAndFilter(cmd, env=env, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001014
1015
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001016class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001017 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001018 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001019
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001020 @staticmethod
1021 def BinaryExists():
1022 """Returns true if the command exists."""
1023 try:
1024 result, version = scm.SVN.AssertVersion('1.4')
1025 if not result:
1026 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1027 return result
1028 except OSError:
1029 return False
1030
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001031 def GetCheckoutRoot(self):
1032 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1033
floitsch@google.comeaab7842011-04-28 09:07:58 +00001034 def GetRevisionDate(self, revision):
1035 """Returns the given revision's date in ISO-8601 format (which contains the
1036 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001037 date = scm.SVN.Capture(
1038 ['propget', '--revprop', 'svn:date', '-r', revision],
1039 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001040 return date.strip()
1041
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001042 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001043 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001044 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001045
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001046 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001047 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001048 if not os.path.isdir(self.checkout_path):
1049 raise gclient_utils.Error('Directory %s is not present.' %
1050 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001051 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001052
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001053 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001054 """Generates a patch file which can be applied to the root of the
1055 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001056 if not os.path.isdir(self.checkout_path):
1057 raise gclient_utils.Error('Directory %s is not present.' %
1058 self.checkout_path)
1059 gclient_utils.CheckCallAndFilter(
1060 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1061 cwd=self.checkout_path,
1062 print_stdout=False,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001063 filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001064
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001065 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001066 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001067
1068 All updated files will be appended to file_list.
1069
1070 Raises:
1071 Error: if can't get URL for relative path.
1072 """
borenet@google.comb09097a2014-04-09 19:09:08 +00001073 # Only update if hg is not controlling the directory.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001074 hg_path = os.path.join(self.checkout_path, '.hg')
1075 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001076 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001077 return
1078
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001079 if args:
1080 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1081
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001082 # revision is the revision to match. It is None if no revision is specified,
1083 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001084 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001085 # Keep the original unpinned url for reference in case the repo is switched.
1086 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001087 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001088 if options.revision:
1089 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001090 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001091 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001092 if revision != 'unmanaged':
1093 forced_revision = True
1094 # Reconstruct the url.
1095 url = '%s@%s' % (url, revision)
1096 rev_str = ' at %s' % revision
1097 else:
1098 managed = False
1099 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001100 else:
1101 forced_revision = False
1102 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001103
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001104 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001105 if exists and managed:
borenet@google.comb09097a2014-04-09 19:09:08 +00001106 # Git is only okay if it's a git-svn checkout of the right repo.
1107 if scm.GIT.IsGitSvn(self.checkout_path):
1108 remote_url = scm.GIT.Capture(['config', '--local', '--get',
1109 'svn-remote.svn.url'],
1110 cwd=self.checkout_path).rstrip()
1111 if remote_url.rstrip('/') == base_url.rstrip('/'):
borenet@google.comb2256212014-05-07 20:57:28 +00001112 self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
1113 % self.relpath)
borenet@google.comb09097a2014-04-09 19:09:08 +00001114 return # TODO(borenet): Get the svn revision number?
1115
1116 # Get the existing scm url and the revision number of the current checkout.
1117 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001118 try:
1119 from_info = scm.SVN.CaptureLocalInfo(
1120 [], os.path.join(self.checkout_path, '.'))
1121 except (gclient_utils.Error, subprocess2.CalledProcessError):
borenet@google.comb09097a2014-04-09 19:09:08 +00001122 self._DeleteOrMove(options.force)
1123 exists = False
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001124
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001125 BASE_URLS = {
1126 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1127 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1128 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001129 WHITELISTED_ROOTS = [
1130 'svn://svn.chromium.org',
1131 'svn://svn-mirror.golo.chromium.org',
1132 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001133 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001134 try:
1135 # Split out the revision number since it's not useful for us.
1136 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001137 # Check to see if we're on a whitelisted root. We do this because
1138 # only some svn servers have matching UUIDs.
1139 local_parsed = urlparse.urlparse(url)
1140 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001141 if ('CHROME_HEADLESS' in os.environ
1142 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001143 and base_path in BASE_URLS
1144 and local_root in WHITELISTED_ROOTS):
1145
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001146 # Use a tarball for initial sync if we are on a bot.
1147 # Get an unauthenticated gsutil instance.
1148 gsutil = download_from_google_storage.Gsutil(
1149 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1150
1151 gs_path = BASE_URLS[base_path]
1152 _, out, _ = gsutil.check_call('ls', gs_path)
1153 # So that we can get the most recent revision.
1154 sorted_items = sorted(out.splitlines())
1155 latest_checkout = sorted_items[-1]
1156
1157 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001158 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001159 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1160 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001161 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001162 raise Exception()
1163 filename = latest_checkout.split('/')[-1]
1164 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001165 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001166 gclient_utils.safe_makedirs(self.checkout_path)
1167 # TODO(hinoka): Use 7z for windows.
1168 cmd = ['tar', '--extract', '--ungzip',
1169 '--directory', self.checkout_path,
1170 '--file', tarball]
1171 gclient_utils.CheckCallAndFilter(
1172 cmd, stdout=sys.stdout, print_stdout=True)
1173
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001174 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001175 gclient_utils.rmtree(tempdir)
1176
1177 # Rewrite the repository root to match.
1178 tarball_url = scm.SVN.CaptureLocalInfo(
1179 ['.'], self.checkout_path)['Repository Root']
1180 tarball_parsed = urlparse.urlparse(tarball_url)
1181 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1182 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001183
1184 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001185 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001186 self._Run(['switch', '--relocate', tarball_root,
1187 local_root, self.checkout_path],
1188 options)
1189 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001190 self.Print('We tried to get a source tarball but failed.')
1191 self.Print('Resuming normal operations.')
1192 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001193
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001194 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001195 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001196 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001197 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001198 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001199 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001200
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001201 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001202 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
borenet@google.comb09097a2014-04-09 19:09:08 +00001203 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
1204 return self.Svnversion()
1205 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001206
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001207 if 'URL' not in from_info:
1208 raise gclient_utils.Error(
1209 ('gclient is confused. Couldn\'t get the url for %s.\n'
1210 'Try using @unmanaged.\n%s') % (
1211 self.checkout_path, from_info))
1212
stip@chromium.org3031d732014-04-21 22:18:02 +00001213 # Look for locked directories.
1214 dir_info = scm.SVN.CaptureStatus(
1215 None, os.path.join(self.checkout_path, '.'))
1216 if any(d[0][2] == 'L' for d in dir_info):
1217 try:
1218 self._Run(['cleanup', self.checkout_path], options)
1219 except subprocess2.CalledProcessError, e:
1220 # Get the status again, svn cleanup may have cleaned up at least
1221 # something.
1222 dir_info = scm.SVN.CaptureStatus(
1223 None, os.path.join(self.checkout_path, '.'))
1224
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001225 # Try to fix the failures by removing troublesome files.
1226 for d in dir_info:
1227 if d[0][2] == 'L':
1228 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001229 # We don't pass any files/directories to CaptureStatus and set
1230 # cwd=self.checkout_path, so we should get relative paths here.
1231 assert not os.path.isabs(d[1])
1232 path_to_remove = os.path.normpath(
1233 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001234 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001235 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001236 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001237 self.Print(
1238 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001239 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001240 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001241 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001242
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001243 # Retrieve the current HEAD version because svn is slow at null updates.
1244 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001245 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001246 revision = str(from_info_live['Revision'])
1247 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001248
borenet@google.comb09097a2014-04-09 19:09:08 +00001249 if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001250 # The repository url changed, need to switch.
1251 try:
1252 to_info = scm.SVN.CaptureRemoteInfo(url)
1253 except (gclient_utils.Error, subprocess2.CalledProcessError):
1254 # The url is invalid or the server is not accessible, it's safer to bail
1255 # out right now.
1256 raise gclient_utils.Error('This url is unreachable: %s' % url)
1257 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1258 and (from_info['UUID'] == to_info['UUID']))
1259 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001260 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001261 # We have different roots, so check if we can switch --relocate.
1262 # Subversion only permits this if the repository UUIDs match.
1263 # Perform the switch --relocate, then rewrite the from_url
1264 # to reflect where we "are now." (This is the same way that
1265 # Subversion itself handles the metadata when switch --relocate
1266 # is used.) This makes the checks below for whether we
1267 # can update to a revision or have to switch to a different
1268 # branch work as expected.
1269 # TODO(maruel): TEST ME !
1270 command = ['switch', '--relocate',
1271 from_info['Repository Root'],
1272 to_info['Repository Root'],
1273 self.relpath]
1274 self._Run(command, options, cwd=self._root_dir)
1275 from_info['URL'] = from_info['URL'].replace(
1276 from_info['Repository Root'],
1277 to_info['Repository Root'])
1278 else:
1279 if not options.force and not options.reset:
1280 # Look for local modifications but ignore unversioned files.
1281 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1282 if status[0][0] != '?':
1283 raise gclient_utils.Error(
1284 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1285 'there is local changes in %s. Delete the directory and '
1286 'try again.') % (url, self.checkout_path))
1287 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001288 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001289 gclient_utils.rmtree(self.checkout_path)
1290 # We need to checkout.
1291 command = ['checkout', url, self.checkout_path]
1292 command = self._AddAdditionalUpdateFlags(command, options, revision)
1293 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1294 return self.Svnversion()
1295
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001296 # If the provided url has a revision number that matches the revision
1297 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001298 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001299 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001300 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001301 else:
1302 command = ['update', self.checkout_path]
1303 command = self._AddAdditionalUpdateFlags(command, options, revision)
1304 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001305
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001306 # If --reset and --delete_unversioned_trees are specified, remove any
1307 # untracked files and directories.
1308 if options.reset and options.delete_unversioned_trees:
1309 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1310 full_path = os.path.join(self.checkout_path, status[1])
1311 if (status[0][0] == '?'
1312 and os.path.isdir(full_path)
1313 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001314 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001315 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001316 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001317
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001318 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001319 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001320 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001321 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001322 # Create an empty checkout and then update the one file we want. Future
1323 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001324 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001325 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001326 if os.path.exists(os.path.join(self.checkout_path, filename)):
1327 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001328 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001329 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001330 # After the initial checkout, we can use update as if it were any other
1331 # dep.
1332 self.update(options, args, file_list)
1333 else:
1334 # If the installed version of SVN doesn't support --depth, fallback to
1335 # just exporting the file. This has the downside that revision
1336 # information is not stored next to the file, so we will have to
1337 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001338 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001339 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001340 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001341 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001342 command = self._AddAdditionalUpdateFlags(command, options,
1343 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001344 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001345
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001346 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001347 """Reverts local modifications. Subversion specific.
1348
1349 All reverted files will be appended to file_list, even if Subversion
1350 doesn't know about them.
1351 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001352 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001353 if os.path.exists(self.checkout_path):
1354 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001355 # svn revert won't work if the directory doesn't exist. It needs to
1356 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001357 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001358 # Don't reuse the args.
1359 return self.update(options, [], file_list)
1360
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001361 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001362 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001363 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001364 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001365 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001366 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001367 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001368 if not options.force:
1369 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001370 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001371 '\n_____ %s is not a valid svn checkout, synching instead' %
1372 self.relpath)
1373 gclient_utils.rmtree(self.checkout_path)
1374 # Don't reuse the args.
1375 return self.update(options, [], file_list)
1376
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001377 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001378 if file_list is not None:
1379 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001380 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001381 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001382 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001383 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001384 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001385
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001386 # Revert() may delete the directory altogether.
1387 if not os.path.isdir(self.checkout_path):
1388 # Don't reuse the args.
1389 return self.update(options, [], file_list)
1390
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001391 try:
1392 # svn revert is so broken we don't even use it. Using
1393 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001394 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001395 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1396 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001397 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001398 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001399 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001400
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001401 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001402 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001403 try:
1404 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001405 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001406 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001407
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001408 def runhooks(self, options, args, file_list):
1409 self.status(options, args, file_list)
1410
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001411 def status(self, options, args, file_list):
1412 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001413 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001414 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001415 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001416 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001417 'The directory does not exist.') %
1418 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001419 # There's no file list to retrieve.
1420 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001421 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001422
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001423 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001424 """Verifies the validity of the revision for this repository."""
1425 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1426 raise gclient_utils.Error(
1427 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1428 'correct.') % rev)
1429 return rev
1430
msb@chromium.orge6f78352010-01-13 17:05:33 +00001431 def FullUrlForRelativeUrl(self, url):
1432 # Find the forth '/' and strip from there. A bit hackish.
1433 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001434
maruel@chromium.org669600d2010-09-01 19:06:31 +00001435 def _Run(self, args, options, **kwargs):
1436 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001437 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001438 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001439 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001440
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001441 def Svnversion(self):
1442 """Runs the lowest checked out revision in the current project."""
1443 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1444 return info['Revision']
1445
maruel@chromium.org669600d2010-09-01 19:06:31 +00001446 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1447 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001448 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001449 scm.SVN.RunAndGetFileList(
1450 options.verbose,
1451 args + ['--ignore-externals'],
1452 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001453 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001454
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001455 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001456 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001457 """Add additional flags to command depending on what options are set.
1458 command should be a list of strings that represents an svn command.
1459
1460 This method returns a new list to be used as a command."""
1461 new_command = command[:]
1462 if revision:
1463 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001464 # We don't want interaction when jobs are used.
1465 if options.jobs > 1:
1466 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001467 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001468 # --accept was added to 'svn update' in svn 1.6.
1469 if not scm.SVN.AssertVersion('1.5')[0]:
1470 return new_command
1471
1472 # It's annoying to have it block in the middle of a sync, just sensible
1473 # defaults.
1474 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001475 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001476 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1477 new_command.extend(('--accept', 'theirs-conflict'))
1478 elif options.manually_grab_svn_rev:
1479 new_command.append('--force')
1480 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1481 new_command.extend(('--accept', 'postpone'))
1482 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1483 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001484 return new_command