blob: 29684f458b91b7668b90087f87aa7ca54c21e3e1 [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
maruel@chromium.org754960e2009-09-21 12:31:05 +00009import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000010import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000011import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000012import re
borenet@google.com88d10082014-03-21 17:24:48 +000013import shlex
maruel@chromium.org90541732011-04-01 17:54:18 +000014import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000015import tempfile
zty@chromium.org6279e8a2014-02-13 01:45:25 +000016import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000017import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000018
hinoka@google.com2f2ca142014-01-07 03:59:18 +000019import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000020import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000021import scm
22import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000023
24
szager@chromium.org71cbb502013-04-19 23:30:15 +000025THIS_FILE_PATH = os.path.abspath(__file__)
26
hinoka@google.com2f2ca142014-01-07 03:59:18 +000027GSUTIL_DEFAULT_PATH = os.path.join(
28 os.path.dirname(os.path.abspath(__file__)),
29 'third_party', 'gsutil', 'gsutil')
30
szager@chromium.org71cbb502013-04-19 23:30:15 +000031
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000032class DiffFiltererWrapper(object):
33 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000034 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000035 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000036 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000037 original_prefix = "--- "
38 working_prefix = "+++ "
39
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000040 def __init__(self, relpath, print_func):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000041 # Note that we always use '/' as the path separator to be
42 # consistent with svn's cygwin-style output on Windows
43 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000044 self._current_file = None
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000045 self._print_func = print_func
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000046
maruel@chromium.org6e29d572010-06-04 17:32:20 +000047 def SetCurrentFile(self, current_file):
48 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000049
iannucci@chromium.org3830a672013-02-19 20:15:14 +000050 @property
51 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000052 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000053
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000054 def _Replace(self, line):
55 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000056
57 def Filter(self, line):
58 if (line.startswith(self.index_string)):
59 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000060 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000061 else:
62 if (line.startswith(self.original_prefix) or
63 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000064 line = self._Replace(line)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000065 self._print_func(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000066
67
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000068class SvnDiffFilterer(DiffFiltererWrapper):
69 index_string = "Index: "
70
71
72class GitDiffFilterer(DiffFiltererWrapper):
73 index_string = "diff --git "
74
75 def SetCurrentFile(self, current_file):
76 # Get filename by parsing "a/<filename> b/<filename>"
77 self._current_file = current_file[:(len(current_file)/2)][2:]
78
79 def _Replace(self, line):
80 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
81
82
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000083### SCM abstraction layer
84
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000085# Factory Method for SCM wrapper creation
86
maruel@chromium.org9eda4112010-06-11 18:56:10 +000087def GetScmName(url):
88 if url:
89 url, _ = gclient_utils.SplitUrlRevision(url)
90 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000091 url.startswith('git+http://') or url.startswith('git+https://') or
mariakhomenko@chromium.orga2ede5c2014-02-05 22:05:17 +000092 url.endswith('.git') or url.startswith('sso://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000093 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000094 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000095 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000096 return 'svn'
97 return None
98
99
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000100def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000101 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000102 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000103 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000104 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000105
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000106 scm_name = GetScmName(url)
107 if not scm_name in SCM_MAP:
108 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000109 scm_class = SCM_MAP[scm_name]
110 if not scm_class.BinaryExists():
111 raise gclient_utils.Error('%s command not found' % scm_name)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000112 return scm_class(url, root_dir, relpath, out_fh, out_cb)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000113
114
115# SCMWrapper base class
116
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000117class SCMWrapper(object):
118 """Add necessary glue between all the supported SCM.
119
msb@chromium.orgd6504212010-01-13 17:34:31 +0000120 This is the abstraction layer to bind to different SCM.
121 """
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000122
123 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
124 out_cb=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000125 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000126 self._root_dir = root_dir
127 if self._root_dir:
128 self._root_dir = self._root_dir.replace('/', os.sep)
129 self.relpath = relpath
130 if self.relpath:
131 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000132 if self.relpath and self._root_dir:
133 self.checkout_path = os.path.join(self._root_dir, self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000134 if out_fh is None:
135 out_fh = sys.stdout
136 self.out_fh = out_fh
137 self.out_cb = out_cb
138
139 def Print(self, *args, **kwargs):
140 kwargs.setdefault('file', self.out_fh)
141 if kwargs.pop('timestamp', True):
142 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
143 print(*args, **kwargs)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000144
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000145 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000146 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000147 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000148
149 if not command in commands:
150 raise gclient_utils.Error('Unknown command %s' % command)
151
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000152 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000153 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000154 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000155
156 return getattr(self, command)(options, args, file_list)
157
borenet@google.com4e9be262014-04-08 19:40:30 +0000158 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000159 """Attempt to determine the remote URL for this SCMWrapper."""
borenet@google.com4e9be262014-04-08 19:40:30 +0000160 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000161 if os.path.exists(os.path.join(self.checkout_path, '.git')):
borenet@google.com4e9be262014-04-08 19:40:30 +0000162 actual_remote_url = shlex.split(scm.GIT.Capture(
borenet@google.com88d10082014-03-21 17:24:48 +0000163 ['config', '--local', '--get-regexp', r'remote.*.url'],
164 self.checkout_path))[1]
borenet@google.com4e9be262014-04-08 19:40:30 +0000165
166 # If a cache_dir is used, obtain the actual remote URL from the cache.
167 if getattr(self, 'cache_dir', None):
168 try:
169 full_cache_dir = self._Run(['cache', 'exists', '--cache-dir',
170 self.cache_dir, self.url],
171 options, cwd=self._root_dir).strip()
172 except subprocess2.CalledProcessError:
173 full_cache_dir = None
174 if (full_cache_dir.replace('\\', '/') ==
175 actual_remote_url.replace('\\', '/')):
176 actual_remote_url = shlex.split(scm.GIT.Capture(
177 ['config', '--local', '--get-regexp', r'remote.*.url'],
178 os.path.join(self._root_dir, full_cache_dir)))[1]
179 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
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000201
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000202class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000203 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000204 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000205 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000206
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000207 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000208
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000209 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
210 out_cb=None):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000211 """Removes 'git+' fake prefix from git URL."""
212 if url.startswith('git+http://') or url.startswith('git+https://'):
213 url = url[4:]
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000214 SCMWrapper.__init__(self, url, root_dir, relpath, out_fh, out_cb)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000215
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000216 @staticmethod
217 def BinaryExists():
218 """Returns true if the command exists."""
219 try:
220 # We assume git is newer than 1.7. See: crbug.com/114483
221 result, version = scm.GIT.AssertVersion('1.7')
222 if not result:
223 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
224 return result
225 except OSError:
226 return False
227
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000228 def GetCheckoutRoot(self):
229 return scm.GIT.GetCheckoutRoot(self.checkout_path)
230
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000231 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000232 """Returns the given revision's date in ISO-8601 format (which contains the
233 time zone)."""
234 # TODO(floitsch): get the time-stamp of the given revision and not just the
235 # time-stamp of the currently checked out revision.
236 return self._Capture(['log', '-n', '1', '--format=%ai'])
237
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000238 @staticmethod
239 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000240 """'Cleanup' the repo.
241
242 There's no real git equivalent for the svn cleanup command, do a no-op.
243 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000244
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000245 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000246 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000247 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000248
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000249 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000250 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000251 repository.
252
253 The patch file is generated from a diff of the merge base of HEAD and
254 its upstream branch.
255 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000256 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000257 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000258 ['git', 'diff', merge_base],
259 cwd=self.checkout_path,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000260 filter_fn=GitDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000261
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000262 def UpdateSubmoduleConfig(self):
263 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000264 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000265 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000266 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000267 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000268 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000269 kwargs = {'cwd': self.checkout_path,
270 'print_stdout': False,
271 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000272 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000273 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
274 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000275 except subprocess2.CalledProcessError:
276 # Not a fatal error, or even very interesting in a non-git-submodule
277 # world. So just keep it quiet.
278 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000279 try:
280 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
281 except subprocess2.CalledProcessError:
282 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000283
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000284 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
285
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000286 def _FetchAndReset(self, revision, file_list, options):
287 """Equivalent to git fetch; git reset."""
288 quiet = []
289 if not options.verbose:
290 quiet = ['--quiet']
291 self._UpdateBranchHeads(options, fetch=False)
292
szager@chromium.orgff113292014-03-25 06:02:08 +0000293 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000294 fetch_cmd = cfg + ['fetch', self.remote, '--prune']
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000295 self._Run(fetch_cmd + quiet, options, retry=True)
296 self._Run(['reset', '--hard', revision] + quiet, options)
297 self.UpdateSubmoduleConfig()
298 if file_list is not None:
299 files = self._Capture(['ls-files']).splitlines()
300 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
301
msb@chromium.orge28e4982009-09-25 20:51:45 +0000302 def update(self, options, args, file_list):
303 """Runs git to update or transparently checkout the working copy.
304
305 All updated files will be appended to file_list.
306
307 Raises:
308 Error: if can't get URL for relative path.
309 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000310 if args:
311 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
312
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000313 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000314
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000315 # If a dependency is not pinned, track the default remote branch.
316 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000317 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000318 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000319 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000320 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000321 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000322 # Override the revision number.
323 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000324 if revision == 'unmanaged':
325 revision = None
326 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000327 if not revision:
328 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000329
floitsch@google.comeaab7842011-04-28 09:07:58 +0000330 if gclient_utils.IsDateRevision(revision):
331 # Date-revisions only work on git-repositories if the reflog hasn't
332 # expired yet. Use rev-list to get the corresponding revision.
333 # git rev-list -n 1 --before='time-stamp' branchname
334 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000335 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000336 revision = default_rev
337
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000338 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000339 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000340
341 printed_path = False
342 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000343 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000344 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000345 verbose = ['--verbose']
346 printed_path = True
347
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000348 url = self._CreateOrUpdateCache(url, options)
349
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000350 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000351 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000352 elif revision.startswith(self.remote + '/'):
353 # For compatibility with old naming, translate 'origin' to 'refs/heads'
354 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000355 rev_type = "branch"
356 else:
357 # hash is also a tag, only make a distinction at checkout
358 rev_type = "hash"
359
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000360 if (not os.path.exists(self.checkout_path) or
361 (os.path.isdir(self.checkout_path) and
362 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000363 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000364 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000365 if file_list is not None:
366 files = self._Capture(['ls-files']).splitlines()
367 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000368 if not verbose:
369 # Make the output a little prettier. It's nice to have some whitespace
370 # between projects when cloning.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000371 self.Print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000372 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000373
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000374 if not managed:
375 self._UpdateBranchHeads(options, fetch=False)
376 self.UpdateSubmoduleConfig()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000377 self.Print('________ unmanaged solution; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000378 return self._Capture(['rev-parse', '--verify', 'HEAD'])
379
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +0000380 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
381 raise gclient_utils.Error('\n____ %s%s\n'
382 '\tPath is not a git repo. No .git dir.\n'
383 '\tTo resolve:\n'
384 '\t\trm -rf %s\n'
385 '\tAnd run gclient sync again\n'
386 % (self.relpath, rev_str, self.relpath))
387
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000388 # See if the url has changed (the unittests use git://foo for the url, let
389 # that through).
390 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
391 return_early = False
392 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
393 # unit test pass. (and update the comment above)
394 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
395 # This allows devs to use experimental repos which have a different url
396 # but whose branch(s) are the same as official repos.
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +0000397 if (current_url != url and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000398 url != 'git://foo' and
399 subprocess2.capture(
400 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
401 cwd=self.checkout_path).strip() != 'False'):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000402 self.Print('_____ switching %s to a new upstream' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000403 # Make sure it's clean
404 self._CheckClean(rev_str)
405 # Switch over to the new upstream
406 self._Run(['remote', 'set-url', self.remote, url], options)
407 self._FetchAndReset(revision, file_list, options)
408 return_early = True
409
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000410 if return_early:
411 return self._Capture(['rev-parse', '--verify', 'HEAD'])
412
msb@chromium.org5bde4852009-12-14 16:47:12 +0000413 cur_branch = self._GetCurrentBranch()
414
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000415 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000416 # 0) HEAD is detached. Probably from our initial clone.
417 # - make sure HEAD is contained by a named ref, then update.
418 # Cases 1-4. HEAD is a branch.
419 # 1) current branch is not tracking a remote branch (could be git-svn)
420 # - try to rebase onto the new hash or branch
421 # 2) current branch is tracking a remote branch with local committed
422 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000424 # 3) current branch is tracking a remote branch w/or w/out changes,
425 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000426 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000427 # 4) current branch is tracking a remote branch, switches to a different
428 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000429 # - exit
430
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000431 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
432 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000433 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
434 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000435 if cur_branch is None:
436 upstream_branch = None
437 current_type = "detached"
438 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000439 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000440 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
441 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
442 current_type = "hash"
443 logging.debug("Current branch is not tracking an upstream (remote)"
444 " branch.")
445 elif upstream_branch.startswith('refs/remotes'):
446 current_type = "branch"
447 else:
448 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000449
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000450 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000451 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000452 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000453 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000454 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000455 self.Print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000456
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000457 self._UpdateBranchHeads(options, fetch=True)
458
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000459 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000460 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000461 target = 'HEAD'
462 if options.upstream and upstream_branch:
463 target = upstream_branch
464 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000465
msb@chromium.org786fb682010-06-02 15:16:23 +0000466 if current_type == 'detached':
467 # case 0
468 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000469 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000470 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000471 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000472 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000473 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000475 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000477 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000478 newbase=revision, printed_path=printed_path,
479 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000480 printed_path = True
481 else:
482 # Can't find a merge-base since we don't know our upstream. That makes
483 # this command VERY likely to produce a rebase failure. For now we
484 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000485 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000486 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000487 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000488 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000489 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000490 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000491 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000493 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000494 newbase=revision, printed_path=printed_path,
495 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000497 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000499 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000500 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000501 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000502 switch_error = ("Switching upstream branch from %s to %s\n"
503 % (upstream_branch, new_base) +
504 "Please merge or rebase manually:\n" +
505 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
506 "OR git checkout -b <some new branch> %s" % new_base)
507 raise gclient_utils.Error(switch_error)
508 else:
509 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000510 if files is not None:
511 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000512 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000513 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000514 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000515 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000516 if options.merge:
517 merge_args.append('--ff')
518 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000519 merge_args.append('--ff-only')
520 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000521 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000522 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000523 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000524 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000525 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000526 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000527 printed_path = True
528 while True:
529 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000530 action = self._AskForData(
531 'Cannot %s, attempt to rebase? '
532 '(y)es / (q)uit / (s)kip : ' %
533 ('merge' if options.merge else 'fast-forward merge'),
534 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000535 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000536 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000537 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000538 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000539 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000540 printed_path = True
541 break
542 elif re.match(r'quit|q', action, re.I):
543 raise gclient_utils.Error("Can't fast-forward, please merge or "
544 "rebase manually.\n"
545 "cd %s && git " % self.checkout_path
546 + "rebase %s" % upstream_branch)
547 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000548 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000549 return
550 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000551 self.Print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000552 elif re.match("error: Your local changes to '.*' would be "
553 "overwritten by merge. Aborting.\nPlease, commit your "
554 "changes or stash them before you can merge.\n",
555 e.stderr):
556 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000557 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000558 printed_path = True
559 raise gclient_utils.Error(e.stderr)
560 else:
561 # Some other problem happened with the merge
562 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000563 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000564 raise
565 else:
566 # Fast-forward merge was successful
567 if not re.match('Already up-to-date.', merge_output) or verbose:
568 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000569 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000570 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000571 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000572 if not verbose:
573 # Make the output a little prettier. It's nice to have some
574 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000575 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000576
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000577 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000578 if file_list is not None:
579 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000580
581 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000582 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000583 raise gclient_utils.Error('\n____ %s%s\n'
584 '\nConflict while rebasing this branch.\n'
585 'Fix the conflict and run gclient again.\n'
586 'See man git-rebase for details.\n'
587 % (self.relpath, rev_str))
588
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000589 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000590 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
591 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000592
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000593 # If --reset and --delete_unversioned_trees are specified, remove any
594 # untracked directories.
595 if options.reset and options.delete_unversioned_trees:
596 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
597 # merge-base by default), so doesn't include untracked files. So we use
598 # 'git ls-files --directory --others --exclude-standard' here directly.
599 paths = scm.GIT.Capture(
600 ['ls-files', '--directory', '--others', '--exclude-standard'],
601 self.checkout_path)
602 for path in (p for p in paths.splitlines() if p.endswith('/')):
603 full_path = os.path.join(self.checkout_path, path)
604 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000605 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000606 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000607
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000608 return self._Capture(['rev-parse', '--verify', 'HEAD'])
609
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000610
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000611 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000612 """Reverts local modifications.
613
614 All reverted files will be appended to file_list.
615 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000616 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000617 # revert won't work if the directory doesn't exist. It needs to
618 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000619 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000620 # Don't reuse the args.
621 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000622
623 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000624 if options.upstream:
625 if self._GetCurrentBranch():
626 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
627 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000628 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000629 if not deps_revision:
630 deps_revision = default_rev
631 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000632 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000633 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000634
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000635 if file_list is not None:
636 files = self._Capture(['diff', deps_revision, '--name-only']).split()
637
maruel@chromium.org37e89872010-09-07 16:11:33 +0000638 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000639 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000640
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000641 if file_list is not None:
642 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
643
644 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000645 """Returns revision"""
646 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000647
msb@chromium.orge28e4982009-09-25 20:51:45 +0000648 def runhooks(self, options, args, file_list):
649 self.status(options, args, file_list)
650
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000651 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000652 """Display status information."""
653 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000654 self.Print('________ couldn\'t run status in %s:\n'
655 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000656 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000657 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000658 self._Run(['diff', '--name-status', merge_base], options,
659 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000660 if file_list is not None:
661 files = self._Capture(['diff', '--name-only', merge_base]).split()
662 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000663
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000664 def GetUsableRev(self, rev, options):
665 """Finds a useful revision for this repository.
666
667 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
668 will be called on the source."""
669 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000670 if not os.path.isdir(self.checkout_path):
671 raise gclient_utils.Error(
672 ( 'We could not find a valid hash for safesync_url response "%s".\n'
673 'Safesync URLs with a git checkout currently require the repo to\n'
674 'be cloned without a safesync_url before adding the safesync_url.\n'
675 'For more info, see: '
676 'http://code.google.com/p/chromium/wiki/UsingNewGit'
677 '#Initial_checkout' ) % rev)
678 elif rev.isdigit() and len(rev) < 7:
679 # Handles an SVN rev. As an optimization, only verify an SVN revision as
680 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000681 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000682 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
683 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000684 try:
685 logging.debug('Looking for git-svn configuration optimizations.')
686 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
687 cwd=self.checkout_path):
688 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
689 except subprocess2.CalledProcessError:
690 logging.debug('git config --get svn-remote.svn.fetch failed, '
691 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000692 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000693 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000694 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000695 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000696 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
697 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000698 except gclient_utils.Error, e:
699 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000700 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000701 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
702 'the closest sane git revision, which is:\n'
703 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000704 if not sha1:
705 raise gclient_utils.Error(
706 ( 'It appears that either your git-svn remote is incorrectly\n'
707 'configured or the revision in your safesync_url is\n'
708 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
709 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000710 else:
711 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
712 sha1 = rev
713 else:
714 # May exist in origin, but we don't have it yet, so fetch and look
715 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000716 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000717 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
718 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000719
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000720 if not sha1:
721 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000722 ( 'We could not find a valid hash for safesync_url response "%s".\n'
723 'Safesync URLs with a git checkout currently require a git-svn\n'
724 'remote or a safesync_url that provides git sha1s. Please add a\n'
725 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000726 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000727 '#Initial_checkout' ) % rev)
728
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000729 return sha1
730
msb@chromium.orge6f78352010-01-13 17:05:33 +0000731 def FullUrlForRelativeUrl(self, url):
732 # Strip from last '/'
733 # Equivalent to unix basename
734 base_url = self.url
735 return base_url[:base_url.rfind('/')] + url
736
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000737 def _CreateOrUpdateCache(self, url, options):
738 """Make a new git mirror or update existing mirror for |url|, and return the
739 mirror URI to clone from.
740
741 If no cache-dir is specified, just return |url| unchanged.
742 """
743 if not self.cache_dir:
744 return url
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000745 v = ['-v'] if options.verbose else []
hinoka@google.com1b8f0ab2014-03-18 02:10:38 +0000746 self._Run(['cache', 'populate'] + v + ['--cache-dir', self.cache_dir, url],
hinoka@google.com267f33e2014-02-28 22:02:32 +0000747 options, cwd=self._root_dir, retry=True)
748 return self._Run(['cache', 'exists', '--cache-dir', self.cache_dir, url],
hinoka@google.com703fe5d2014-02-28 23:10:51 +0000749 options, cwd=self._root_dir, ).strip()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000750
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000751 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000752 """Clone a git repository from the given URL.
753
msb@chromium.org786fb682010-06-02 15:16:23 +0000754 Once we've cloned the repo, we checkout a working branch if the specified
755 revision is a branch head. If it is a tag or a specific commit, then we
756 leave HEAD detached as it makes future updates simpler -- in this case the
757 user should first create a new branch or switch to an existing branch before
758 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000759 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000760 # git clone doesn't seem to insert a newline properly before printing
761 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000762 self.Print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000763 template_path = os.path.join(
764 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgff113292014-03-25 06:02:08 +0000765 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000766 clone_cmd = cfg + [
767 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000768 if self.cache_dir:
769 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000770 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000771 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000772 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000773 # If the parent directory does not exist, Git clone on Windows will not
774 # create it, so we need to do it manually.
775 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000776 gclient_utils.safe_makedirs(parent_dir)
777 tmp_dir = tempfile.mkdtemp(
778 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
779 dir=parent_dir)
780 try:
781 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000782 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000783 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000784 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
785 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000786 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000787 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000788 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000789 finally:
790 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000791 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000792 gclient_utils.rmtree(tmp_dir)
793 if revision.startswith('refs/heads/'):
794 self._Run(
795 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
796 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000797 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000798 self._Run(['checkout', '--quiet', revision], options)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000799 self.Print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000800 ('Checked out %s to a detached HEAD. Before making any commits\n'
801 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000802 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
803 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000804
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000805 @staticmethod
806 def _AskForData(prompt, options):
807 if options.jobs > 1:
808 raise gclient_utils.Error("Background task requires input. Rerun "
809 "gclient with --jobs=1 so that\n"
810 "interaction is possible.")
811 try:
812 return raw_input(prompt)
813 except KeyboardInterrupt:
814 # Hide the exception.
815 sys.exit(1)
816
817
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000818 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000819 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000820 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000821 if files is not None:
822 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000823 revision = upstream
824 if newbase:
825 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000826 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000827 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000828 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000829 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000830 printed_path = True
831 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000832 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000833
834 if merge:
835 merge_output = self._Capture(['merge', revision])
836 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000837 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000838 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000839
840 # Build the rebase command here using the args
841 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
842 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000843 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000844 rebase_cmd.append('--verbose')
845 if newbase:
846 rebase_cmd.extend(['--onto', newbase])
847 rebase_cmd.append(upstream)
848 if branch:
849 rebase_cmd.append(branch)
850
851 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000852 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000853 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000854 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
855 re.match(r'cannot rebase: your index contains uncommitted changes',
856 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000857 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000858 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000859 'Cannot rebase because of unstaged changes.\n'
860 '\'git reset --hard HEAD\' ?\n'
861 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000862 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000863 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000864 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000865 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000866 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000867 break
868 elif re.match(r'quit|q', rebase_action, re.I):
869 raise gclient_utils.Error("Please merge or rebase manually\n"
870 "cd %s && git " % self.checkout_path
871 + "%s" % ' '.join(rebase_cmd))
872 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000873 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000874 continue
875 else:
876 gclient_utils.Error("Input not recognized")
877 continue
878 elif re.search(r'^CONFLICT', e.stdout, re.M):
879 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
880 "Fix the conflict and run gclient again.\n"
881 "See 'man git-rebase' for details.\n")
882 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000883 self.Print(e.stdout.strip())
884 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000885 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
886 "manually.\ncd %s && git " %
887 self.checkout_path
888 + "%s" % ' '.join(rebase_cmd))
889
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000890 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000891 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000892 # Make the output a little prettier. It's nice to have some
893 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000894 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000895
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000896 @staticmethod
897 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000898 (ok, current_version) = scm.GIT.AssertVersion(min_version)
899 if not ok:
900 raise gclient_utils.Error('git version %s < minimum required %s' %
901 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000902
msb@chromium.org786fb682010-06-02 15:16:23 +0000903 def _IsRebasing(self):
904 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
905 # have a plumbing command to determine whether a rebase is in progress, so
906 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
907 g = os.path.join(self.checkout_path, '.git')
908 return (
909 os.path.isdir(os.path.join(g, "rebase-merge")) or
910 os.path.isdir(os.path.join(g, "rebase-apply")))
911
912 def _CheckClean(self, rev_str):
913 # Make sure the tree is clean; see git-rebase.sh for reference
914 try:
915 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000916 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000917 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000918 raise gclient_utils.Error('\n____ %s%s\n'
919 '\tYou have unstaged changes.\n'
920 '\tPlease commit, stash, or reset.\n'
921 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000922 try:
923 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000924 '--ignore-submodules', 'HEAD', '--'],
925 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000926 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000927 raise gclient_utils.Error('\n____ %s%s\n'
928 '\tYour index contains uncommitted changes\n'
929 '\tPlease commit, stash, or reset.\n'
930 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000931
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000932 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000933 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
934 # reference by a commit). If not, error out -- most likely a rebase is
935 # in progress, try to detect so we can give a better error.
936 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000937 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
938 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000939 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000940 # Commit is not contained by any rev. See if the user is rebasing:
941 if self._IsRebasing():
942 # Punt to the user
943 raise gclient_utils.Error('\n____ %s%s\n'
944 '\tAlready in a conflict, i.e. (no branch).\n'
945 '\tFix the conflict and run gclient again.\n'
946 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
947 '\tSee man git-rebase for details.\n'
948 % (self.relpath, rev_str))
949 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000950 name = ('saved-by-gclient-' +
951 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000952 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000953 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000954 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000955
msb@chromium.org5bde4852009-12-14 16:47:12 +0000956 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000957 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000958 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000959 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000960 return None
961 return branch
962
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000963 def _Capture(self, args, cwd=None, **kwargs):
964 kwargs.setdefault('cwd', self.checkout_path)
965 kwargs.setdefault('stderr', subprocess2.PIPE)
966 return subprocess2.check_output(['git'] + args, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000967
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000968 def _UpdateBranchHeads(self, options, fetch=False):
969 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
970 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000971 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000972 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
973 '^\\+refs/branch-heads/\\*:.*$']
974 self._Run(config_cmd, options)
975 if fetch:
szager@chromium.orgff113292014-03-25 06:02:08 +0000976 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000977 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000978 if options.verbose:
979 fetch_cmd.append('--verbose')
980 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000981
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000982 def _Run(self, args, options, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000983 cwd = kwargs.setdefault('cwd', self.checkout_path)
984 kwargs.setdefault('stdout', self.out_fh)
985 filter_kwargs = { 'time_throttle': 10, 'out_fh': self.out_fh }
986 if self.out_cb:
987 filter_kwargs['predicate'] = self.out_cb
988 kwargs['filter_fn'] = git_filter = gclient_utils.GitFilter(**filter_kwargs)
989 kwargs.setdefault('print_stdout', False)
990 # Don't prompt for passwords; just fail quickly and noisily.
991 # By default, git will use an interactive terminal prompt when a username/
992 # password is needed. That shouldn't happen in the chromium workflow,
993 # and if it does, then gclient may hide the prompt in the midst of a flood
994 # of terminal spew. The only indication that something has gone wrong
995 # will be when gclient hangs unresponsively. Instead, we disable the
996 # password prompt and simply allow git to fail noisily. The error
997 # message produced by git will be copied to gclient's output.
998 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
999 env.setdefault('GIT_ASKPASS', 'true')
1000 env.setdefault('SSH_ASKPASS', 'true')
1001
agable@chromium.org772efaf2014-04-01 02:35:44 +00001002 cmd = ['git'] + args
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001003 header = "running '%s' in '%s'" % (' '.join(cmd), cwd)
1004 git_filter(header)
1005 return gclient_utils.CheckCallAndFilter(cmd, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001006
1007
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001008class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001009 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001010 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001011
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001012 @staticmethod
1013 def BinaryExists():
1014 """Returns true if the command exists."""
1015 try:
1016 result, version = scm.SVN.AssertVersion('1.4')
1017 if not result:
1018 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1019 return result
1020 except OSError:
1021 return False
1022
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001023 def GetCheckoutRoot(self):
1024 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1025
floitsch@google.comeaab7842011-04-28 09:07:58 +00001026 def GetRevisionDate(self, revision):
1027 """Returns the given revision's date in ISO-8601 format (which contains the
1028 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001029 date = scm.SVN.Capture(
1030 ['propget', '--revprop', 'svn:date', '-r', revision],
1031 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001032 return date.strip()
1033
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001034 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001035 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001036 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001037
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001038 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001039 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001040 if not os.path.isdir(self.checkout_path):
1041 raise gclient_utils.Error('Directory %s is not present.' %
1042 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001043 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001044
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001045 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001046 """Generates a patch file which can be applied to the root of the
1047 repository."""
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)
1051 gclient_utils.CheckCallAndFilter(
1052 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1053 cwd=self.checkout_path,
1054 print_stdout=False,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001055 filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001056
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001057 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001058 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001059
1060 All updated files will be appended to file_list.
1061
1062 Raises:
1063 Error: if can't get URL for relative path.
1064 """
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001065 # Only update if git or hg is not controlling the directory.
1066 git_path = os.path.join(self.checkout_path, '.git')
1067 if os.path.exists(git_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001068 self.Print('________ found .git directory; skipping %s' % self.relpath)
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001069 return
1070
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001071 hg_path = os.path.join(self.checkout_path, '.hg')
1072 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001073 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001074 return
1075
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001076 if args:
1077 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1078
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001079 # revision is the revision to match. It is None if no revision is specified,
1080 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001081 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001082 # Keep the original unpinned url for reference in case the repo is switched.
1083 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001084 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001085 if options.revision:
1086 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001087 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001088 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001089 if revision != 'unmanaged':
1090 forced_revision = True
1091 # Reconstruct the url.
1092 url = '%s@%s' % (url, revision)
1093 rev_str = ' at %s' % revision
1094 else:
1095 managed = False
1096 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001097 else:
1098 forced_revision = False
1099 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001100
borenet@google.com7ff04292014-03-10 12:57:25 +00001101 # Get the existing scm url and the revision number of the current checkout.
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001102 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001103 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001104 try:
1105 from_info = scm.SVN.CaptureLocalInfo(
1106 [], os.path.join(self.checkout_path, '.'))
1107 except (gclient_utils.Error, subprocess2.CalledProcessError):
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001108 if options.reset and options.delete_unversioned_trees:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001109 self.Print('Removing troublesome path %s' % self.checkout_path)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001110 gclient_utils.rmtree(self.checkout_path)
1111 exists = False
1112 else:
1113 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1114 'present. Delete the directory and try again.')
1115 raise gclient_utils.Error(msg % self.checkout_path)
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001116
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001117 BASE_URLS = {
1118 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1119 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1120 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001121 WHITELISTED_ROOTS = [
1122 'svn://svn.chromium.org',
1123 'svn://svn-mirror.golo.chromium.org',
1124 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001125 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001126 try:
1127 # Split out the revision number since it's not useful for us.
1128 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001129 # Check to see if we're on a whitelisted root. We do this because
1130 # only some svn servers have matching UUIDs.
1131 local_parsed = urlparse.urlparse(url)
1132 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001133 if ('CHROME_HEADLESS' in os.environ
1134 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001135 and base_path in BASE_URLS
1136 and local_root in WHITELISTED_ROOTS):
1137
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001138 # Use a tarball for initial sync if we are on a bot.
1139 # Get an unauthenticated gsutil instance.
1140 gsutil = download_from_google_storage.Gsutil(
1141 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1142
1143 gs_path = BASE_URLS[base_path]
1144 _, out, _ = gsutil.check_call('ls', gs_path)
1145 # So that we can get the most recent revision.
1146 sorted_items = sorted(out.splitlines())
1147 latest_checkout = sorted_items[-1]
1148
1149 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001150 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001151 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1152 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001153 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001154 raise Exception()
1155 filename = latest_checkout.split('/')[-1]
1156 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001157 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001158 gclient_utils.safe_makedirs(self.checkout_path)
1159 # TODO(hinoka): Use 7z for windows.
1160 cmd = ['tar', '--extract', '--ungzip',
1161 '--directory', self.checkout_path,
1162 '--file', tarball]
1163 gclient_utils.CheckCallAndFilter(
1164 cmd, stdout=sys.stdout, print_stdout=True)
1165
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001166 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001167 gclient_utils.rmtree(tempdir)
1168
1169 # Rewrite the repository root to match.
1170 tarball_url = scm.SVN.CaptureLocalInfo(
1171 ['.'], self.checkout_path)['Repository Root']
1172 tarball_parsed = urlparse.urlparse(tarball_url)
1173 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1174 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001175
1176 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001177 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001178 self._Run(['switch', '--relocate', tarball_root,
1179 local_root, self.checkout_path],
1180 options)
1181 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001182 self.Print('We tried to get a source tarball but failed.')
1183 self.Print('Resuming normal operations.')
1184 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001185
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001186 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001187 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001188 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001189 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001190 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001191 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001192
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001193 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001194 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001195 return self.Svnversion()
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001196
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001197 if 'URL' not in from_info:
1198 raise gclient_utils.Error(
1199 ('gclient is confused. Couldn\'t get the url for %s.\n'
1200 'Try using @unmanaged.\n%s') % (
1201 self.checkout_path, from_info))
1202
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001203 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001204 dir_info = scm.SVN.CaptureStatus(
1205 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001206 if any(d[0][2] == 'L' for d in dir_info):
1207 try:
1208 self._Run(['cleanup', self.checkout_path], options)
1209 except subprocess2.CalledProcessError, e:
1210 # Get the status again, svn cleanup may have cleaned up at least
1211 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001212 dir_info = scm.SVN.CaptureStatus(
1213 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001214
1215 # Try to fix the failures by removing troublesome files.
1216 for d in dir_info:
1217 if d[0][2] == 'L':
1218 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001219 # We don't pass any files/directories to CaptureStatus and set
1220 # cwd=self.checkout_path, so we should get relative paths here.
1221 assert not os.path.isabs(d[1])
1222 path_to_remove = os.path.normpath(
1223 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001224 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001225 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001226 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001227 self.Print(
1228 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001229 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001230 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001231 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001232
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001233 # Retrieve the current HEAD version because svn is slow at null updates.
1234 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001235 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001236 revision = str(from_info_live['Revision'])
1237 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001238
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001239 if from_info['URL'] != base_url:
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001240 # The repository url changed, need to switch.
1241 try:
1242 to_info = scm.SVN.CaptureRemoteInfo(url)
1243 except (gclient_utils.Error, subprocess2.CalledProcessError):
1244 # The url is invalid or the server is not accessible, it's safer to bail
1245 # out right now.
1246 raise gclient_utils.Error('This url is unreachable: %s' % url)
1247 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1248 and (from_info['UUID'] == to_info['UUID']))
1249 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001250 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001251 # We have different roots, so check if we can switch --relocate.
1252 # Subversion only permits this if the repository UUIDs match.
1253 # Perform the switch --relocate, then rewrite the from_url
1254 # to reflect where we "are now." (This is the same way that
1255 # Subversion itself handles the metadata when switch --relocate
1256 # is used.) This makes the checks below for whether we
1257 # can update to a revision or have to switch to a different
1258 # branch work as expected.
1259 # TODO(maruel): TEST ME !
1260 command = ['switch', '--relocate',
1261 from_info['Repository Root'],
1262 to_info['Repository Root'],
1263 self.relpath]
1264 self._Run(command, options, cwd=self._root_dir)
1265 from_info['URL'] = from_info['URL'].replace(
1266 from_info['Repository Root'],
1267 to_info['Repository Root'])
1268 else:
1269 if not options.force and not options.reset:
1270 # Look for local modifications but ignore unversioned files.
1271 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1272 if status[0][0] != '?':
1273 raise gclient_utils.Error(
1274 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1275 'there is local changes in %s. Delete the directory and '
1276 'try again.') % (url, self.checkout_path))
1277 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001278 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001279 gclient_utils.rmtree(self.checkout_path)
1280 # We need to checkout.
1281 command = ['checkout', url, self.checkout_path]
1282 command = self._AddAdditionalUpdateFlags(command, options, revision)
1283 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1284 return self.Svnversion()
1285
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001286 # If the provided url has a revision number that matches the revision
1287 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001288 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001289 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001290 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001291 else:
1292 command = ['update', self.checkout_path]
1293 command = self._AddAdditionalUpdateFlags(command, options, revision)
1294 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001295
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001296 # If --reset and --delete_unversioned_trees are specified, remove any
1297 # untracked files and directories.
1298 if options.reset and options.delete_unversioned_trees:
1299 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1300 full_path = os.path.join(self.checkout_path, status[1])
1301 if (status[0][0] == '?'
1302 and os.path.isdir(full_path)
1303 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001304 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001305 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001306 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001307
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001308 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001309 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001310 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001311 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001312 # Create an empty checkout and then update the one file we want. Future
1313 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001314 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001315 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001316 if os.path.exists(os.path.join(self.checkout_path, filename)):
1317 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001318 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001319 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001320 # After the initial checkout, we can use update as if it were any other
1321 # dep.
1322 self.update(options, args, file_list)
1323 else:
1324 # If the installed version of SVN doesn't support --depth, fallback to
1325 # just exporting the file. This has the downside that revision
1326 # information is not stored next to the file, so we will have to
1327 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001328 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001329 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001330 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001331 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001332 command = self._AddAdditionalUpdateFlags(command, options,
1333 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001334 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001335
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001336 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001337 """Reverts local modifications. Subversion specific.
1338
1339 All reverted files will be appended to file_list, even if Subversion
1340 doesn't know about them.
1341 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001342 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001343 if os.path.exists(self.checkout_path):
1344 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001345 # svn revert won't work if the directory doesn't exist. It needs to
1346 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001347 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001348 # Don't reuse the args.
1349 return self.update(options, [], file_list)
1350
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001351 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001352 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001353 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001354 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001355 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001356 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001357 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001358 if not options.force:
1359 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001360 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001361 '\n_____ %s is not a valid svn checkout, synching instead' %
1362 self.relpath)
1363 gclient_utils.rmtree(self.checkout_path)
1364 # Don't reuse the args.
1365 return self.update(options, [], file_list)
1366
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001367 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001368 if file_list is not None:
1369 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001370 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001371 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001372 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001373 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001374 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001375
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001376 # Revert() may delete the directory altogether.
1377 if not os.path.isdir(self.checkout_path):
1378 # Don't reuse the args.
1379 return self.update(options, [], file_list)
1380
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001381 try:
1382 # svn revert is so broken we don't even use it. Using
1383 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001384 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001385 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1386 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001387 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001388 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001389 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001390
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001391 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001392 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001393 try:
1394 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001395 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001396 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001397
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001398 def runhooks(self, options, args, file_list):
1399 self.status(options, args, file_list)
1400
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001401 def status(self, options, args, file_list):
1402 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001403 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001404 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001405 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001406 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001407 'The directory does not exist.') %
1408 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001409 # There's no file list to retrieve.
1410 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001411 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001412
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001413 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001414 """Verifies the validity of the revision for this repository."""
1415 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1416 raise gclient_utils.Error(
1417 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1418 'correct.') % rev)
1419 return rev
1420
msb@chromium.orge6f78352010-01-13 17:05:33 +00001421 def FullUrlForRelativeUrl(self, url):
1422 # Find the forth '/' and strip from there. A bit hackish.
1423 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001424
maruel@chromium.org669600d2010-09-01 19:06:31 +00001425 def _Run(self, args, options, **kwargs):
1426 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001427 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001428 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001429 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001430
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001431 def Svnversion(self):
1432 """Runs the lowest checked out revision in the current project."""
1433 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1434 return info['Revision']
1435
maruel@chromium.org669600d2010-09-01 19:06:31 +00001436 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1437 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001438 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001439 scm.SVN.RunAndGetFileList(
1440 options.verbose,
1441 args + ['--ignore-externals'],
1442 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001443 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001444
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001445 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001446 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001447 """Add additional flags to command depending on what options are set.
1448 command should be a list of strings that represents an svn command.
1449
1450 This method returns a new list to be used as a command."""
1451 new_command = command[:]
1452 if revision:
1453 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001454 # We don't want interaction when jobs are used.
1455 if options.jobs > 1:
1456 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001457 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001458 # --accept was added to 'svn update' in svn 1.6.
1459 if not scm.SVN.AssertVersion('1.5')[0]:
1460 return new_command
1461
1462 # It's annoying to have it block in the middle of a sync, just sensible
1463 # defaults.
1464 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001465 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001466 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1467 new_command.extend(('--accept', 'theirs-conflict'))
1468 elif options.manually_grab_svn_rev:
1469 new_command.append('--force')
1470 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1471 new_command.extend(('--accept', 'postpone'))
1472 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1473 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001474 return new_command