blob: f0e877a45cecf78d8e6df67734bdac33cb1f2b01 [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
szager@chromium.org848fd492014-04-09 19:06:44 +000021import git_cache
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000022import scm
23import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000024
25
szager@chromium.org71cbb502013-04-19 23:30:15 +000026THIS_FILE_PATH = os.path.abspath(__file__)
27
hinoka@google.com2f2ca142014-01-07 03:59:18 +000028GSUTIL_DEFAULT_PATH = os.path.join(
29 os.path.dirname(os.path.abspath(__file__)),
30 'third_party', 'gsutil', 'gsutil')
31
szager@chromium.org848fd492014-04-09 19:06:44 +000032CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src.git'
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000033class DiffFiltererWrapper(object):
34 """Simple base class which tracks which file is being diffed and
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000035 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000036 working copy lines of the svn/git diff output."""
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000037 index_string = None
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000038 original_prefix = "--- "
39 working_prefix = "+++ "
40
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000041 def __init__(self, relpath, print_func):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000042 # Note that we always use '/' as the path separator to be
43 # consistent with svn's cygwin-style output on Windows
44 self._relpath = relpath.replace("\\", "/")
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000045 self._current_file = None
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000046 self._print_func = print_func
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000047
maruel@chromium.org6e29d572010-06-04 17:32:20 +000048 def SetCurrentFile(self, current_file):
49 self._current_file = current_file
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000050
iannucci@chromium.org3830a672013-02-19 20:15:14 +000051 @property
52 def _replacement_file(self):
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000053 return posixpath.join(self._relpath, self._current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000054
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000055 def _Replace(self, line):
56 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000057
58 def Filter(self, line):
59 if (line.startswith(self.index_string)):
60 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000061 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000062 else:
63 if (line.startswith(self.original_prefix) or
64 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000065 line = self._Replace(line)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +000066 self._print_func(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000067
68
haitao.feng@intel.com306080c2012-05-04 13:11:29 +000069class SvnDiffFilterer(DiffFiltererWrapper):
70 index_string = "Index: "
71
72
73class GitDiffFilterer(DiffFiltererWrapper):
74 index_string = "diff --git "
75
76 def SetCurrentFile(self, current_file):
77 # Get filename by parsing "a/<filename> b/<filename>"
78 self._current_file = current_file[:(len(current_file)/2)][2:]
79
80 def _Replace(self, line):
81 return re.sub("[a|b]/" + self._current_file, self._replacement_file, line)
82
83
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000084### SCM abstraction layer
85
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000086# Factory Method for SCM wrapper creation
87
maruel@chromium.org9eda4112010-06-11 18:56:10 +000088def GetScmName(url):
89 if url:
90 url, _ = gclient_utils.SplitUrlRevision(url)
91 if (url.startswith('git://') or url.startswith('ssh://') or
igorgatis@gmail.com4e075672011-11-21 16:35:08 +000092 url.startswith('git+http://') or url.startswith('git+https://') or
mariakhomenko@chromium.orga2ede5c2014-02-05 22:05:17 +000093 url.endswith('.git') or url.startswith('sso://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000094 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000095 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000096 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000097 return 'svn'
98 return None
99
100
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000101def CreateSCM(url, root_dir=None, relpath=None, out_fh=None, out_cb=None):
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000102 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000103 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +0000104 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000105 }
msb@chromium.orge28e4982009-09-25 20:51:45 +0000106
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000107 scm_name = GetScmName(url)
108 if not scm_name in SCM_MAP:
109 raise gclient_utils.Error('No SCM found for url %s' % url)
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000110 scm_class = SCM_MAP[scm_name]
111 if not scm_class.BinaryExists():
112 raise gclient_utils.Error('%s command not found' % scm_name)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000113 return scm_class(url, root_dir, relpath, out_fh, out_cb)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000114
115
116# SCMWrapper base class
117
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000118class SCMWrapper(object):
119 """Add necessary glue between all the supported SCM.
120
msb@chromium.orgd6504212010-01-13 17:34:31 +0000121 This is the abstraction layer to bind to different SCM.
122 """
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000123
124 def __init__(self, url=None, root_dir=None, relpath=None, out_fh=None,
125 out_cb=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000126 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +0000127 self._root_dir = root_dir
128 if self._root_dir:
129 self._root_dir = self._root_dir.replace('/', os.sep)
130 self.relpath = relpath
131 if self.relpath:
132 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000133 if self.relpath and self._root_dir:
134 self.checkout_path = os.path.join(self._root_dir, self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000135 if out_fh is None:
136 out_fh = sys.stdout
137 self.out_fh = out_fh
138 self.out_cb = out_cb
139
140 def Print(self, *args, **kwargs):
141 kwargs.setdefault('file', self.out_fh)
142 if kwargs.pop('timestamp', True):
143 self.out_fh.write('[%s] ' % gclient_utils.Elapsed())
144 print(*args, **kwargs)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000145
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000146 def RunCommand(self, command, options, args, file_list=None):
phajdan.jr@chromium.org6e043f72011-05-02 07:24:32 +0000147 commands = ['cleanup', 'update', 'updatesingle', 'revert',
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000148 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000149
150 if not command in commands:
151 raise gclient_utils.Error('Unknown command %s' % command)
152
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000153 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000154 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000155 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000156
157 return getattr(self, command)(options, args, file_list)
158
borenet@google.com4e9be262014-04-08 19:40:30 +0000159 def GetActualRemoteURL(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000160 """Attempt to determine the remote URL for this SCMWrapper."""
borenet@google.com4e9be262014-04-08 19:40:30 +0000161 # Git
borenet@google.combda475e2014-03-24 19:04:45 +0000162 if os.path.exists(os.path.join(self.checkout_path, '.git')):
szager@chromium.org848fd492014-04-09 19:06:44 +0000163 actual_remote_url = shlex.split(self._Capture(
borenet@google.com88d10082014-03-21 17:24:48 +0000164 ['config', '--local', '--get-regexp', r'remote.*.url'],
165 self.checkout_path))[1]
borenet@google.com4e9be262014-04-08 19:40:30 +0000166
167 # If a cache_dir is used, obtain the actual remote URL from the cache.
168 if getattr(self, 'cache_dir', None):
szager@chromium.org848fd492014-04-09 19:06:44 +0000169 mirror = git_cache.Mirror(self.url)
170 if (mirror.exists() and mirror.mirror_path.replace('\\', '/') ==
borenet@google.com4e9be262014-04-08 19:40:30 +0000171 actual_remote_url.replace('\\', '/')):
szager@chromium.org848fd492014-04-09 19:06:44 +0000172 actual_remote_url = shlex.split(self._Capture(
borenet@google.com4e9be262014-04-08 19:40:30 +0000173 ['config', '--local', '--get-regexp', r'remote.*.url'],
szager@chromium.org848fd492014-04-09 19:06:44 +0000174 cwd=mirror.mirror_path))[1]
borenet@google.com4e9be262014-04-08 19:40:30 +0000175 return actual_remote_url
176
177 # Svn
borenet@google.combda475e2014-03-24 19:04:45 +0000178 if os.path.exists(os.path.join(self.checkout_path, '.svn')):
borenet@google.com88d10082014-03-21 17:24:48 +0000179 return scm.SVN.CaptureLocalInfo([], self.checkout_path)['URL']
borenet@google.com88d10082014-03-21 17:24:48 +0000180 return None
181
borenet@google.com4e9be262014-04-08 19:40:30 +0000182 def DoesRemoteURLMatch(self, options):
borenet@google.com88d10082014-03-21 17:24:48 +0000183 """Determine whether the remote URL of this checkout is the expected URL."""
184 if not os.path.exists(self.checkout_path):
185 # A checkout which doesn't exist can't be broken.
186 return True
187
borenet@google.com4e9be262014-04-08 19:40:30 +0000188 actual_remote_url = self.GetActualRemoteURL(options)
borenet@google.com88d10082014-03-21 17:24:48 +0000189 if actual_remote_url:
borenet@google.com8156c9f2014-04-01 16:41:36 +0000190 return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
191 == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
borenet@google.com88d10082014-03-21 17:24:48 +0000192 else:
193 # This may occur if the self.checkout_path exists but does not contain a
194 # valid git or svn checkout.
195 return False
196
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000197
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000198class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000199 """Wrapper for Git"""
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000200 name = 'git'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000201 remote = 'origin'
msb@chromium.orge28e4982009-09-25 20:51:45 +0000202
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000203 cache_dir = None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000204
szager@chromium.org848fd492014-04-09 19:06:44 +0000205 def __init__(self, url=None, *args):
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000206 """Removes 'git+' fake prefix from git URL."""
207 if url.startswith('git+http://') or url.startswith('git+https://'):
208 url = url[4:]
szager@chromium.org848fd492014-04-09 19:06:44 +0000209 SCMWrapper.__init__(self, url, *args)
210 filter_kwargs = { 'time_throttle': 1, 'out_fh': self.out_fh }
211 if self.out_cb:
212 filter_kwargs['predicate'] = self.out_cb
213 self.filter = gclient_utils.GitFilter(**filter_kwargs)
igorgatis@gmail.com4e075672011-11-21 16:35:08 +0000214
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +0000215 @staticmethod
216 def BinaryExists():
217 """Returns true if the command exists."""
218 try:
219 # We assume git is newer than 1.7. See: crbug.com/114483
220 result, version = scm.GIT.AssertVersion('1.7')
221 if not result:
222 raise gclient_utils.Error('Git version is older than 1.7: %s' % version)
223 return result
224 except OSError:
225 return False
226
xusydoc@chromium.org885a9602013-05-31 09:54:40 +0000227 def GetCheckoutRoot(self):
228 return scm.GIT.GetCheckoutRoot(self.checkout_path)
229
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000230 def GetRevisionDate(self, _revision):
floitsch@google.comeaab7842011-04-28 09:07:58 +0000231 """Returns the given revision's date in ISO-8601 format (which contains the
232 time zone)."""
233 # TODO(floitsch): get the time-stamp of the given revision and not just the
234 # time-stamp of the currently checked out revision.
235 return self._Capture(['log', '-n', '1', '--format=%ai'])
236
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000237 @staticmethod
238 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000239 """'Cleanup' the repo.
240
241 There's no real git equivalent for the svn cleanup command, do a no-op.
242 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000243
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000244 def diff(self, options, _args, _file_list):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000245 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000246 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000247
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000248 def pack(self, _options, _args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000249 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000250 repository.
251
252 The patch file is generated from a diff of the merge base of HEAD and
253 its upstream branch.
254 """
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000255 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000256 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000257 ['git', 'diff', merge_base],
258 cwd=self.checkout_path,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000259 filter_fn=GitDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000260
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000261 def UpdateSubmoduleConfig(self):
262 submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config',
szager@chromium.org37e4f232012-06-21 21:47:42 +0000263 'submodule.$name.ignore', 'all']
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000264 cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)]
szager@chromium.org78f5c162012-06-22 22:34:25 +0000265 cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all']
szager@chromium.org987b0612012-07-09 23:41:08 +0000266 cmd3 = ['git', 'config', 'branch.autosetupmerge']
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000267 cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false']
szager@chromium.org987b0612012-07-09 23:41:08 +0000268 kwargs = {'cwd': self.checkout_path,
269 'print_stdout': False,
270 'filter_fn': lambda x: None}
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000271 try:
szager@chromium.org987b0612012-07-09 23:41:08 +0000272 gclient_utils.CheckCallAndFilter(cmd, **kwargs)
273 gclient_utils.CheckCallAndFilter(cmd2, **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000274 except subprocess2.CalledProcessError:
275 # Not a fatal error, or even very interesting in a non-git-submodule
276 # world. So just keep it quiet.
277 pass
szager@chromium.org987b0612012-07-09 23:41:08 +0000278 try:
279 gclient_utils.CheckCallAndFilter(cmd3, **kwargs)
280 except subprocess2.CalledProcessError:
281 gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs)
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000282
iannucci@chromium.org08b21bf2013-04-05 03:38:10 +0000283 gclient_utils.CheckCallAndFilter(cmd4, **kwargs)
284
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000285 def _FetchAndReset(self, revision, file_list, options):
286 """Equivalent to git fetch; git reset."""
287 quiet = []
288 if not options.verbose:
289 quiet = ['--quiet']
290 self._UpdateBranchHeads(options, fetch=False)
291
szager@chromium.orgff113292014-03-25 06:02:08 +0000292 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000293 fetch_cmd = cfg + ['fetch', self.remote, '--prune']
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +0000294 self._Run(fetch_cmd + quiet, options, retry=True)
295 self._Run(['reset', '--hard', revision] + quiet, options)
296 self.UpdateSubmoduleConfig()
297 if file_list is not None:
298 files = self._Capture(['ls-files']).splitlines()
299 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
300
msb@chromium.orge28e4982009-09-25 20:51:45 +0000301 def update(self, options, args, file_list):
302 """Runs git to update or transparently checkout the working copy.
303
304 All updated files will be appended to file_list.
305
306 Raises:
307 Error: if can't get URL for relative path.
308 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000309 if args:
310 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
311
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000312 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000313
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000314 # If a dependency is not pinned, track the default remote branch.
315 default_rev = 'refs/remotes/%s/master' % self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000316 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000317 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000318 revision = deps_revision
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000319 managed = True
msb@chromium.orge28e4982009-09-25 20:51:45 +0000320 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000321 # Override the revision number.
322 revision = str(options.revision)
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +0000323 if revision == 'unmanaged':
324 revision = None
325 managed = False
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000326 if not revision:
327 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000328
floitsch@google.comeaab7842011-04-28 09:07:58 +0000329 if gclient_utils.IsDateRevision(revision):
330 # Date-revisions only work on git-repositories if the reflog hasn't
331 # expired yet. Use rev-list to get the corresponding revision.
332 # git rev-list -n 1 --before='time-stamp' branchname
333 if options.transitive:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000334 self.Print('Warning: --transitive only works for SVN repositories.')
floitsch@google.comeaab7842011-04-28 09:07:58 +0000335 revision = default_rev
336
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000337 rev_str = ' at %s' % revision
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000338 files = [] if file_list is not None else None
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000339
340 printed_path = False
341 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000342 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000343 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000344 verbose = ['--verbose']
345 printed_path = True
346
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000347 url = self._CreateOrUpdateCache(url, options)
348
ilevy@chromium.orga41249c2013-07-03 00:09:12 +0000349 if revision.startswith('refs/'):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000350 rev_type = "branch"
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000351 elif revision.startswith(self.remote + '/'):
352 # For compatibility with old naming, translate 'origin' to 'refs/heads'
353 revision = revision.replace(self.remote + '/', 'refs/heads/')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000354 rev_type = "branch"
355 else:
356 # hash is also a tag, only make a distinction at checkout
357 rev_type = "hash"
358
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000359 if (not os.path.exists(self.checkout_path) or
360 (os.path.isdir(self.checkout_path) and
361 not os.path.exists(os.path.join(self.checkout_path, '.git')))):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000362 self._Clone(revision, url, options)
jochen@chromium.org3676b3f2014-04-08 21:06:11 +0000363 self._UpdateBranchHeads(options, fetch=True)
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)
szager@chromium.org848fd492014-04-09 19:06:44 +0000470 if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
471 self.Print('Up-to-date; skipping checkout.')
472 else:
473 self._Capture(['checkout', '--quiet', '%s' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000474 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000475 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
msb@chromium.org786fb682010-06-02 15:16:23 +0000476 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000477 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000478 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000479 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000480 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000481 newbase=revision, printed_path=printed_path,
482 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000483 printed_path = True
484 else:
485 # Can't find a merge-base since we don't know our upstream. That makes
486 # this command VERY likely to produce a rebase failure. For now we
487 # assume origin is our upstream since that's what the old behavior was.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000488 upstream_branch = self.remote
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000489 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000490 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000491 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000492 printed_path=printed_path, merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000493 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000494 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000495 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000496 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000497 newbase=revision, printed_path=printed_path,
498 merge=options.merge)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000499 printed_path = True
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000500 elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000501 # case 4
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000502 new_base = revision.replace('heads', 'remotes/' + self.remote)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000503 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000504 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000505 switch_error = ("Switching upstream branch from %s to %s\n"
506 % (upstream_branch, new_base) +
507 "Please merge or rebase manually:\n" +
508 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
509 "OR git checkout -b <some new branch> %s" % new_base)
510 raise gclient_utils.Error(switch_error)
511 else:
512 # case 3 - the default case
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000513 if files is not None:
514 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000515 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000516 self.Print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000517 try:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000518 merge_args = ['merge']
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000519 if options.merge:
520 merge_args.append('--ff')
521 else:
bauerb@chromium.org2aad1b22011-07-22 12:00:41 +0000522 merge_args.append('--ff-only')
523 merge_args.append(upstream_branch)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000524 merge_output = self._Capture(merge_args)
bratell@opera.com18fa4542013-05-21 13:30:46 +0000525 except subprocess2.CalledProcessError as e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000526 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000527 files = []
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000528 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000529 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000530 printed_path = True
531 while True:
532 try:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000533 action = self._AskForData(
534 'Cannot %s, attempt to rebase? '
535 '(y)es / (q)uit / (s)kip : ' %
536 ('merge' if options.merge else 'fast-forward merge'),
537 options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000538 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000539 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000540 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000541 self._AttemptRebase(upstream_branch, files, options,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000542 printed_path=printed_path, merge=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000543 printed_path = True
544 break
545 elif re.match(r'quit|q', action, re.I):
546 raise gclient_utils.Error("Can't fast-forward, please merge or "
547 "rebase manually.\n"
548 "cd %s && git " % self.checkout_path
549 + "rebase %s" % upstream_branch)
550 elif re.match(r'skip|s', action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000551 self.Print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000552 return
553 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000554 self.Print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000555 elif re.match("error: Your local changes to '.*' would be "
556 "overwritten by merge. Aborting.\nPlease, commit your "
557 "changes or stash them before you can merge.\n",
558 e.stderr):
559 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000560 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000561 printed_path = True
562 raise gclient_utils.Error(e.stderr)
563 else:
564 # Some other problem happened with the merge
565 logging.error("Error during fast-forward merge in %s!" % self.relpath)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000566 self.Print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000567 raise
568 else:
569 # Fast-forward merge was successful
570 if not re.match('Already up-to-date.', merge_output) or verbose:
571 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000572 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000573 printed_path = True
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000574 self.Print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000575 if not verbose:
576 # Make the output a little prettier. It's nice to have some
577 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000578 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000579
szager@chromium.orgd4af6622012-06-04 22:13:55 +0000580 self.UpdateSubmoduleConfig()
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000581 if file_list is not None:
582 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000583
584 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000585 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000586 raise gclient_utils.Error('\n____ %s%s\n'
587 '\nConflict while rebasing this branch.\n'
588 'Fix the conflict and run gclient again.\n'
589 'See man git-rebase for details.\n'
590 % (self.relpath, rev_str))
591
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000592 if verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000593 self.Print('Checked out revision %s' % self.revinfo(options, (), None),
594 timestamp=False)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000595
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000596 # If --reset and --delete_unversioned_trees are specified, remove any
597 # untracked directories.
598 if options.reset and options.delete_unversioned_trees:
599 # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the
600 # merge-base by default), so doesn't include untracked files. So we use
601 # 'git ls-files --directory --others --exclude-standard' here directly.
602 paths = scm.GIT.Capture(
603 ['ls-files', '--directory', '--others', '--exclude-standard'],
604 self.checkout_path)
605 for path in (p for p in paths.splitlines() if p.endswith('/')):
606 full_path = os.path.join(self.checkout_path, path)
607 if not os.path.islink(full_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000608 self.Print('_____ removing unversioned directory %s' % path)
digit@chromium.orgdc112ac2013-04-24 13:00:19 +0000609 gclient_utils.rmtree(full_path)
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000610
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +0000611 return self._Capture(['rev-parse', '--verify', 'HEAD'])
612
steveblock@chromium.org98e69452012-02-16 16:36:43 +0000613
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000614 def revert(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000615 """Reverts local modifications.
616
617 All reverted files will be appended to file_list.
618 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000619 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000620 # revert won't work if the directory doesn't exist. It needs to
621 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000622 self.Print('_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000623 # Don't reuse the args.
624 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000625
626 default_rev = "refs/heads/master"
iannucci@chromium.orgd4fffee2013-06-28 00:35:26 +0000627 if options.upstream:
628 if self._GetCurrentBranch():
629 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
630 default_rev = upstream_branch or default_rev
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000631 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000632 if not deps_revision:
633 deps_revision = default_rev
634 if deps_revision.startswith('refs/heads/'):
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000635 deps_revision = deps_revision.replace('refs/heads/', self.remote + '/')
iannucci@chromium.org9a8b0662014-02-20 00:56:15 +0000636 deps_revision = self.GetUsableRev(deps_revision, options)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000637
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000638 if file_list is not None:
639 files = self._Capture(['diff', deps_revision, '--name-only']).split()
640
maruel@chromium.org37e89872010-09-07 16:11:33 +0000641 self._Run(['reset', '--hard', deps_revision], options)
lliabraa@chromium.orgade83db2012-09-27 14:06:49 +0000642 self._Run(['clean', '-f', '-d'], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000643
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000644 if file_list is not None:
645 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
646
647 def revinfo(self, _options, _args, _file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000648 """Returns revision"""
649 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000650
msb@chromium.orge28e4982009-09-25 20:51:45 +0000651 def runhooks(self, options, args, file_list):
652 self.status(options, args, file_list)
653
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000654 def status(self, options, _args, file_list):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000655 """Display status information."""
656 if not os.path.isdir(self.checkout_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000657 self.Print('________ couldn\'t run status in %s:\n'
658 'The directory does not exist.' % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000659 else:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000660 merge_base = self._Capture(['merge-base', 'HEAD', self.remote])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000661 self._Run(['diff', '--name-status', merge_base], options,
662 stdout=self.out_fh)
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000663 if file_list is not None:
664 files = self._Capture(['diff', '--name-only', merge_base]).split()
665 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.orge28e4982009-09-25 20:51:45 +0000666
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000667 def GetUsableRev(self, rev, options):
668 """Finds a useful revision for this repository.
669
670 If SCM is git-svn and the head revision is less than |rev|, git svn fetch
671 will be called on the source."""
672 sha1 = None
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000673 if not os.path.isdir(self.checkout_path):
674 raise gclient_utils.Error(
675 ( 'We could not find a valid hash for safesync_url response "%s".\n'
676 'Safesync URLs with a git checkout currently require the repo to\n'
677 'be cloned without a safesync_url before adding the safesync_url.\n'
678 'For more info, see: '
679 'http://code.google.com/p/chromium/wiki/UsingNewGit'
680 '#Initial_checkout' ) % rev)
681 elif rev.isdigit() and len(rev) < 7:
682 # Handles an SVN rev. As an optimization, only verify an SVN revision as
683 # [0-9]{1,6} for now to avoid making a network request.
szager@chromium.org6c2b49d2014-02-26 23:57:38 +0000684 if scm.GIT.IsGitSvn(cwd=self.checkout_path):
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000685 local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path)
686 if not local_head or local_head < int(rev):
dbeam@chromium.org2a75fdb2012-02-15 01:32:57 +0000687 try:
688 logging.debug('Looking for git-svn configuration optimizations.')
689 if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
690 cwd=self.checkout_path):
691 scm.GIT.Capture(['fetch'], cwd=self.checkout_path)
692 except subprocess2.CalledProcessError:
693 logging.debug('git config --get svn-remote.svn.fetch failed, '
694 'ignoring possible optimization.')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000695 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000696 self.Print('Running git svn fetch. This might take a while.\n')
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000697 scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path)
szager@google.com312a6a42012-10-11 21:19:42 +0000698 try:
szager@chromium.orgc51def32012-10-15 18:50:37 +0000699 sha1 = scm.GIT.GetBlessedSha1ForSvnRev(
700 cwd=self.checkout_path, rev=rev)
szager@google.com312a6a42012-10-11 21:19:42 +0000701 except gclient_utils.Error, e:
702 sha1 = e.message
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000703 self.Print('Warning: Could not find a git revision with accurate\n'
szager@google.com312a6a42012-10-11 21:19:42 +0000704 '.DEPS.git that maps to SVN revision %s. Sync-ing to\n'
705 'the closest sane git revision, which is:\n'
706 ' %s\n' % (rev, e.message))
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000707 if not sha1:
708 raise gclient_utils.Error(
709 ( 'It appears that either your git-svn remote is incorrectly\n'
710 'configured or the revision in your safesync_url is\n'
711 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n'
712 'corresponding git hash for SVN rev %s.' ) % rev)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000713 else:
714 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
715 sha1 = rev
716 else:
717 # May exist in origin, but we don't have it yet, so fetch and look
718 # again.
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000719 scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path)
iannucci@chromium.org3830a672013-02-19 20:15:14 +0000720 if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev):
721 sha1 = rev
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000722
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000723 if not sha1:
724 raise gclient_utils.Error(
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000725 ( 'We could not find a valid hash for safesync_url response "%s".\n'
726 'Safesync URLs with a git checkout currently require a git-svn\n'
727 'remote or a safesync_url that provides git sha1s. Please add a\n'
728 'git-svn remote or change your safesync_url. For more info, see:\n'
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000729 'http://code.google.com/p/chromium/wiki/UsingNewGit'
dbeam@chromium.org051c88b2011-12-22 00:23:03 +0000730 '#Initial_checkout' ) % rev)
731
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +0000732 return sha1
733
msb@chromium.orge6f78352010-01-13 17:05:33 +0000734 def FullUrlForRelativeUrl(self, url):
735 # Strip from last '/'
736 # Equivalent to unix basename
737 base_url = self.url
738 return base_url[:base_url.rfind('/')] + url
739
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000740 def _CreateOrUpdateCache(self, url, options):
741 """Make a new git mirror or update existing mirror for |url|, and return the
742 mirror URI to clone from.
743
744 If no cache-dir is specified, just return |url| unchanged.
745 """
746 if not self.cache_dir:
747 return url
szager@chromium.org848fd492014-04-09 19:06:44 +0000748 mirror_kwargs = { 'print_func': self.filter }
749 if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
750 mirror_kwargs['refs'] = ['refs/tags/lkgr', 'refs/tags/lkcr']
751 mirror = git_cache.Mirror(url, **mirror_kwargs)
752 mirror.populate(verbose=options.verbose, bootstrap=True)
753 mirror.unlock()
754 return mirror.mirror_path if mirror.exists() else None
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000755
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000756 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000757 """Clone a git repository from the given URL.
758
msb@chromium.org786fb682010-06-02 15:16:23 +0000759 Once we've cloned the repo, we checkout a working branch if the specified
760 revision is a branch head. If it is a tag or a specific commit, then we
761 leave HEAD detached as it makes future updates simpler -- in this case the
762 user should first create a new branch or switch to an existing branch before
763 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000764 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000765 # git clone doesn't seem to insert a newline properly before printing
766 # to stdout
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000767 self.Print('')
szager@chromium.orgecb75422013-07-12 21:57:33 +0000768 template_path = os.path.join(
769 os.path.dirname(THIS_FILE_PATH), 'git-templates')
szager@chromium.orgff113292014-03-25 06:02:08 +0000770 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000771 clone_cmd = cfg + [
772 'clone', '--no-checkout', '--progress', '--template=%s' % template_path]
iannucci@chromium.org53456aa2013-07-03 19:38:34 +0000773 if self.cache_dir:
774 clone_cmd.append('--shared')
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000775 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000776 clone_cmd.append('--verbose')
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000777 clone_cmd.append(url)
nsylvain@chromium.org328c3c72011-06-01 20:50:27 +0000778 # If the parent directory does not exist, Git clone on Windows will not
779 # create it, so we need to do it manually.
780 parent_dir = os.path.dirname(self.checkout_path)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000781 gclient_utils.safe_makedirs(parent_dir)
782 tmp_dir = tempfile.mkdtemp(
783 prefix='_gclient_%s_' % os.path.basename(self.checkout_path),
784 dir=parent_dir)
785 try:
786 clone_cmd.append(tmp_dir)
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000787 self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000788 gclient_utils.safe_makedirs(self.checkout_path)
cyrille@nnamrak.orgef509e42013-09-20 13:19:08 +0000789 gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
790 os.path.join(self.checkout_path, '.git'))
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000791 except:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000792 traceback.print_exc(file=self.out_fh)
zty@chromium.org6279e8a2014-02-13 01:45:25 +0000793 raise
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000794 finally:
795 if os.listdir(tmp_dir):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000796 self.Print('_____ removing non-empty tmp dir %s' % tmp_dir)
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000797 gclient_utils.rmtree(tmp_dir)
798 if revision.startswith('refs/heads/'):
799 self._Run(
800 ['checkout', '--quiet', revision.replace('refs/heads/', '')], options)
801 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000802 # Squelch git's very verbose detached HEAD warning and use our own
ilevy@chromium.org3534aa52013-07-20 01:58:08 +0000803 self._Run(['checkout', '--quiet', revision], options)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000804 self.Print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000805 ('Checked out %s to a detached HEAD. Before making any commits\n'
806 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000807 'an existing branch or use \'git checkout %s -b <branch>\' to\n'
808 'create a new branch for your work.') % (revision, self.remote))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000809
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000810 @staticmethod
811 def _AskForData(prompt, options):
812 if options.jobs > 1:
813 raise gclient_utils.Error("Background task requires input. Rerun "
814 "gclient with --jobs=1 so that\n"
815 "interaction is possible.")
816 try:
817 return raw_input(prompt)
818 except KeyboardInterrupt:
819 # Hide the exception.
820 sys.exit(1)
821
822
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000823 def _AttemptRebase(self, upstream, files, options, newbase=None,
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000824 branch=None, printed_path=False, merge=False):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000825 """Attempt to rebase onto either upstream or, if specified, newbase."""
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000826 if files is not None:
827 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000828 revision = upstream
829 if newbase:
830 revision = newbase
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000831 action = 'merge' if merge else 'rebase'
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000832 if not printed_path:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000833 self.Print('_____ %s : Attempting %s onto %s...' % (
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000834 self.relpath, action, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000835 printed_path = True
836 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000837 self.Print('Attempting %s onto %s...' % (action, revision))
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000838
839 if merge:
840 merge_output = self._Capture(['merge', revision])
841 if options.verbose:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000842 self.Print(merge_output)
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000843 return
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000844
845 # Build the rebase command here using the args
846 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
847 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000848 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000849 rebase_cmd.append('--verbose')
850 if newbase:
851 rebase_cmd.extend(['--onto', newbase])
852 rebase_cmd.append(upstream)
853 if branch:
854 rebase_cmd.append(branch)
855
856 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000857 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000858 except subprocess2.CalledProcessError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000859 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
860 re.match(r'cannot rebase: your index contains uncommitted changes',
861 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000862 while True:
bauerb@chromium.org30c46d62014-01-23 12:11:56 +0000863 rebase_action = self._AskForData(
maruel@chromium.org90541732011-04-01 17:54:18 +0000864 'Cannot rebase because of unstaged changes.\n'
865 '\'git reset --hard HEAD\' ?\n'
866 'WARNING: destroys any uncommitted work in your current branch!'
bratell@opera.com18fa4542013-05-21 13:30:46 +0000867 ' (y)es / (q)uit / (s)how : ', options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000868 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000869 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000870 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000871 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000872 break
873 elif re.match(r'quit|q', rebase_action, re.I):
874 raise gclient_utils.Error("Please merge or rebase manually\n"
875 "cd %s && git " % self.checkout_path
876 + "%s" % ' '.join(rebase_cmd))
877 elif re.match(r'show|s', rebase_action, re.I):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000878 self.Print('%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000879 continue
880 else:
881 gclient_utils.Error("Input not recognized")
882 continue
883 elif re.search(r'^CONFLICT', e.stdout, re.M):
884 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
885 "Fix the conflict and run gclient again.\n"
886 "See 'man git-rebase' for details.\n")
887 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000888 self.Print(e.stdout.strip())
889 self.Print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000890 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
891 "manually.\ncd %s && git " %
892 self.checkout_path
893 + "%s" % ' '.join(rebase_cmd))
894
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000895 self.Print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000896 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000897 # Make the output a little prettier. It's nice to have some
898 # whitespace between projects when syncing.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000899 self.Print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000900
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000901 @staticmethod
902 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000903 (ok, current_version) = scm.GIT.AssertVersion(min_version)
904 if not ok:
905 raise gclient_utils.Error('git version %s < minimum required %s' %
906 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000907
msb@chromium.org786fb682010-06-02 15:16:23 +0000908 def _IsRebasing(self):
909 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
910 # have a plumbing command to determine whether a rebase is in progress, so
911 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
912 g = os.path.join(self.checkout_path, '.git')
913 return (
914 os.path.isdir(os.path.join(g, "rebase-merge")) or
915 os.path.isdir(os.path.join(g, "rebase-apply")))
916
917 def _CheckClean(self, rev_str):
918 # Make sure the tree is clean; see git-rebase.sh for reference
919 try:
920 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000921 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000922 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000923 raise gclient_utils.Error('\n____ %s%s\n'
924 '\tYou have unstaged changes.\n'
925 '\tPlease commit, stash, or reset.\n'
926 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000927 try:
928 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000929 '--ignore-submodules', 'HEAD', '--'],
930 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000931 except subprocess2.CalledProcessError:
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000932 raise gclient_utils.Error('\n____ %s%s\n'
933 '\tYour index contains uncommitted changes\n'
934 '\tPlease commit, stash, or reset.\n'
935 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000936
iannucci@chromium.org396e1a62013-07-03 19:41:04 +0000937 def _CheckDetachedHead(self, rev_str, _options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000938 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
939 # reference by a commit). If not, error out -- most likely a rebase is
940 # in progress, try to detect so we can give a better error.
941 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000942 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
943 cwd=self.checkout_path)
maruel@chromium.orgbffad372011-09-08 17:54:22 +0000944 except subprocess2.CalledProcessError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000945 # Commit is not contained by any rev. See if the user is rebasing:
946 if self._IsRebasing():
947 # Punt to the user
948 raise gclient_utils.Error('\n____ %s%s\n'
949 '\tAlready in a conflict, i.e. (no branch).\n'
950 '\tFix the conflict and run gclient again.\n'
951 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
952 '\tSee man git-rebase for details.\n'
953 % (self.relpath, rev_str))
954 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000955 name = ('saved-by-gclient-' +
956 self._Capture(['rev-parse', '--short', 'HEAD']))
mmoss@chromium.org77bd7362013-09-25 23:46:14 +0000957 self._Capture(['branch', '-f', name])
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000958 self.Print('_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000959 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000960
msb@chromium.org5bde4852009-12-14 16:47:12 +0000961 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000962 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000963 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000964 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000965 return None
966 return branch
967
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000968 def _Capture(self, args, cwd=None, **kwargs):
969 kwargs.setdefault('cwd', self.checkout_path)
970 kwargs.setdefault('stderr', subprocess2.PIPE)
971 return subprocess2.check_output(['git'] + args, **kwargs).strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000972
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000973 def _UpdateBranchHeads(self, options, fetch=False):
974 """Adds, and optionally fetches, "branch-heads" refspecs if requested."""
975 if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
maruel@chromium.org1a60dca2013-11-26 14:06:26 +0000976 config_cmd = ['config', 'remote.%s.fetch' % self.remote,
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000977 '+refs/branch-heads/*:refs/remotes/branch-heads/*',
978 '^\\+refs/branch-heads/\\*:.*$']
979 self._Run(config_cmd, options)
980 if fetch:
szager@chromium.orgff113292014-03-25 06:02:08 +0000981 cfg = gclient_utils.DefaultIndexPackConfig(self.url)
szager@chromium.orgfc616382014-03-18 20:32:04 +0000982 fetch_cmd = cfg + ['fetch', self.remote]
szager@chromium.orgf2d7d6b2013-10-17 20:41:43 +0000983 if options.verbose:
984 fetch_cmd.append('--verbose')
985 self._Run(fetch_cmd, options, retry=True)
mmoss@chromium.orge409df62013-04-16 17:28:57 +0000986
agable@chromium.orgfd5b6382013-10-25 20:54:34 +0000987 def _Run(self, args, options, **kwargs):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000988 cwd = kwargs.setdefault('cwd', self.checkout_path)
989 kwargs.setdefault('stdout', self.out_fh)
szager@chromium.org848fd492014-04-09 19:06:44 +0000990 kwargs['filter_fn'] = self.filter
szager@chromium.orgfe0d1902014-04-08 20:50:44 +0000991 kwargs.setdefault('print_stdout', False)
992 # Don't prompt for passwords; just fail quickly and noisily.
993 # By default, git will use an interactive terminal prompt when a username/
994 # password is needed. That shouldn't happen in the chromium workflow,
995 # and if it does, then gclient may hide the prompt in the midst of a flood
996 # of terminal spew. The only indication that something has gone wrong
997 # will be when gclient hangs unresponsively. Instead, we disable the
998 # password prompt and simply allow git to fail noisily. The error
999 # message produced by git will be copied to gclient's output.
1000 env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy())
1001 env.setdefault('GIT_ASKPASS', 'true')
1002 env.setdefault('SSH_ASKPASS', 'true')
1003
agable@chromium.org772efaf2014-04-01 02:35:44 +00001004 cmd = ['git'] + args
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001005 header = "running '%s' in '%s'" % (' '.join(cmd), cwd)
szager@chromium.org848fd492014-04-09 19:06:44 +00001006 self.filter(header)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001007 return gclient_utils.CheckCallAndFilter(cmd, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +00001008
1009
maruel@chromium.org55e724e2010-03-11 19:36:49 +00001010class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001011 """ Wrapper for SVN """
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001012 name = 'svn'
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001013
mukai@chromium.org9e3e82c2012-04-18 12:55:43 +00001014 @staticmethod
1015 def BinaryExists():
1016 """Returns true if the command exists."""
1017 try:
1018 result, version = scm.SVN.AssertVersion('1.4')
1019 if not result:
1020 raise gclient_utils.Error('SVN version is older than 1.4: %s' % version)
1021 return result
1022 except OSError:
1023 return False
1024
xusydoc@chromium.org885a9602013-05-31 09:54:40 +00001025 def GetCheckoutRoot(self):
1026 return scm.SVN.GetCheckoutRoot(self.checkout_path)
1027
floitsch@google.comeaab7842011-04-28 09:07:58 +00001028 def GetRevisionDate(self, revision):
1029 """Returns the given revision's date in ISO-8601 format (which contains the
1030 time zone)."""
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001031 date = scm.SVN.Capture(
1032 ['propget', '--revprop', 'svn:date', '-r', revision],
1033 os.path.join(self.checkout_path, '.'))
floitsch@google.comeaab7842011-04-28 09:07:58 +00001034 return date.strip()
1035
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001036 def cleanup(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001037 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001038 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001039
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001040 def diff(self, options, args, _file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001041 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001042 if not os.path.isdir(self.checkout_path):
1043 raise gclient_utils.Error('Directory %s is not present.' %
1044 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001045 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001046
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001047 def pack(self, _options, args, _file_list):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001048 """Generates a patch file which can be applied to the root of the
1049 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001050 if not os.path.isdir(self.checkout_path):
1051 raise gclient_utils.Error('Directory %s is not present.' %
1052 self.checkout_path)
1053 gclient_utils.CheckCallAndFilter(
1054 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
1055 cwd=self.checkout_path,
1056 print_stdout=False,
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001057 filter_fn=SvnDiffFilterer(self.relpath).Filter, print_func=self.Print)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00001058
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001059 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +00001060 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001061
1062 All updated files will be appended to file_list.
1063
1064 Raises:
1065 Error: if can't get URL for relative path.
1066 """
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001067 # Only update if git or hg is not controlling the directory.
1068 git_path = os.path.join(self.checkout_path, '.git')
1069 if os.path.exists(git_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001070 self.Print('________ found .git directory; skipping %s' % self.relpath)
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001071 return
1072
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001073 hg_path = os.path.join(self.checkout_path, '.hg')
1074 if os.path.exists(hg_path):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001075 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001076 return
1077
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001078 if args:
1079 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
1080
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001081 # revision is the revision to match. It is None if no revision is specified,
1082 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001083 url, revision = gclient_utils.SplitUrlRevision(self.url)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001084 # Keep the original unpinned url for reference in case the repo is switched.
1085 base_url = url
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001086 managed = True
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001087 if options.revision:
1088 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +00001089 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001090 if revision:
cmp@chromium.orgeb2756d2011-09-20 20:17:51 +00001091 if revision != 'unmanaged':
1092 forced_revision = True
1093 # Reconstruct the url.
1094 url = '%s@%s' % (url, revision)
1095 rev_str = ' at %s' % revision
1096 else:
1097 managed = False
1098 revision = None
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001099 else:
1100 forced_revision = False
1101 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001102
borenet@google.com7ff04292014-03-10 12:57:25 +00001103 # Get the existing scm url and the revision number of the current checkout.
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001104 exists = os.path.exists(self.checkout_path)
borenet@google.com7ff04292014-03-10 12:57:25 +00001105 if exists and managed:
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001106 try:
1107 from_info = scm.SVN.CaptureLocalInfo(
1108 [], os.path.join(self.checkout_path, '.'))
1109 except (gclient_utils.Error, subprocess2.CalledProcessError):
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001110 if options.reset and options.delete_unversioned_trees:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001111 self.Print('Removing troublesome path %s' % self.checkout_path)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001112 gclient_utils.rmtree(self.checkout_path)
1113 exists = False
1114 else:
1115 msg = ('Can\'t update/checkout %s if an unversioned directory is '
1116 'present. Delete the directory and try again.')
1117 raise gclient_utils.Error(msg % self.checkout_path)
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001118
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001119 BASE_URLS = {
1120 '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/',
1121 '/blink/trunk': 'gs://chromium-svn-checkout/blink/',
1122 }
hinoka@google.comca35be32014-01-17 01:48:18 +00001123 WHITELISTED_ROOTS = [
1124 'svn://svn.chromium.org',
1125 'svn://svn-mirror.golo.chromium.org',
1126 ]
davidjames@chromium.org13349e22012-11-15 17:11:28 +00001127 if not exists:
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001128 try:
1129 # Split out the revision number since it's not useful for us.
1130 base_path = urlparse.urlparse(url).path.split('@')[0]
hinoka@google.comca35be32014-01-17 01:48:18 +00001131 # Check to see if we're on a whitelisted root. We do this because
1132 # only some svn servers have matching UUIDs.
1133 local_parsed = urlparse.urlparse(url)
1134 local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001135 if ('CHROME_HEADLESS' in os.environ
1136 and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac.
hinoka@google.comca35be32014-01-17 01:48:18 +00001137 and base_path in BASE_URLS
1138 and local_root in WHITELISTED_ROOTS):
1139
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001140 # Use a tarball for initial sync if we are on a bot.
1141 # Get an unauthenticated gsutil instance.
1142 gsutil = download_from_google_storage.Gsutil(
1143 GSUTIL_DEFAULT_PATH, boto_path=os.devnull)
1144
1145 gs_path = BASE_URLS[base_path]
1146 _, out, _ = gsutil.check_call('ls', gs_path)
1147 # So that we can get the most recent revision.
1148 sorted_items = sorted(out.splitlines())
1149 latest_checkout = sorted_items[-1]
1150
1151 tempdir = tempfile.mkdtemp()
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001152 self.Print('Downloading %s...' % latest_checkout)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001153 code, out, err = gsutil.check_call('cp', latest_checkout, tempdir)
1154 if code:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001155 self.Print('%s\n%s' % (out, err))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001156 raise Exception()
1157 filename = latest_checkout.split('/')[-1]
1158 tarball = os.path.join(tempdir, filename)
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001159 self.Print('Unpacking into %s...' % self.checkout_path)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001160 gclient_utils.safe_makedirs(self.checkout_path)
1161 # TODO(hinoka): Use 7z for windows.
1162 cmd = ['tar', '--extract', '--ungzip',
1163 '--directory', self.checkout_path,
1164 '--file', tarball]
1165 gclient_utils.CheckCallAndFilter(
1166 cmd, stdout=sys.stdout, print_stdout=True)
1167
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001168 self.Print('Deleting temp file')
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001169 gclient_utils.rmtree(tempdir)
1170
1171 # Rewrite the repository root to match.
1172 tarball_url = scm.SVN.CaptureLocalInfo(
1173 ['.'], self.checkout_path)['Repository Root']
1174 tarball_parsed = urlparse.urlparse(tarball_url)
1175 tarball_root = '%s://%s' % (tarball_parsed.scheme,
1176 tarball_parsed.netloc)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001177
1178 if tarball_root != local_root:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001179 self.Print('Switching repository root to %s' % local_root)
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001180 self._Run(['switch', '--relocate', tarball_root,
1181 local_root, self.checkout_path],
1182 options)
1183 except Exception as e:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001184 self.Print('We tried to get a source tarball but failed.')
1185 self.Print('Resuming normal operations.')
1186 self.Print(str(e))
hinoka@google.com2f2ca142014-01-07 03:59:18 +00001187
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001188 gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001189 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001190 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001191 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001192 self._RunAndGetFileList(command, options, file_list, self._root_dir)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001193 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001194
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001195 if not managed:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001196 self.Print(('________ unmanaged solution; skipping %s' % self.relpath))
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001197 return self.Svnversion()
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001198
maruel@chromium.org49fcb0c2011-09-23 14:34:38 +00001199 if 'URL' not in from_info:
1200 raise gclient_utils.Error(
1201 ('gclient is confused. Couldn\'t get the url for %s.\n'
1202 'Try using @unmanaged.\n%s') % (
1203 self.checkout_path, from_info))
1204
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001205 # Look for locked directories.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001206 dir_info = scm.SVN.CaptureStatus(
1207 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001208 if any(d[0][2] == 'L' for d in dir_info):
1209 try:
1210 self._Run(['cleanup', self.checkout_path], options)
1211 except subprocess2.CalledProcessError, e:
1212 # Get the status again, svn cleanup may have cleaned up at least
1213 # something.
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001214 dir_info = scm.SVN.CaptureStatus(
1215 None, os.path.join(self.checkout_path, '.'))
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001216
1217 # Try to fix the failures by removing troublesome files.
1218 for d in dir_info:
1219 if d[0][2] == 'L':
1220 if d[0][0] == '!' and options.force:
kustermann@google.com1580d952013-08-19 07:31:40 +00001221 # We don't pass any files/directories to CaptureStatus and set
1222 # cwd=self.checkout_path, so we should get relative paths here.
1223 assert not os.path.isabs(d[1])
1224 path_to_remove = os.path.normpath(
1225 os.path.join(self.checkout_path, d[1]))
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001226 self.Print('Removing troublesome path %s' % path_to_remove)
kustermann@google.com1580d952013-08-19 07:31:40 +00001227 gclient_utils.rmtree(path_to_remove)
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001228 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001229 self.Print(
1230 'Not removing troublesome path %s automatically.' % d[1])
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001231 if d[0][0] == '!':
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001232 self.Print('You can pass --force to enable automatic removal.')
phajdan.jr@chromium.orgd558c4b2011-09-22 18:56:24 +00001233 raise e
maruel@chromium.orge407c9a2010-08-09 19:11:37 +00001234
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001235 # Retrieve the current HEAD version because svn is slow at null updates.
1236 if options.manually_grab_svn_rev and not revision:
maruel@chromium.orgd579fcf2011-12-13 20:36:03 +00001237 from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001238 revision = str(from_info_live['Revision'])
1239 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001240
thakis@chromium.orgd0b0a5b2014-03-10 19:30:21 +00001241 if from_info['URL'] != base_url:
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001242 # The repository url changed, need to switch.
1243 try:
1244 to_info = scm.SVN.CaptureRemoteInfo(url)
1245 except (gclient_utils.Error, subprocess2.CalledProcessError):
1246 # The url is invalid or the server is not accessible, it's safer to bail
1247 # out right now.
1248 raise gclient_utils.Error('This url is unreachable: %s' % url)
1249 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
1250 and (from_info['UUID'] == to_info['UUID']))
1251 if can_switch:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001252 self.Print('_____ relocating %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001253 # We have different roots, so check if we can switch --relocate.
1254 # Subversion only permits this if the repository UUIDs match.
1255 # Perform the switch --relocate, then rewrite the from_url
1256 # to reflect where we "are now." (This is the same way that
1257 # Subversion itself handles the metadata when switch --relocate
1258 # is used.) This makes the checks below for whether we
1259 # can update to a revision or have to switch to a different
1260 # branch work as expected.
1261 # TODO(maruel): TEST ME !
1262 command = ['switch', '--relocate',
1263 from_info['Repository Root'],
1264 to_info['Repository Root'],
1265 self.relpath]
1266 self._Run(command, options, cwd=self._root_dir)
1267 from_info['URL'] = from_info['URL'].replace(
1268 from_info['Repository Root'],
1269 to_info['Repository Root'])
1270 else:
1271 if not options.force and not options.reset:
1272 # Look for local modifications but ignore unversioned files.
1273 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1274 if status[0][0] != '?':
1275 raise gclient_utils.Error(
1276 ('Can\'t switch the checkout to %s; UUID don\'t match and '
1277 'there is local changes in %s. Delete the directory and '
1278 'try again.') % (url, self.checkout_path))
1279 # Ok delete it.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001280 self.Print('_____ switching %s to a new checkout' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001281 gclient_utils.rmtree(self.checkout_path)
1282 # We need to checkout.
1283 command = ['checkout', url, self.checkout_path]
1284 command = self._AddAdditionalUpdateFlags(command, options, revision)
1285 self._RunAndGetFileList(command, options, file_list, self._root_dir)
1286 return self.Svnversion()
1287
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001288 # If the provided url has a revision number that matches the revision
1289 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +00001290 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001291 if options.verbose or not forced_revision:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001292 self.Print('_____ %s%s' % (self.relpath, rev_str), timestamp=False)
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001293 else:
1294 command = ['update', self.checkout_path]
1295 command = self._AddAdditionalUpdateFlags(command, options, revision)
1296 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001297
steveblock@chromium.org98e69452012-02-16 16:36:43 +00001298 # If --reset and --delete_unversioned_trees are specified, remove any
1299 # untracked files and directories.
1300 if options.reset and options.delete_unversioned_trees:
1301 for status in scm.SVN.CaptureStatus(None, self.checkout_path):
1302 full_path = os.path.join(self.checkout_path, status[1])
1303 if (status[0][0] == '?'
1304 and os.path.isdir(full_path)
1305 and not os.path.islink(full_path)):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001306 self.Print('_____ removing unversioned directory %s' % status[1])
digit@chromium.orgdc112ac2013-04-24 13:00:19 +00001307 gclient_utils.rmtree(full_path)
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001308 return self.Svnversion()
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001309
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001310 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001311 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +00001312 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001313 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +00001314 # Create an empty checkout and then update the one file we want. Future
1315 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001316 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001317 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001318 if os.path.exists(os.path.join(self.checkout_path, filename)):
1319 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +00001320 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +00001321 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +00001322 # After the initial checkout, we can use update as if it were any other
1323 # dep.
1324 self.update(options, args, file_list)
1325 else:
1326 # If the installed version of SVN doesn't support --depth, fallback to
1327 # just exporting the file. This has the downside that revision
1328 # information is not stored next to the file, so we will have to
1329 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001330 if not os.path.exists(self.checkout_path):
maruel@chromium.org6c48a302011-10-20 23:44:20 +00001331 gclient_utils.safe_makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +00001332 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001333 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001334 command = self._AddAdditionalUpdateFlags(command, options,
1335 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001336 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +00001337
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001338 def revert(self, options, _args, file_list):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001339 """Reverts local modifications. Subversion specific.
1340
1341 All reverted files will be appended to file_list, even if Subversion
1342 doesn't know about them.
1343 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001344 if not os.path.isdir(self.checkout_path):
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001345 if os.path.exists(self.checkout_path):
1346 gclient_utils.rmtree(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001347 # svn revert won't work if the directory doesn't exist. It needs to
1348 # checkout instead.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001349 self.Print('_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001350 # Don't reuse the args.
1351 return self.update(options, [], file_list)
1352
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001353 if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001354 if os.path.isdir(os.path.join(self.checkout_path, '.git')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001355 self.Print('________ found .git directory; skipping %s' % self.relpath)
mmoss@chromium.org50fd47f2014-02-13 01:03:19 +00001356 return
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001357 if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001358 self.Print('________ found .hg directory; skipping %s' % self.relpath)
szager@chromium.org6c2b49d2014-02-26 23:57:38 +00001359 return
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001360 if not options.force:
1361 raise gclient_utils.Error('Invalid checkout path, aborting')
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001362 self.Print(
maruel@chromium.orgc0cc0872011-10-12 17:02:41 +00001363 '\n_____ %s is not a valid svn checkout, synching instead' %
1364 self.relpath)
1365 gclient_utils.rmtree(self.checkout_path)
1366 # Don't reuse the args.
1367 return self.update(options, [], file_list)
1368
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001369 def printcb(file_status):
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001370 if file_list is not None:
1371 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001372 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001373 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001374 else:
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001375 self.Print(os.path.join(self.checkout_path, file_status[1]))
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001376 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +00001377
maruel@chromium.org8b322b32011-11-01 19:05:50 +00001378 # Revert() may delete the directory altogether.
1379 if not os.path.isdir(self.checkout_path):
1380 # Don't reuse the args.
1381 return self.update(options, [], file_list)
1382
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001383 try:
1384 # svn revert is so broken we don't even use it. Using
1385 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001386 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +00001387 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
1388 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001389 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +00001390 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +00001391 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001392
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001393 def revinfo(self, _options, _args, _file_list):
msb@chromium.org0f282062009-11-06 20:14:02 +00001394 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +00001395 try:
1396 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +00001397 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +00001398 return None
msb@chromium.org0f282062009-11-06 20:14:02 +00001399
msb@chromium.orgcb5442b2009-09-22 16:51:24 +00001400 def runhooks(self, options, args, file_list):
1401 self.status(options, args, file_list)
1402
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001403 def status(self, options, args, file_list):
1404 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +00001405 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001406 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001407 # svn status won't work if the directory doesn't exist.
szager@chromium.orgfe0d1902014-04-08 20:50:44 +00001408 self.Print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001409 'The directory does not exist.') %
1410 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00001411 # There's no file list to retrieve.
1412 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +00001413 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +00001414
iannucci@chromium.org396e1a62013-07-03 19:41:04 +00001415 def GetUsableRev(self, rev, _options):
dbeam@chromium.orge5d1e612011-12-19 19:49:19 +00001416 """Verifies the validity of the revision for this repository."""
1417 if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)):
1418 raise gclient_utils.Error(
1419 ( '%s isn\'t a valid revision. Please check that your safesync_url is\n'
1420 'correct.') % rev)
1421 return rev
1422
msb@chromium.orge6f78352010-01-13 17:05:33 +00001423 def FullUrlForRelativeUrl(self, url):
1424 # Find the forth '/' and strip from there. A bit hackish.
1425 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +00001426
maruel@chromium.org669600d2010-09-01 19:06:31 +00001427 def _Run(self, args, options, **kwargs):
1428 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001429 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001430 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001431 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001432
iannucci@chromium.org2702bcd2013-09-24 19:10:07 +00001433 def Svnversion(self):
1434 """Runs the lowest checked out revision in the current project."""
1435 info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.'))
1436 return info['Revision']
1437
maruel@chromium.org669600d2010-09-01 19:06:31 +00001438 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
1439 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +00001440 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +00001441 scm.SVN.RunAndGetFileList(
1442 options.verbose,
1443 args + ['--ignore-externals'],
1444 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +00001445 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +00001446
maruel@chromium.org6e29d572010-06-04 17:32:20 +00001447 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +00001448 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +00001449 """Add additional flags to command depending on what options are set.
1450 command should be a list of strings that represents an svn command.
1451
1452 This method returns a new list to be used as a command."""
1453 new_command = command[:]
1454 if revision:
1455 new_command.extend(['--revision', str(revision).strip()])
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001456 # We don't want interaction when jobs are used.
1457 if options.jobs > 1:
1458 new_command.append('--non-interactive')
tony@chromium.org99828122010-06-04 01:41:02 +00001459 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001460 # --accept was added to 'svn update' in svn 1.6.
1461 if not scm.SVN.AssertVersion('1.5')[0]:
1462 return new_command
1463
1464 # It's annoying to have it block in the middle of a sync, just sensible
1465 # defaults.
1466 if options.force:
tony@chromium.org99828122010-06-04 01:41:02 +00001467 new_command.append('--force')
maruel@chromium.org36ac2392011-10-12 16:36:11 +00001468 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1469 new_command.extend(('--accept', 'theirs-conflict'))
1470 elif options.manually_grab_svn_rev:
1471 new_command.append('--force')
1472 if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1473 new_command.extend(('--accept', 'postpone'))
1474 elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
1475 new_command.extend(('--accept', 'postpone'))
tony@chromium.org99828122010-06-04 01:41:02 +00001476 return new_command