blob: 91f03b027751c572a68d3c1826a27e572122174f [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
maruel@chromium.org754960e2009-09-21 12:31:05 +00007import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00008import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00009import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000010import re
borenet@google.com88d10082014-03-21 17:24:48 +000011import shlex
maruel@chromium.org90541732011-04-01 17:54:18 +000012import sys
ilevy@chromium.org3534aa52013-07-20 01:58:08 +000013import tempfile
zty@chromium.org6279e8a2014-02-13 01:45:25 +000014import traceback
hinoka@google.com2f2ca142014-01-07 03:59:18 +000015import urlparse
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000016
hinoka@google.com2f2ca142014-01-07 03:59:18 +000017import download_from_google_storage
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000018import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000019import scm
20import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000021
22
szager@chromium.org71cbb502013-04-19 23:30:15 +000023THIS_FILE_PATH = os.path.abspath(__file__)
24
hinoka@google.com2f2ca142014-01-07 03:59:18 +000025GSUTIL_DEFAULT_PATH = os.path.join(
26 os.path.dirname(os.path.abspath(__file__)),
27 'third_party', 'gsutil', 'gsutil')
28
szager@chromium.org71cbb502013-04-19 23:30:15 +000029
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000030class DiffFiltererWrapper(object):
31 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000032 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000033 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000034 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000035 original_prefix = "--- "
36 working_prefix = "+++ "
37
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000038 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000039 # Note that we always use '/' as the path separator to be
40 # consistent with svn's cygwin-style output on Windows
41 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000042 self._current_file = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000043
maruel@chromium.org6e29d572010-06-04 17:32:20 +000044 def SetCurrentFile(self, current_file):
45 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000046
iannucci@chromium.org3830a672013-02-19 20:15:14 +000047 @property
48 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000049 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000050
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000051 def _Replace(self, line):
52 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000053
54 def Filter(self, line):
55 if (line.startswith(self.index_string)):
56 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000057 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000058 else:
59 if (line.startswith(self.original_prefix) or
60 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000061 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000062 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000063
64
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000065class SvnDiffFilterer(DiffFiltererWrapper):
66 index_string = "Index: "
67
68
69class GitDiffFilterer(DiffFiltererWrapper):
70 index_string = "diff --git "
71
72 def SetCurrentFile(self, current_file):
73 # Get filename by parsing "a/<filename> b/<filename>"
74 self._current_file = current_file[:(len(current_file)/2)][2:]
75
76 def _Replace(self, line):
77 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
78
79
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000080### SCM abstraction layer
81
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000082# Factory Method for SCM wrapper creation
83
maruel@chromium.org9eda4112010-06-11 18:56:10 +000084def GetScmName(url):
85 if url:
86 url, _ = gclient_utils.SplitUrlRevision(url)
87 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000088 url.startswith('git+http://') or url.startswith('git+https://') or
mariakhomenko@chromium.orga2ede5c2014-02-05 22:05:17 +000089 url.endswith('.git') or url.startswith('sso://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000090 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000091 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000092 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000093 return 'svn'
94 return None
95
96
97def CreateSCM(url, root_dir=None, relpath=None):
98 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000099 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000100 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000101 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000102
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000103 scm_name = GetScmName(url)
104 if not scm_name in SCM_MAP:
105 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000106 scm_class = SCM_MAP[scm_name]
107 if not scm_class.BinaryExists():
108 raise gclient_utils.Error('%s command not found' % scm_name)
109 return scm_class(url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000110
111
112# SCMWrapper base class
113
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000114class SCMWrapper(object):
115 """Add necessary glue between all the supported SCM.
116
msb@chromium.orgd6504212010-01-13 17:34:31 +0000117 This is the abstraction layer to bind to different SCM.
118 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000119 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000120 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000121 self._root_dir = root_dir
122 if self._root_dir:
123 self._root_dir = self._root_dir.replace('/', os.sep)
124 self.relpath = relpath
125 if self.relpath:
126 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000127 if self.relpath and self._root_dir:
128 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000129
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000130 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000131 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000132 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000133
134 if not command in commands:
135 raise gclient_utils.Error('Unknown command %s' % command)
136
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000137 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000138 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000139 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000140
141 return getattr(self, command)(options, args, file_list)
142
borenet@google.com4e9be262014-04-08 19:40:30 +0000143 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000144 """Attempt to determine the remote URL for this SCMWrapper."""
borenet@google.com4e9be262014-04-08 19:40:30 +0000145 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000146 if os.path.exists(os.path.join(self.checkout_path, '.git')):
borenet@google.com4e9be262014-04-08 19:40:30 +0000147 actual_remote_url = shlex.split(scm.GIT.Capture(
borenet@google.com88d10082014-03-21 17:24:48 +0000148 ['config', '--local', '--get-regexp', r'remote.*.url'],
149 self.checkout_path))[1]
borenet@google.com4e9be262014-04-08 19:40:30 +0000150
151 # If a cache_dir is used, obtain the actual remote URL from the cache.
152 if getattr(self, 'cache_dir', None):
153 try:
154 full_cache_dir = self._Run(['cache', 'exists', '--cache-dir',
155 self.cache_dir, self.url],
156 options, cwd=self._root_dir).strip()
157 except subprocess2.CalledProcessError:
158 full_cache_dir = None
159 if (full_cache_dir.replace('\\', '/') ==
160 actual_remote_url.replace('\\', '/')):
161 actual_remote_url = shlex.split(scm.GIT.Capture(
162 ['config', '--local', '--get-regexp', r'remote.*.url'],
163 os.path.join(self._root_dir, full_cache_dir)))[1]
164 return actual_remote_url
165
166 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000167 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000168 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000169 return None
170
borenet@google.com4e9be262014-04-08 19:40:30 +0000171 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000172 """Determine whether the remote URL of this checkout is the expected URL."""
173 if not os.path.exists(self.checkout_path):
174 # A checkout which doesn't exist can't be broken.
175 return True
176
borenet@google.com4e9be262014-04-08 19:40:30 +0000177 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000178 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000179 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
180 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000181 else:
182 # This may occur if the self.checkout_path exists but does not contain a
183 # valid git or svn checkout.
184 return False
185
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000186
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000187class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000188 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000189 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000190 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000191
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000192 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000193
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000194 def __init__(self, url=None, root_dir=None, relpath=None):
195 """Removes 'git+' fake prefix from git URL."""
196 if url.startswith('git+http://') or url.startswith('git+https://'):
197 url = url[4:]
198 SCMWrapper.__init__(self, url, root_dir, relpath)
199
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000200 @staticmethod
201 def BinaryExists():
202 """Returns true if the command exists."""
203 try:
204 # We assume git is newer than 1.7. See: crbug.com/114483
205 result, version = scm.GIT.AssertVersion('1.7')
206 if not result:
207 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
208 return result
209 except OSError:
210 return False
211
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000212 def GetCheckoutRoot(self):
213 return scm.GIT.GetCheckoutRoot(self.checkout_path)
214
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000215 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000216 """Returns the given revision's date in ISO-8601 format (which contains the
217 time zone)."""
218 # TODO(floitsch): get the time-stamp of the given revision and not just the
219 # time-stamp of the currently checked out revision.
220 return self._Capture(['log', '-n', '1', '--format=%ai'])
221
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000222 @staticmethod
223 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000224 """'Cleanup' the repo.
225
226 There's no real git equivalent for the svn cleanup command, do a no-op.
227 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000228
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000229 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000230 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000231 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000232
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000233 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000234 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000235 repository.
236
237 The patch file is generated from a diff of the merge base of HEAD and
238 its upstream branch.
239 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000240 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000241 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000242 ['git', 'diff', merge_base],
243 cwd=self.checkout_path,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +0000244 filter_fn=GitDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000245
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000246 def UpdateSubmoduleConfig(self):
247 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000248 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000249 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000250 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000251 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000252 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000253 kwargs = {'cwd': self.checkout_path,
254 'print_stdout': False,
255 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000256 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000257 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
258 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000259 except subprocess2.CalledProcessError:
260 # Not a fatal error, or even very interesting in a non-git-submodule
261 # world. So just keep it quiet.
262 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000263 try:
264 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
265 except subprocess2.CalledProcessError:
266 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000267
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000268 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
269
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000270 def _FetchAndReset(self, revision, file_list, options):
271 """Equivalent to git fetch; git reset."""
272 quiet = []
273 if not options.verbose:
274 quiet = ['--quiet']
275 self._UpdateBranchHeads(options, fetch=False)
276
szager@chromium.orgff113292014-03-25 06:02:08 +0000277 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000278 fetch_cmd = cfg + ['fetch', self.remote, '--prune']
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000279 self._Run(fetch_cmd + quiet, options, retry=True)
280 self._Run(['reset', '--hard', revision] + quiet, options)
281 self.UpdateSubmoduleConfig()
282 if file_list is not None:
283 files = self._Capture(['ls-files']).splitlines()
284 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
285
msb@chromium.orge28e4982009-09-25 20:51:45 +0000286 def update(self, options, args, file_list):
287 """Runs git to update or transparently checkout the working copy.
288
289 All updated files will be appended to file_list.
290
291 Raises:
292 Error: if can't get URL for relative path.
293 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000294 if args:
295 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
296
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000297 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000298
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000299 # If a dependency is not pinned, track the default remote branch.
300 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000301 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000302 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000303 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000304 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000305 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000306 # Override the revision number.
307 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000308 if revision == 'unmanaged':
309 revision = None
310 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000311 if not revision:
312 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000313
floitsch@google.comeaab7842011-04-28 09:07:58 +0000314 if gclient_utils.IsDateRevision(revision):
315 # Date-revisions only work on git-repositories if the reflog hasn't
316 # expired yet. Use rev-list to get the corresponding revision.
317 # git rev-list -n 1 --before='time-stamp' branchname
318 if options.transitive:
319 print('Warning: --transitive only works for SVN repositories.')
320 revision = default_rev
321
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000322 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000323 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000324
325 printed_path = False
326 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000327 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000328 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000329 verbose = ['--verbose']
330 printed_path = True
331
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000332 url = self._CreateOrUpdateCache(url, options)
333
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000334 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000335 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000336 elif revision.startswith(self.remote + '/'):
337 # For compatibility with old naming, translate 'origin' to 'refs/heads'
338 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000339 rev_type = "branch"
340 else:
341 # hash is also a tag, only make a distinction at checkout
342 rev_type = "hash"
343
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000344 if (not os.path.exists(self.checkout_path) or
345 (os.path.isdir(self.checkout_path) and
346 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000347 self._Clone(revision, url, options)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000348 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000349 if file_list is not None:
350 files = self._Capture(['ls-files']).splitlines()
351 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000352 if not verbose:
353 # Make the output a little prettier. It's nice to have some whitespace
354 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000355 print('')
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000356 return self._Capture(['rev-parse', '--verify', 'HEAD'])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000357
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000358 if not managed:
359 self._UpdateBranchHeads(options, fetch=False)
360 self.UpdateSubmoduleConfig()
361 print ('________ unmanaged solution; skipping %s' % self.relpath)
362 return self._Capture(['rev-parse', '--verify', 'HEAD'])
363
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +0000364 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
365 raise gclient_utils.Error('\n____ %s%s\n'
366 '\tPath is not a git repo. No .git dir.\n'
367 '\tTo resolve:\n'
368 '\t\trm -rf %s\n'
369 '\tAnd run gclient sync again\n'
370 % (self.relpath, rev_str, self.relpath))
371
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000372 # See if the url has changed (the unittests use git://foo for the url, let
373 # that through).
374 current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
375 return_early = False
376 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
377 # unit test pass. (and update the comment above)
378 # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
379 # This allows devs to use experimental repos which have a different url
380 # but whose branch(s) are the same as official repos.
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +0000381 if (current_url != url and
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000382 url != 'git://foo' and
383 subprocess2.capture(
384 ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
385 cwd=self.checkout_path).strip() != 'False'):
386 print('_____ switching %s to a new upstream' % self.relpath)
387 # Make sure it's clean
388 self._CheckClean(rev_str)
389 # Switch over to the new upstream
390 self._Run(['remote', 'set-url', self.remote, url], options)
391 self._FetchAndReset(revision, file_list, options)
392 return_early = True
393
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000394 if return_early:
395 return self._Capture(['rev-parse', '--verify', 'HEAD'])
396
msb@chromium.org5bde4852009-12-14 16:47:12 +0000397 cur_branch = self._GetCurrentBranch()
398
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000399 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000400 # 0) HEAD is detached. Probably from our initial clone.
401 # - make sure HEAD is contained by a named ref, then update.
402 # Cases 1-4. HEAD is a branch.
403 # 1) current branch is not tracking a remote branch (could be git-svn)
404 # - try to rebase onto the new hash or branch
405 # 2) current branch is tracking a remote branch with local committed
406 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000407 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000408 # 3) current branch is tracking a remote branch w/or w/out changes,
409 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000410 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000411 # 4) current branch is tracking a remote branch, switches to a different
412 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000413 # - exit
414
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000415 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
416 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000417 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
418 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000419 if cur_branch is None:
420 upstream_branch = None
421 current_type = "detached"
422 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000423 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000424 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
425 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
426 current_type = "hash"
427 logging.debug("Current branch is not tracking an upstream (remote)"
428 " branch.")
429 elif upstream_branch.startswith('refs/remotes'):
430 current_type = "branch"
431 else:
432 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000433
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000434 if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True):
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000435 # Update the remotes first so we have all the refs.
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000436 remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'],
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000437 cwd=self.checkout_path)
bauerb@chromium.orgcbd20a42012-06-27 13:49:27 +0000438 if verbose:
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000439 print(remote_output)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000440
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000441 self._UpdateBranchHeads(options, fetch=True)
442
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000443 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000444 if options.force or options.reset:
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000445 target = 'HEAD'
446 if options.upstream and upstream_branch:
447 target = upstream_branch
448 self._Run(['reset', '--hard', target], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000449
msb@chromium.org786fb682010-06-02 15:16:23 +0000450 if current_type == 'detached':
451 # case 0
452 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000453 self._CheckDetachedHead(rev_str, options)
nsylvain@chromium.orgf7826d72011-06-02 18:20:14 +0000454 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000455 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000456 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000457 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000458 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000459 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000460 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000461 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000462 newbase=revision, printed_path=printed_path,
463 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000464 printed_path = True
465 else:
466 # Can't find a merge-base since we don't know our upstream. That makes
467 # this command VERY likely to produce a rebase failure. For now we
468 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000469 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000470 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000471 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000472 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000473 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000474 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000475 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000476 # case 2
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
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000481 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000482 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000483 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000484 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000485 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000486 switch_error = ("Switching upstream branch from %s to %s\n"
487 % (upstream_branch, new_base) +
488 "Please merge or rebase manually:\n" +
489 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
490 "OR git checkout -b <some new branch> %s" % new_base)
491 raise gclient_utils.Error(switch_error)
492 else:
493 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000494 if files is not None:
495 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000497 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000499 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000500 if options.merge:
501 merge_args.append('--ff')
502 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000503 merge_args.append('--ff-only')
504 merge_args.append(upstream_branch)
505 merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000506 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000507 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000508 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000509 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000510 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000511 printed_path = True
512 while True:
513 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000514 action = self._AskForData(
515 'Cannot %s, attempt to rebase? '
516 '(y)es / (q)uit / (s)kip : ' %
517 ('merge' if options.merge else 'fast-forward merge'),
518 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000519 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000520 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000521 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000522 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000523 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000524 printed_path = True
525 break
526 elif re.match(r'quit|q', action, re.I):
527 raise gclient_utils.Error("Can't fast-forward, please merge or "
528 "rebase manually.\n"
529 "cd %s && git " % self.checkout_path
530 + "rebase %s" % upstream_branch)
531 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000532 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000533 return
534 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000535 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000536 elif re.match("error: Your local changes to '.*' would be "
537 "overwritten by merge. Aborting.\nPlease, commit your "
538 "changes or stash them before you can merge.\n",
539 e.stderr):
540 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000541 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000542 printed_path = True
543 raise gclient_utils.Error(e.stderr)
544 else:
545 # Some other problem happened with the merge
546 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000547 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000548 raise
549 else:
550 # Fast-forward merge was successful
551 if not re.match('Already up-to-date.', merge_output) or verbose:
552 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000553 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000554 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000555 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000556 if not verbose:
557 # Make the output a little prettier. It's nice to have some
558 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000559 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000560
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000561 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000562 if file_list is not None:
563 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000564
565 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000566 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000567 raise gclient_utils.Error('\n____ %s%s\n'
568 '\nConflict while rebasing this branch.\n'
569 'Fix the conflict and run gclient again.\n'
570 'See man git-rebase for details.\n'
571 % (self.relpath, rev_str))
572
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000573 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000574 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000575
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000576 # If --reset and --delete_unversioned_trees are specified, remove any
577 # untracked directories.
578 if options.reset and options.delete_unversioned_trees:
579 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
580 # merge-base by default), so doesn't include untracked files. So we use
581 # 'git ls-files --directory --others --exclude-standard' here directly.
582 paths = scm.GIT.Capture(
583 ['ls-files', '--directory', '--others', '--exclude-standard'],
584 self.checkout_path)
585 for path in (p for p in paths.splitlines() if p.endswith('/')):
586 full_path = os.path.join(self.checkout_path, path)
587 if not os.path.islink(full_path):
588 print('\n_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000589 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000590
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000591 return self._Capture(['rev-parse', '--verify', 'HEAD'])
592
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000593
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000594 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000595 """Reverts local modifications.
596
597 All reverted files will be appended to file_list.
598 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000599 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000600 # revert won't work if the directory doesn't exist. It needs to
601 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000602 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000603 # Don't reuse the args.
604 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000605
606 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000607 if options.upstream:
608 if self._GetCurrentBranch():
609 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
610 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000611 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000612 if not deps_revision:
613 deps_revision = default_rev
614 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000615 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000616 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000617
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000618 if file_list is not None:
619 files = self._Capture(['diff', deps_revision, '--name-only']).split()
620
maruel@chromium.org37e89872010-09-07 16:11:33 +0000621 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000622 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000623
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000624 if file_list is not None:
625 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
626
627 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000628 """Returns revision"""
629 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000630
msb@chromium.orge28e4982009-09-25 20:51:45 +0000631 def runhooks(self, options, args, file_list):
632 self.status(options, args, file_list)
633
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000634 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000635 """Display status information."""
636 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000637 print(('\n________ couldn\'t run status in %s:\n'
638 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000639 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000640 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000641 self._Run(['diff', '--name-status', merge_base], options)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000642 if file_list is not None:
643 files = self._Capture(['diff', '--name-only', merge_base]).split()
644 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000645
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000646 def GetUsableRev(self, rev, options):
647 """Finds a useful revision for this repository.
648
649 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
650 will be called on the source."""
651 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000652 if not os.path.isdir(self.checkout_path):
653 raise gclient_utils.Error(
654 ( 'We could not find a valid hash for safesync_url response "%s".\n'
655 'Safesync URLs with a git checkout currently require the repo to\n'
656 'be cloned without a safesync_url before adding the safesync_url.\n'
657 'For more info, see: '
658 'http://code.google.com/p/chromium/wiki/UsingNewGit'
659 '#Initial_checkout' ) % rev)
660 elif rev.isdigit() and len(rev) < 7:
661 # Handles an SVN rev. As an optimization, only verify an SVN revision as
662 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000663 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000664 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
665 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000666 try:
667 logging.debug('Looking for git-svn configuration optimizations.')
668 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
669 cwd=self.checkout_path):
670 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
671 except subprocess2.CalledProcessError:
672 logging.debug('git config --get svn-remote.svn.fetch failed, '
673 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000674 if options.verbose:
675 print('Running git svn fetch. This might take a while.\n')
676 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000677 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000678 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
679 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000680 except gclient_utils.Error, e:
681 sha1 = e.message
682 print('\nWarning: Could not find a git revision with accurate\n'
683 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
684 'the closest sane git revision, which is:\n'
685 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000686 if not sha1:
687 raise gclient_utils.Error(
688 ( 'It appears that either your git-svn remote is incorrectly\n'
689 'configured or the revision in your safesync_url is\n'
690 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
691 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000692 else:
693 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
694 sha1 = rev
695 else:
696 # May exist in origin, but we don't have it yet, so fetch and look
697 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000698 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000699 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
700 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000701
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000702 if not sha1:
703 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000704 ( 'We could not find a valid hash for safesync_url response "%s".\n'
705 'Safesync URLs with a git checkout currently require a git-svn\n'
706 'remote or a safesync_url that provides git sha1s. Please add a\n'
707 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000708 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000709 '#Initial_checkout' ) % rev)
710
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000711 return sha1
712
msb@chromium.orge6f78352010-01-13 17:05:33 +0000713 def FullUrlForRelativeUrl(self, url):
714 # Strip from last '/'
715 # Equivalent to unix basename
716 base_url = self.url
717 return base_url[:base_url.rfind('/')] + url
718
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000719 def _CreateOrUpdateCache(self, url, options):
720 """Make a new git mirror or update existing mirror for |url|, and return the
721 mirror URI to clone from.
722
723 If no cache-dir is specified, just return |url| unchanged.
724 """
725 if not self.cache_dir:
726 return url
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000727 v = ['-v'] if options.verbose else []
hinoka@google.com1b8f0ab2014-03-18 02:10:38 +0000728 self._Run(['cache', 'populate'] + v + ['--cache-dir', self.cache_dir, url],
hinoka@google.com267f33e2014-02-28 22:02:32 +0000729 options, cwd=self._root_dir, retry=True)
730 return self._Run(['cache', 'exists', '--cache-dir', self.cache_dir, url],
hinoka@google.com703fe5d2014-02-28 23:10:51 +0000731 options, cwd=self._root_dir, ).strip()
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000732
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000733 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000734 """Clone a git repository from the given URL.
735
msb@chromium.org786fb682010-06-02 15:16:23 +0000736 Once we've cloned the repo, we checkout a working branch if the specified
737 revision is a branch head. If it is a tag or a specific commit, then we
738 leave HEAD detached as it makes future updates simpler -- in this case the
739 user should first create a new branch or switch to an existing branch before
740 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000741 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000742 # git clone doesn't seem to insert a newline properly before printing
743 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000744 print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000745 template_path = os.path.join(
746 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgff113292014-03-25 06:02:08 +0000747 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000748 clone_cmd = cfg + [
749 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000750 if self.cache_dir:
751 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000752 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000753 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000754 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000755 # If the parent directory does not exist, Git clone on Windows will not
756 # create it, so we need to do it manually.
757 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000758 gclient_utils.safe_makedirs(parent_dir)
759 tmp_dir = tempfile.mkdtemp(
760 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
761 dir=parent_dir)
762 try:
763 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000764 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000765 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000766 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
767 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000768 except:
769 traceback.print_exc(file=sys.stderr)
770 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000771 finally:
772 if os.listdir(tmp_dir):
773 print('\n_____ removing non-empty tmp dir %s' % tmp_dir)
774 gclient_utils.rmtree(tmp_dir)
775 if revision.startswith('refs/heads/'):
776 self._Run(
777 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
778 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000779 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000780 self._Run(['checkout', '--quiet', revision], options)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000781 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000782 ('Checked out %s to a detached HEAD. Before making any commits\n'
783 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000784 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
785 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000786
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000787 @staticmethod
788 def _AskForData(prompt, options):
789 if options.jobs > 1:
790 raise gclient_utils.Error("Background task requires input. Rerun "
791 "gclient with --jobs=1 so that\n"
792 "interaction is possible.")
793 try:
794 return raw_input(prompt)
795 except KeyboardInterrupt:
796 # Hide the exception.
797 sys.exit(1)
798
799
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000800 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000801 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000802 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000803 if files is not None:
804 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000805 revision = upstream
806 if newbase:
807 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000808 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000809 if not printed_path:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000810 print('\n_____ %s : Attempting %s onto %s...' % (
811 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000812 printed_path = True
813 else:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000814 print('Attempting %s onto %s...' % (action, revision))
815
816 if merge:
817 merge_output = self._Capture(['merge', revision])
818 if options.verbose:
819 print(merge_output)
820 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000821
822 # Build the rebase command here using the args
823 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
824 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000825 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000826 rebase_cmd.append('--verbose')
827 if newbase:
828 rebase_cmd.extend(['--onto', newbase])
829 rebase_cmd.append(upstream)
830 if branch:
831 rebase_cmd.append(branch)
832
833 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000834 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000835 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000836 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
837 re.match(r'cannot rebase: your index contains uncommitted changes',
838 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000839 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000840 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000841 'Cannot rebase because of unstaged changes.\n'
842 '\'git reset --hard HEAD\' ?\n'
843 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000844 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000845 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000846 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000847 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000848 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000849 break
850 elif re.match(r'quit|q', rebase_action, re.I):
851 raise gclient_utils.Error("Please merge or rebase manually\n"
852 "cd %s && git " % self.checkout_path
853 + "%s" % ' '.join(rebase_cmd))
854 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000855 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000856 continue
857 else:
858 gclient_utils.Error("Input not recognized")
859 continue
860 elif re.search(r'^CONFLICT', e.stdout, re.M):
861 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
862 "Fix the conflict and run gclient again.\n"
863 "See 'man git-rebase' for details.\n")
864 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000865 print(e.stdout.strip())
866 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000867 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
868 "manually.\ncd %s && git " %
869 self.checkout_path
870 + "%s" % ' '.join(rebase_cmd))
871
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000872 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000873 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000874 # Make the output a little prettier. It's nice to have some
875 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000876 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000877
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000878 @staticmethod
879 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000880 (ok, current_version) = scm.GIT.AssertVersion(min_version)
881 if not ok:
882 raise gclient_utils.Error('git version %s < minimum required %s' %
883 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000884
msb@chromium.org786fb682010-06-02 15:16:23 +0000885 def _IsRebasing(self):
886 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
887 # have a plumbing command to determine whether a rebase is in progress, so
888 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
889 g = os.path.join(self.checkout_path, '.git')
890 return (
891 os.path.isdir(os.path.join(g, "rebase-merge")) or
892 os.path.isdir(os.path.join(g, "rebase-apply")))
893
894 def _CheckClean(self, rev_str):
895 # Make sure the tree is clean; see git-rebase.sh for reference
896 try:
897 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000898 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000899 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000900 raise gclient_utils.Error('\n____ %s%s\n'
901 '\tYou have unstaged changes.\n'
902 '\tPlease commit, stash, or reset.\n'
903 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000904 try:
905 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000906 '--ignore-submodules', 'HEAD', '--'],
907 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000908 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000909 raise gclient_utils.Error('\n____ %s%s\n'
910 '\tYour index contains uncommitted changes\n'
911 '\tPlease commit, stash, or reset.\n'
912 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000913
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000914 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000915 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
916 # reference by a commit). If not, error out -- most likely a rebase is
917 # in progress, try to detect so we can give a better error.
918 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000919 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
920 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000921 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000922 # Commit is not contained by any rev. See if the user is rebasing:
923 if self._IsRebasing():
924 # Punt to the user
925 raise gclient_utils.Error('\n____ %s%s\n'
926 '\tAlready in a conflict, i.e. (no branch).\n'
927 '\tFix the conflict and run gclient again.\n'
928 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
929 '\tSee man git-rebase for details.\n'
930 % (self.relpath, rev_str))
931 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000932 name = ('saved-by-gclient-' +
933 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000934 self._Capture(['branch', '-f', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000935 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000936 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000937
msb@chromium.org5bde4852009-12-14 16:47:12 +0000938 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000939 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000940 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000941 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000942 return None
943 return branch
944
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000945 def _Capture(self, args, cwd=None):
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000946 return subprocess2.check_output(
maruel@chromium.org87e6d332011-09-09 19:01:28 +0000947 ['git'] + args,
ilevy@chromium.orgf6f58402013-05-22 00:14:32 +0000948 stderr=subprocess2.VOID,
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000949 cwd=cwd or self.checkout_path).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000950
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000951 def _UpdateBranchHeads(self, options, fetch=False):
952 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
953 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000954 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000955 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
956 '^\\+refs/branch-heads/\\*:.*$']
957 self._Run(config_cmd, options)
958 if fetch:
szager@chromium.orgff113292014-03-25 06:02:08 +0000959 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000960 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000961 if options.verbose:
962 fetch_cmd.append('--verbose')
963 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000964
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000965 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000966 kwargs.setdefault('cwd', self.checkout_path)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000967 git_filter = not options.verbose
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000968 if git_filter:
agable@chromium.org5a306a22014-02-24 22:13:59 +0000969 kwargs['filter_fn'] = gclient_utils.GitFilter(kwargs.get('filter_fn'))
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000970 kwargs.setdefault('print_stdout', False)
szager@chromium.org7f834ad2013-07-10 00:22:17 +0000971 # Don't prompt for passwords; just fail quickly and noisily.
szager@chromium.org3ce41842013-07-11 17:38:57 +0000972 # By default, git will use an interactive terminal prompt when a username/
973 # password is needed. That shouldn't happen in the chromium workflow,
974 # and if it does, then gclient may hide the prompt in the midst of a flood
975 # of terminal spew. The only indication that something has gone wrong
976 # will be when gclient hangs unresponsively. Instead, we disable the
977 # password prompt and simply allow git to fail noisily. The error
978 # message produced by git will be copied to gclient's output.
szager@chromium.org7f834ad2013-07-10 00:22:17 +0000979 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
980 env.setdefault('GIT_ASKPASS', 'true')
981 env.setdefault('SSH_ASKPASS', 'true')
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000982 else:
983 kwargs.setdefault('print_stdout', True)
agable@chromium.org772efaf2014-04-01 02:35:44 +0000984 cmd = ['git'] + args
985 return gclient_utils.CheckCallAndFilterAndHeader(cmd, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000986
987
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000988class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000989 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000990 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000991
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000992 @staticmethod
993 def BinaryExists():
994 """Returns true if the command exists."""
995 try:
996 result, version = scm.SVN.AssertVersion('1.4')
997 if not result:
998 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
999 return result
1000 except OSError:
1001 return False
1002
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001003 def GetCheckoutRoot(self):
1004 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1005
floitsch@google.comeaab7842011-04-28 09:07:58 +00001006 def GetRevisionDate(self, revision):
1007 """Returns the given revision's date in ISO-8601 format (which contains the
1008 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001009 date = scm.SVN.Capture(
1010 ['propget', '--revprop', 'svn:date', '-r', revision],
1011 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001012 return date.strip()
1013
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001014 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001015 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001016 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001017
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001018 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001019 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001020 if not os.path.isdir(self.checkout_path):
1021 raise gclient_utils.Error('Directory %s is not present.' %
1022 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001023 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001024
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001025 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001026 """Generates a patch file which can be applied to the root of the
1027 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001028 if not os.path.isdir(self.checkout_path):
1029 raise gclient_utils.Error('Directory %s is not present.' %
1030 self.checkout_path)
1031 gclient_utils.CheckCallAndFilter(
1032 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1033 cwd=self.checkout_path,
1034 print_stdout=False,
haitao.feng@intel.com306080c2012-05-04 13:11:29 +00001035 filter_fn=SvnDiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001036
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001037 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001038 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001039
1040 All updated files will be appended to file_list.
1041
1042 Raises:
1043 Error: if can't get URL for relative path.
1044 """
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001045 # Only update if git or hg is not controlling the directory.
1046 git_path = os.path.join(self.checkout_path, '.git')
1047 if os.path.exists(git_path):
1048 print('________ found .git directory; skipping %s' % self.relpath)
1049 return
1050
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001051 hg_path = os.path.join(self.checkout_path, '.hg')
1052 if os.path.exists(hg_path):
1053 print('________ found .hg directory; skipping %s' % self.relpath)
1054 return
1055
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001056 if args:
1057 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1058
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001059 # revision is the revision to match. It is None if no revision is specified,
1060 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001061 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001062 # Keep the original unpinned url for reference in case the repo is switched.
1063 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001064 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001065 if options.revision:
1066 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001067 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001068 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001069 if revision != 'unmanaged':
1070 forced_revision = True
1071 # Reconstruct the url.
1072 url = '%s@%s' % (url, revision)
1073 rev_str = ' at %s' % revision
1074 else:
1075 managed = False
1076 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001077 else:
1078 forced_revision = False
1079 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001080
borenet@google.com7ff04292014-03-10 12:57:25 +00001081 # Get the existing scm url and the revision number of the current checkout.
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001082 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001083 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001084 try:
1085 from_info = scm.SVN.CaptureLocalInfo(
1086 [], os.path.join(self.checkout_path, '.'))
1087 except (gclient_utils.Error, subprocess2.CalledProcessError):
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001088 if options.reset and options.delete_unversioned_trees:
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001089 print 'Removing troublesome path %s' % self.checkout_path
1090 gclient_utils.rmtree(self.checkout_path)
1091 exists = False
1092 else:
1093 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1094 'present. Delete the directory and try again.')
1095 raise gclient_utils.Error(msg % self.checkout_path)
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001096
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001097 BASE_URLS = {
1098 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1099 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1100 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001101 WHITELISTED_ROOTS = [
1102 'svn://svn.chromium.org',
1103 'svn://svn-mirror.golo.chromium.org',
1104 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001105 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001106 try:
1107 # Split out the revision number since it's not useful for us.
1108 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001109 # Check to see if we're on a whitelisted root. We do this because
1110 # only some svn servers have matching UUIDs.
1111 local_parsed = urlparse.urlparse(url)
1112 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001113 if ('CHROME_HEADLESS' in os.environ
1114 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001115 and base_path in BASE_URLS
1116 and local_root in WHITELISTED_ROOTS):
1117
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001118 # Use a tarball for initial sync if we are on a bot.
1119 # Get an unauthenticated gsutil instance.
1120 gsutil = download_from_google_storage.Gsutil(
1121 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1122
1123 gs_path = BASE_URLS[base_path]
1124 _, out, _ = gsutil.check_call('ls', gs_path)
1125 # So that we can get the most recent revision.
1126 sorted_items = sorted(out.splitlines())
1127 latest_checkout = sorted_items[-1]
1128
1129 tempdir = tempfile.mkdtemp()
1130 print 'Downloading %s...' % latest_checkout
1131 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1132 if code:
1133 print '%s\n%s' % (out, err)
1134 raise Exception()
1135 filename = latest_checkout.split('/')[-1]
1136 tarball = os.path.join(tempdir, filename)
1137 print 'Unpacking into %s...' % self.checkout_path
1138 gclient_utils.safe_makedirs(self.checkout_path)
1139 # TODO(hinoka): Use 7z for windows.
1140 cmd = ['tar', '--extract', '--ungzip',
1141 '--directory', self.checkout_path,
1142 '--file', tarball]
1143 gclient_utils.CheckCallAndFilter(
1144 cmd, stdout=sys.stdout, print_stdout=True)
1145
1146 print 'Deleting temp file'
1147 gclient_utils.rmtree(tempdir)
1148
1149 # Rewrite the repository root to match.
1150 tarball_url = scm.SVN.CaptureLocalInfo(
1151 ['.'], self.checkout_path)['Repository Root']
1152 tarball_parsed = urlparse.urlparse(tarball_url)
1153 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1154 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001155
1156 if tarball_root != local_root:
1157 print 'Switching repository root to %s' % local_root
1158 self._Run(['switch', '--relocate', tarball_root,
1159 local_root, self.checkout_path],
1160 options)
1161 except Exception as e:
1162 print 'We tried to get a source tarball but failed.'
1163 print 'Resuming normal operations.'
1164 print str(e)
1165
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001166 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001167 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001168 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001169 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001170 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001171 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001172
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001173 if not managed:
1174 print ('________ unmanaged solution; skipping %s' % self.relpath)
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001175 return self.Svnversion()
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001176
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001177 if 'URL' not in from_info:
1178 raise gclient_utils.Error(
1179 ('gclient is confused. Couldn\'t get the url for %s.\n'
1180 'Try using @unmanaged.\n%s') % (
1181 self.checkout_path, from_info))
1182
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001183 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001184 dir_info = scm.SVN.CaptureStatus(
1185 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001186 if any(d[0][2] == 'L' for d in dir_info):
1187 try:
1188 self._Run(['cleanup', self.checkout_path], options)
1189 except subprocess2.CalledProcessError, e:
1190 # Get the status again, svn cleanup may have cleaned up at least
1191 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001192 dir_info = scm.SVN.CaptureStatus(
1193 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001194
1195 # Try to fix the failures by removing troublesome files.
1196 for d in dir_info:
1197 if d[0][2] == 'L':
1198 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001199 # We don't pass any files/directories to CaptureStatus and set
1200 # cwd=self.checkout_path, so we should get relative paths here.
1201 assert not os.path.isabs(d[1])
1202 path_to_remove = os.path.normpath(
1203 os.path.join(self.checkout_path, d[1]))
1204 print 'Removing troublesome path %s' % path_to_remove
1205 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001206 else:
1207 print 'Not removing troublesome path %s automatically.' % d[1]
1208 if d[0][0] == '!':
1209 print 'You can pass --force to enable automatic removal.'
1210 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001211
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001212 # Retrieve the current HEAD version because svn is slow at null updates.
1213 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001214 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001215 revision = str(from_info_live['Revision'])
1216 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001217
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001218 if from_info['URL'] != base_url:
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001219 # The repository url changed, need to switch.
1220 try:
1221 to_info = scm.SVN.CaptureRemoteInfo(url)
1222 except (gclient_utils.Error, subprocess2.CalledProcessError):
1223 # The url is invalid or the server is not accessible, it's safer to bail
1224 # out right now.
1225 raise gclient_utils.Error('This url is unreachable: %s' % url)
1226 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1227 and (from_info['UUID'] == to_info['UUID']))
1228 if can_switch:
1229 print('\n_____ relocating %s to a new checkout' % self.relpath)
1230 # We have different roots, so check if we can switch --relocate.
1231 # Subversion only permits this if the repository UUIDs match.
1232 # Perform the switch --relocate, then rewrite the from_url
1233 # to reflect where we "are now." (This is the same way that
1234 # Subversion itself handles the metadata when switch --relocate
1235 # is used.) This makes the checks below for whether we
1236 # can update to a revision or have to switch to a different
1237 # branch work as expected.
1238 # TODO(maruel): TEST ME !
1239 command = ['switch', '--relocate',
1240 from_info['Repository Root'],
1241 to_info['Repository Root'],
1242 self.relpath]
1243 self._Run(command, options, cwd=self._root_dir)
1244 from_info['URL'] = from_info['URL'].replace(
1245 from_info['Repository Root'],
1246 to_info['Repository Root'])
1247 else:
1248 if not options.force and not options.reset:
1249 # Look for local modifications but ignore unversioned files.
1250 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1251 if status[0][0] != '?':
1252 raise gclient_utils.Error(
1253 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1254 'there is local changes in %s. Delete the directory and '
1255 'try again.') % (url, self.checkout_path))
1256 # Ok delete it.
1257 print('\n_____ switching %s to a new checkout' % self.relpath)
1258 gclient_utils.rmtree(self.checkout_path)
1259 # We need to checkout.
1260 command = ['checkout', url, self.checkout_path]
1261 command = self._AddAdditionalUpdateFlags(command, options, revision)
1262 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1263 return self.Svnversion()
1264
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001265 # If the provided url has a revision number that matches the revision
1266 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001267 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001268 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001269 print('\n_____ %s%s' % (self.relpath, rev_str))
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001270 else:
1271 command = ['update', self.checkout_path]
1272 command = self._AddAdditionalUpdateFlags(command, options, revision)
1273 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001274
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001275 # If --reset and --delete_unversioned_trees are specified, remove any
1276 # untracked files and directories.
1277 if options.reset and options.delete_unversioned_trees:
1278 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1279 full_path = os.path.join(self.checkout_path, status[1])
1280 if (status[0][0] == '?'
1281 and os.path.isdir(full_path)
1282 and not os.path.islink(full_path)):
1283 print('\n_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001284 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001285 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001286
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001287 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001288 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001289 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001290 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001291 # Create an empty checkout and then update the one file we want. Future
1292 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001293 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001294 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001295 if os.path.exists(os.path.join(self.checkout_path, filename)):
1296 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001297 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001298 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001299 # After the initial checkout, we can use update as if it were any other
1300 # dep.
1301 self.update(options, args, file_list)
1302 else:
1303 # If the installed version of SVN doesn't support --depth, fallback to
1304 # just exporting the file. This has the downside that revision
1305 # information is not stored next to the file, so we will have to
1306 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001307 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001308 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001309 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001310 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001311 command = self._AddAdditionalUpdateFlags(command, options,
1312 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001313 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001314
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001315 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001316 """Reverts local modifications. Subversion specific.
1317
1318 All reverted files will be appended to file_list, even if Subversion
1319 doesn't know about them.
1320 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001321 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001322 if os.path.exists(self.checkout_path):
1323 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001324 # svn revert won't work if the directory doesn't exist. It needs to
1325 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001326 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001327 # Don't reuse the args.
1328 return self.update(options, [], file_list)
1329
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001330 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001331 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
1332 print('________ found .git directory; skipping %s' % self.relpath)
1333 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001334 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
1335 print('________ found .hg directory; skipping %s' % self.relpath)
1336 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001337 if not options.force:
1338 raise gclient_utils.Error('Invalid checkout path, aborting')
1339 print(
1340 '\n_____ %s is not a valid svn checkout, synching instead' %
1341 self.relpath)
1342 gclient_utils.rmtree(self.checkout_path)
1343 # Don't reuse the args.
1344 return self.update(options, [], file_list)
1345
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001346 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001347 if file_list is not None:
1348 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001349 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001350 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001351 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001352 print(os.path.join(self.checkout_path, file_status[1]))
1353 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001354
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001355 # Revert() may delete the directory altogether.
1356 if not os.path.isdir(self.checkout_path):
1357 # Don't reuse the args.
1358 return self.update(options, [], file_list)
1359
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001360 try:
1361 # svn revert is so broken we don't even use it. Using
1362 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001363 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001364 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1365 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001366 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001367 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001368 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001369
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001370 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001371 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001372 try:
1373 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001374 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001375 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001376
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001377 def runhooks(self, options, args, file_list):
1378 self.status(options, args, file_list)
1379
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001380 def status(self, options, args, file_list):
1381 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001382 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001383 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001384 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001385 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
1386 'The directory does not exist.') %
1387 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001388 # There's no file list to retrieve.
1389 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001390 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001391
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001392 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001393 """Verifies the validity of the revision for this repository."""
1394 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1395 raise gclient_utils.Error(
1396 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1397 'correct.') % rev)
1398 return rev
1399
msb@chromium.orge6f78352010-01-13 17:05:33 +00001400 def FullUrlForRelativeUrl(self, url):
1401 # Find the forth '/' and strip from there. A bit hackish.
1402 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001403
maruel@chromium.org669600d2010-09-01 19:06:31 +00001404 def _Run(self, args, options, **kwargs):
1405 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001406 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001407 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001408 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001409
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001410 def Svnversion(self):
1411 """Runs the lowest checked out revision in the current project."""
1412 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1413 return info['Revision']
1414
maruel@chromium.org669600d2010-09-01 19:06:31 +00001415 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1416 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001417 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001418 scm.SVN.RunAndGetFileList(
1419 options.verbose,
1420 args + ['--ignore-externals'],
1421 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001422 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001423
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001424 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001425 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001426 """Add additional flags to command depending on what options are set.
1427 command should be a list of strings that represents an svn command.
1428
1429 This method returns a new list to be used as a command."""
1430 new_command = command[:]
1431 if revision:
1432 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001433 # We don't want interaction when jobs are used.
1434 if options.jobs > 1:
1435 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001436 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001437 # --accept was added to 'svn update' in svn 1.6.
1438 if not scm.SVN.AssertVersion('1.5')[0]:
1439 return new_command
1440
1441 # It's annoying to have it block in the middle of a sync, just sensible
1442 # defaults.
1443 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001444 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001445 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1446 new_command.extend(('--accept', 'theirs-conflict'))
1447 elif options.manually_grab_svn_rev:
1448 new_command.append('--force')
1449 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1450 new_command.extend(('--accept', 'postpone'))
1451 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1452 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001453 return new_command