blob: 6dc4da7f609ff0e65f8bd6d74f1c697645e6cd94 [file] [log] [blame]
scherkus@chromium.org95f0f4e2010-05-22 00:55:26 +00001# Copyright (c) 2010 The Chromium Authors. All rights reserved.
maruel@chromium.org5aeb7dd2009-11-17 18:09:01 +00002# Use of this source code is governed by a BSD-style license that can be
3# found in the LICENSE file.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00004
maruel@chromium.orgd5800f12009-11-12 20:03:43 +00005"""Gclient-specific SCM-specific operations."""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00006
maruel@chromium.org754960e2009-09-21 12:31:05 +00007import logging
maruel@chromium.org5f3eee32009-09-17 00:34:30 +00008import os
maruel@chromium.orgee4071d2009-12-22 22:25:37 +00009import posixpath
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000010import re
maruel@chromium.org90541732011-04-01 17:54:18 +000011import sys
maruel@chromium.orgfd876172010-04-30 14:01:05 +000012import time
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000013
14import gclient_utils
maruel@chromium.org31cb48a2011-04-04 18:01:36 +000015import scm
16import subprocess2
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000017
18
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000019class DiffFilterer(object):
20 """Simple class which tracks which file is being diffed and
21 replaces instances of its file name in the original and
msb@chromium.orgd6504212010-01-13 17:34:31 +000022 working copy lines of the svn/git diff output."""
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000023 index_string = "Index: "
24 original_prefix = "--- "
25 working_prefix = "+++ "
26
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000027 def __init__(self, relpath):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000028 # Note that we always use '/' as the path separator to be
29 # consistent with svn's cygwin-style output on Windows
30 self._relpath = relpath.replace("\\", "/")
31 self._current_file = ""
32 self._replacement_file = ""
33
maruel@chromium.org6e29d572010-06-04 17:32:20 +000034 def SetCurrentFile(self, current_file):
35 self._current_file = current_file
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000036 # Note that we always use '/' as the path separator to be
37 # consistent with svn's cygwin-style output on Windows
maruel@chromium.org6e29d572010-06-04 17:32:20 +000038 self._replacement_file = posixpath.join(self._relpath, current_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000039
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000040 def _Replace(self, line):
41 return line.replace(self._current_file, self._replacement_file)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000042
43 def Filter(self, line):
44 if (line.startswith(self.index_string)):
45 self.SetCurrentFile(line[len(self.index_string):])
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000046 line = self._Replace(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000047 else:
48 if (line.startswith(self.original_prefix) or
49 line.startswith(self.working_prefix)):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +000050 line = self._Replace(line)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +000051 print(line)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +000052
53
maruel@chromium.org90541732011-04-01 17:54:18 +000054def ask_for_data(prompt):
55 try:
56 return raw_input(prompt)
57 except KeyboardInterrupt:
58 # Hide the exception.
59 sys.exit(1)
60
61
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000062### SCM abstraction layer
63
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000064# Factory Method for SCM wrapper creation
65
maruel@chromium.org9eda4112010-06-11 18:56:10 +000066def GetScmName(url):
67 if url:
68 url, _ = gclient_utils.SplitUrlRevision(url)
69 if (url.startswith('git://') or url.startswith('ssh://') or
70 url.endswith('.git')):
71 return 'git'
maruel@chromium.orgb74dca22010-06-11 20:10:40 +000072 elif (url.startswith('http://') or url.startswith('https://') or
maruel@chromium.org54a07a22010-06-14 19:07:39 +000073 url.startswith('svn://') or url.startswith('svn+ssh://')):
maruel@chromium.org9eda4112010-06-11 18:56:10 +000074 return 'svn'
75 return None
76
77
78def CreateSCM(url, root_dir=None, relpath=None):
79 SCM_MAP = {
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000080 'svn' : SVNWrapper,
msb@chromium.orge28e4982009-09-25 20:51:45 +000081 'git' : GitWrapper,
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000082 }
msb@chromium.orge28e4982009-09-25 20:51:45 +000083
maruel@chromium.org9eda4112010-06-11 18:56:10 +000084 scm_name = GetScmName(url)
85 if not scm_name in SCM_MAP:
86 raise gclient_utils.Error('No SCM found for url %s' % url)
87 return SCM_MAP[scm_name](url, root_dir, relpath)
msb@chromium.orgcb5442b2009-09-22 16:51:24 +000088
89
90# SCMWrapper base class
91
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000092class SCMWrapper(object):
93 """Add necessary glue between all the supported SCM.
94
msb@chromium.orgd6504212010-01-13 17:34:31 +000095 This is the abstraction layer to bind to different SCM.
96 """
maruel@chromium.org9eda4112010-06-11 18:56:10 +000097 def __init__(self, url=None, root_dir=None, relpath=None):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +000098 self.url = url
maruel@chromium.org5e73b0c2009-09-18 19:47:48 +000099 self._root_dir = root_dir
100 if self._root_dir:
101 self._root_dir = self._root_dir.replace('/', os.sep)
102 self.relpath = relpath
103 if self.relpath:
104 self.relpath = self.relpath.replace('/', os.sep)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000105 if self.relpath and self._root_dir:
106 self.checkout_path = os.path.join(self._root_dir, self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000107
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000108 def RunCommand(self, command, options, args, file_list=None):
109 # file_list will have all files that are modified appended to it.
maruel@chromium.orgde754ac2009-09-17 18:04:50 +0000110 if file_list is None:
111 file_list = []
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000112
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000113 commands = ['cleanup', 'export', 'update', 'updatesingle', 'revert',
114 'revinfo', 'status', 'diff', 'pack', 'runhooks']
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000115
116 if not command in commands:
117 raise gclient_utils.Error('Unknown command %s' % command)
118
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000119 if not command in dir(self):
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000120 raise gclient_utils.Error('Command %s not implemented in %s wrapper' % (
maruel@chromium.org9eda4112010-06-11 18:56:10 +0000121 command, self.__class__.__name__))
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000122
123 return getattr(self, command)(options, args, file_list)
124
125
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000126class GitWrapper(SCMWrapper):
msb@chromium.orge28e4982009-09-25 20:51:45 +0000127 """Wrapper for Git"""
128
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000129 @staticmethod
130 def cleanup(options, args, file_list):
msb@chromium.orgd8a63782010-01-25 17:47:05 +0000131 """'Cleanup' the repo.
132
133 There's no real git equivalent for the svn cleanup command, do a no-op.
134 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000135
136 def diff(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000137 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000138 self._Run(['diff', merge_base], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000139
140 def export(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000141 """Export a clean directory tree into the given path.
142
143 Exports into the specified directory, creating the path if it does
144 already exist.
145 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000146 assert len(args) == 1
147 export_path = os.path.abspath(os.path.join(args[0], self.relpath))
148 if not os.path.exists(export_path):
149 os.makedirs(export_path)
maruel@chromium.org37e89872010-09-07 16:11:33 +0000150 self._Run(['checkout-index', '-a', '--prefix=%s/' % export_path],
151 options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000152
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000153 def pack(self, options, args, file_list):
154 """Generates a patch file which can be applied to the root of the
msb@chromium.orgd6504212010-01-13 17:34:31 +0000155 repository.
156
157 The patch file is generated from a diff of the merge base of HEAD and
158 its upstream branch.
159 """
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000160 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org17d01792010-09-01 18:07:10 +0000161 gclient_utils.CheckCallAndFilter(
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000162 ['git', 'diff', merge_base],
163 cwd=self.checkout_path,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000164 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000165
msb@chromium.orge28e4982009-09-25 20:51:45 +0000166 def update(self, options, args, file_list):
167 """Runs git to update or transparently checkout the working copy.
168
169 All updated files will be appended to file_list.
170
171 Raises:
172 Error: if can't get URL for relative path.
173 """
msb@chromium.orge28e4982009-09-25 20:51:45 +0000174 if args:
175 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
176
nasser@codeaurora.orgece406f2010-02-23 17:29:15 +0000177 self._CheckMinVersion("1.6.6")
msb@chromium.org923a0372009-12-11 20:42:43 +0000178
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000179 default_rev = "refs/heads/master"
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000180 url, deps_revision = gclient_utils.SplitUrlRevision(self.url)
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000181 rev_str = ""
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000182 revision = deps_revision
msb@chromium.orge28e4982009-09-25 20:51:45 +0000183 if options.revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000184 # Override the revision number.
185 revision = str(options.revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000186 if not revision:
187 revision = default_rev
msb@chromium.orge28e4982009-09-25 20:51:45 +0000188
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000189 rev_str = ' at %s' % revision
190 files = []
191
192 printed_path = False
193 verbose = []
msb@chromium.orgb1a22bf2009-11-07 02:33:50 +0000194 if options.verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000195 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000196 verbose = ['--verbose']
197 printed_path = True
198
199 if revision.startswith('refs/heads/'):
200 rev_type = "branch"
201 elif revision.startswith('origin/'):
202 # For compatability with old naming, translate 'origin' to 'refs/heads'
203 revision = revision.replace('origin/', 'refs/heads/')
204 rev_type = "branch"
205 else:
206 # hash is also a tag, only make a distinction at checkout
207 rev_type = "hash"
208
msb@chromium.orge28e4982009-09-25 20:51:45 +0000209 if not os.path.exists(self.checkout_path):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000210 self._Clone(revision, url, options)
thomasvl@chromium.org858d6452011-03-24 17:59:20 +0000211 files = self._Capture(['ls-files']).splitlines()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000212 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000213 if not verbose:
214 # Make the output a little prettier. It's nice to have some whitespace
215 # between projects when cloning.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000216 print('')
msb@chromium.orge28e4982009-09-25 20:51:45 +0000217 return
218
msb@chromium.orge4af1ab2010-01-13 21:26:09 +0000219 if not os.path.exists(os.path.join(self.checkout_path, '.git')):
220 raise gclient_utils.Error('\n____ %s%s\n'
221 '\tPath is not a git repo. No .git dir.\n'
222 '\tTo resolve:\n'
223 '\t\trm -rf %s\n'
224 '\tAnd run gclient sync again\n'
225 % (self.relpath, rev_str, self.relpath))
226
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000227 # See if the url has changed (the unittests use git://foo for the url, let
228 # that through).
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000229 current_url = self._Capture(['config', 'remote.origin.url'])
thomasvl@chromium.orgd6f89d82011-03-25 20:41:58 +0000230 # TODO(maruel): Delete url != 'git://foo' since it's just to make the
231 # unit test pass. (and update the comment above)
232 if current_url != url and url != 'git://foo':
thomasvl@chromium.org668667c2011-03-24 18:27:24 +0000233 print('_____ switching %s to a new upstream' % self.relpath)
234 # Make sure it's clean
235 self._CheckClean(rev_str)
236 # Switch over to the new upstream
237 self._Run(['remote', 'set-url', 'origin', url], options)
238 quiet = []
239 if not options.verbose:
240 quiet = ['--quiet']
241 self._Run(['fetch', 'origin', '--prune'] + quiet, options)
242 self._Run(['reset', '--hard', 'origin/master'] + quiet, options)
243 files = self._Capture(['ls-files']).splitlines()
244 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
245 return
246
msb@chromium.org5bde4852009-12-14 16:47:12 +0000247 cur_branch = self._GetCurrentBranch()
248
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000249 # Cases:
msb@chromium.org786fb682010-06-02 15:16:23 +0000250 # 0) HEAD is detached. Probably from our initial clone.
251 # - make sure HEAD is contained by a named ref, then update.
252 # Cases 1-4. HEAD is a branch.
253 # 1) current branch is not tracking a remote branch (could be git-svn)
254 # - try to rebase onto the new hash or branch
255 # 2) current branch is tracking a remote branch with local committed
256 # changes, but the DEPS file switched to point to a hash
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000257 # - rebase those changes on top of the hash
msb@chromium.org786fb682010-06-02 15:16:23 +0000258 # 3) current branch is tracking a remote branch w/or w/out changes,
259 # no switch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000260 # - see if we can FF, if not, prompt the user for rebase, merge, or stop
msb@chromium.org786fb682010-06-02 15:16:23 +0000261 # 4) current branch is tracking a remote branch, switches to a different
262 # remote branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000263 # - exit
264
maruel@chromium.org81e012c2010-04-29 16:07:24 +0000265 # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
266 # a tracking branch
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000267 # or 'master' if not a tracking branch (it's based on a specific rev/hash)
268 # or it returns None if it couldn't find an upstream
msb@chromium.org786fb682010-06-02 15:16:23 +0000269 if cur_branch is None:
270 upstream_branch = None
271 current_type = "detached"
272 logging.debug("Detached HEAD")
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000273 else:
msb@chromium.org786fb682010-06-02 15:16:23 +0000274 upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
275 if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
276 current_type = "hash"
277 logging.debug("Current branch is not tracking an upstream (remote)"
278 " branch.")
279 elif upstream_branch.startswith('refs/remotes'):
280 current_type = "branch"
281 else:
282 raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000283
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000284 # Update the remotes first so we have all the refs.
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000285 backoff_time = 5
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000286 for _ in range(10):
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000287 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000288 remote_output = scm.GIT.Capture(
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000289 ['remote'] + verbose + ['update'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000290 cwd=self.checkout_path)
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000291 break
maruel@chromium.org982984e2010-05-11 20:57:49 +0000292 except gclient_utils.CheckCallError, e:
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000293 # Hackish but at that point, git is known to work so just checking for
294 # 502 in stderr should be fine.
295 if '502' in e.stderr:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000296 print(str(e))
297 print('Sleeping %.1f seconds and retrying...' % backoff_time)
cbentzel@chromium.org2aee2292010-09-03 14:15:25 +0000298 time.sleep(backoff_time)
299 backoff_time *= 1.3
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000300 continue
maruel@chromium.orgfd876172010-04-30 14:01:05 +0000301 raise
maruel@chromium.org0b1c2462010-03-02 00:48:14 +0000302
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000303 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000304 print(remote_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000305
306 # This is a big hammer, debatable if it should even be here...
davemoore@chromium.org793796d2010-02-19 17:27:41 +0000307 if options.force or options.reset:
maruel@chromium.org37e89872010-09-07 16:11:33 +0000308 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000309
msb@chromium.org786fb682010-06-02 15:16:23 +0000310 if current_type == 'detached':
311 # case 0
312 self._CheckClean(rev_str)
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000313 self._CheckDetachedHead(rev_str, options)
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000314 self._Capture(['checkout', '--quiet', '%s^0' % revision])
msb@chromium.org786fb682010-06-02 15:16:23 +0000315 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000316 print('\n_____ %s%s' % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000317 elif current_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000318 # case 1
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000319 if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000320 # Our git-svn branch (upstream_branch) is our upstream
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000321 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000322 newbase=revision, printed_path=printed_path)
323 printed_path = True
324 else:
325 # Can't find a merge-base since we don't know our upstream. That makes
326 # this command VERY likely to produce a rebase failure. For now we
327 # assume origin is our upstream since that's what the old behavior was.
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000328 upstream_branch = 'origin'
nasser@codeaurora.org7080e942010-03-15 15:06:16 +0000329 if options.revision or deps_revision:
nasser@codeaurora.org3b29de12010-03-08 18:34:28 +0000330 upstream_branch = revision
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000331 self._AttemptRebase(upstream_branch, files, options,
332 printed_path=printed_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000333 printed_path = True
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000334 elif rev_type == 'hash':
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000335 # case 2
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000336 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000337 newbase=revision, printed_path=printed_path)
338 printed_path = True
339 elif revision.replace('heads', 'remotes/origin') != upstream_branch:
340 # case 4
341 new_base = revision.replace('heads', 'remotes/origin')
342 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000343 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000344 switch_error = ("Switching upstream branch from %s to %s\n"
345 % (upstream_branch, new_base) +
346 "Please merge or rebase manually:\n" +
347 "cd %s; git rebase %s\n" % (self.checkout_path, new_base) +
348 "OR git checkout -b <some new branch> %s" % new_base)
349 raise gclient_utils.Error(switch_error)
350 else:
351 # case 3 - the default case
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000352 files = self._Capture(['diff', upstream_branch, '--name-only']).split()
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000353 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000354 print('Trying fast-forward merge to branch : %s' % upstream_branch)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000355 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000356 merge_output = scm.GIT.Capture(['merge', '--ff-only', upstream_branch],
357 cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000358 except gclient_utils.CheckCallError, e:
359 if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr):
360 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000361 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000362 printed_path = True
363 while True:
364 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000365 # TODO(maruel): That can't work with --jobs.
maruel@chromium.org90541732011-04-01 17:54:18 +0000366 action = ask_for_data(
367 'Cannot fast-forward merge, attempt to rebase? '
368 '(y)es / (q)uit / (s)kip : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000369 except ValueError:
maruel@chromium.org90541732011-04-01 17:54:18 +0000370 raise gclient_utils.Error('Invalid Character')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000371 if re.match(r'yes|y', action, re.I):
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000372 self._AttemptRebase(upstream_branch, files, options,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000373 printed_path=printed_path)
374 printed_path = True
375 break
376 elif re.match(r'quit|q', action, re.I):
377 raise gclient_utils.Error("Can't fast-forward, please merge or "
378 "rebase manually.\n"
379 "cd %s && git " % self.checkout_path
380 + "rebase %s" % upstream_branch)
381 elif re.match(r'skip|s', action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000382 print('Skipping %s' % self.relpath)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000383 return
384 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000385 print('Input not recognized')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000386 elif re.match("error: Your local changes to '.*' would be "
387 "overwritten by merge. Aborting.\nPlease, commit your "
388 "changes or stash them before you can merge.\n",
389 e.stderr):
390 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000391 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000392 printed_path = True
393 raise gclient_utils.Error(e.stderr)
394 else:
395 # Some other problem happened with the merge
396 logging.error("Error during fast-forward merge in %s!" % self.relpath)
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000397 print(e.stderr)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000398 raise
399 else:
400 # Fast-forward merge was successful
401 if not re.match('Already up-to-date.', merge_output) or verbose:
402 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000403 print('\n_____ %s%s' % (self.relpath, rev_str))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000404 printed_path = True
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000405 print(merge_output.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000406 if not verbose:
407 # Make the output a little prettier. It's nice to have some
408 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000409 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000410
411 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
msb@chromium.org5bde4852009-12-14 16:47:12 +0000412
413 # If the rebase generated a conflict, abort and ask user to fix
msb@chromium.org786fb682010-06-02 15:16:23 +0000414 if self._IsRebasing():
msb@chromium.org5bde4852009-12-14 16:47:12 +0000415 raise gclient_utils.Error('\n____ %s%s\n'
416 '\nConflict while rebasing this branch.\n'
417 'Fix the conflict and run gclient again.\n'
418 'See man git-rebase for details.\n'
419 % (self.relpath, rev_str))
420
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000421 if verbose:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000422 print('Checked out revision %s' % self.revinfo(options, (), None))
msb@chromium.orge28e4982009-09-25 20:51:45 +0000423
424 def revert(self, options, args, file_list):
425 """Reverts local modifications.
426
427 All reverted files will be appended to file_list.
428 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000429 if not os.path.isdir(self.checkout_path):
msb@chromium.org260c6532009-10-28 03:22:35 +0000430 # revert won't work if the directory doesn't exist. It needs to
431 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000432 print('\n_____ %s is missing, synching instead' % self.relpath)
msb@chromium.org260c6532009-10-28 03:22:35 +0000433 # Don't reuse the args.
434 return self.update(options, [], file_list)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000435
436 default_rev = "refs/heads/master"
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000437 _, deps_revision = gclient_utils.SplitUrlRevision(self.url)
nasser@codeaurora.orgb2b46312010-04-30 20:58:03 +0000438 if not deps_revision:
439 deps_revision = default_rev
440 if deps_revision.startswith('refs/heads/'):
441 deps_revision = deps_revision.replace('refs/heads/', 'origin/')
442
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000443 files = self._Capture(['diff', deps_revision, '--name-only']).split()
maruel@chromium.org37e89872010-09-07 16:11:33 +0000444 self._Run(['reset', '--hard', deps_revision], options)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000445 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
446
msb@chromium.org0f282062009-11-06 20:14:02 +0000447 def revinfo(self, options, args, file_list):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000448 """Returns revision"""
449 return self._Capture(['rev-parse', 'HEAD'])
msb@chromium.org0f282062009-11-06 20:14:02 +0000450
msb@chromium.orge28e4982009-09-25 20:51:45 +0000451 def runhooks(self, options, args, file_list):
452 self.status(options, args, file_list)
453
454 def status(self, options, args, file_list):
455 """Display status information."""
456 if not os.path.isdir(self.checkout_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000457 print(('\n________ couldn\'t run status in %s:\n'
458 'The directory does not exist.') % self.checkout_path)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000459 else:
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000460 merge_base = self._Capture(['merge-base', 'HEAD', 'origin'])
maruel@chromium.org37e89872010-09-07 16:11:33 +0000461 self._Run(['diff', '--name-status', merge_base], options)
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000462 files = self._Capture(['diff', '--name-only', merge_base]).split()
msb@chromium.orge28e4982009-09-25 20:51:45 +0000463 file_list.extend([os.path.join(self.checkout_path, f) for f in files])
464
msb@chromium.orge6f78352010-01-13 17:05:33 +0000465 def FullUrlForRelativeUrl(self, url):
466 # Strip from last '/'
467 # Equivalent to unix basename
468 base_url = self.url
469 return base_url[:base_url.rfind('/')] + url
470
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000471 def _Clone(self, revision, url, options):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000472 """Clone a git repository from the given URL.
473
msb@chromium.org786fb682010-06-02 15:16:23 +0000474 Once we've cloned the repo, we checkout a working branch if the specified
475 revision is a branch head. If it is a tag or a specific commit, then we
476 leave HEAD detached as it makes future updates simpler -- in this case the
477 user should first create a new branch or switch to an existing branch before
478 making changes in the repo."""
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000479 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000480 # git clone doesn't seem to insert a newline properly before printing
481 # to stdout
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000482 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000483
484 clone_cmd = ['clone']
msb@chromium.org786fb682010-06-02 15:16:23 +0000485 if revision.startswith('refs/heads/'):
486 clone_cmd.extend(['-b', revision.replace('refs/heads/', '')])
487 detach_head = False
488 else:
489 clone_cmd.append('--no-checkout')
490 detach_head = True
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000491 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000492 clone_cmd.append('--verbose')
493 clone_cmd.extend([url, self.checkout_path])
494
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000495 for _ in range(3):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000496 try:
maruel@chromium.org37e89872010-09-07 16:11:33 +0000497 self._Run(clone_cmd, options, cwd=self._root_dir)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000498 break
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000499 except (gclient_utils.Error, subprocess2.CalledProcessError), e:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000500 # TODO(maruel): Hackish, should be fixed by moving _Run() to
501 # CheckCall().
502 # Too bad we don't have access to the actual output.
503 # We should check for "transfer closed with NNN bytes remaining to
504 # read". In the meantime, just make sure .git exists.
505 if (e.args[0] == 'git command clone returned 128' and
506 os.path.exists(os.path.join(self.checkout_path, '.git'))):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000507 print(str(e))
508 print('Retrying...')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000509 continue
510 raise e
511
msb@chromium.org786fb682010-06-02 15:16:23 +0000512 if detach_head:
513 # Squelch git's very verbose detached HEAD warning and use our own
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000514 self._Capture(['checkout', '--quiet', '%s^0' % revision])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000515 print(
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000516 ('Checked out %s to a detached HEAD. Before making any commits\n'
517 'in this repo, you should use \'git checkout <branch>\' to switch to\n'
518 'an existing branch or use \'git checkout origin -b <branch>\' to\n'
519 'create a new branch for your work.') % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000520
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000521 def _AttemptRebase(self, upstream, files, options, newbase=None,
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000522 branch=None, printed_path=False):
523 """Attempt to rebase onto either upstream or, if specified, newbase."""
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000524 files.extend(self._Capture(['diff', upstream, '--name-only']).split())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000525 revision = upstream
526 if newbase:
527 revision = newbase
528 if not printed_path:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000529 print('\n_____ %s : Attempting rebase onto %s...' % (
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000530 self.relpath, revision))
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000531 printed_path = True
532 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000533 print('Attempting rebase onto %s...' % revision)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000534
535 # Build the rebase command here using the args
536 # git rebase [options] [--onto <newbase>] <upstream> [<branch>]
537 rebase_cmd = ['rebase']
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000538 if options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000539 rebase_cmd.append('--verbose')
540 if newbase:
541 rebase_cmd.extend(['--onto', newbase])
542 rebase_cmd.append(upstream)
543 if branch:
544 rebase_cmd.append(branch)
545
546 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000547 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000548 except gclient_utils.CheckCallError, e:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000549 if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or
550 re.match(r'cannot rebase: your index contains uncommitted changes',
551 e.stderr)):
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000552 while True:
maruel@chromium.org90541732011-04-01 17:54:18 +0000553 rebase_action = ask_for_data(
554 'Cannot rebase because of unstaged changes.\n'
555 '\'git reset --hard HEAD\' ?\n'
556 'WARNING: destroys any uncommitted work in your current branch!'
557 ' (y)es / (q)uit / (s)how : ')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000558 if re.match(r'yes|y', rebase_action, re.I):
maruel@chromium.org37e89872010-09-07 16:11:33 +0000559 self._Run(['reset', '--hard', 'HEAD'], options)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000560 # Should this be recursive?
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000561 rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path)
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000562 break
563 elif re.match(r'quit|q', rebase_action, re.I):
564 raise gclient_utils.Error("Please merge or rebase manually\n"
565 "cd %s && git " % self.checkout_path
566 + "%s" % ' '.join(rebase_cmd))
567 elif re.match(r'show|s', rebase_action, re.I):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000568 print('\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000569 continue
570 else:
571 gclient_utils.Error("Input not recognized")
572 continue
573 elif re.search(r'^CONFLICT', e.stdout, re.M):
574 raise gclient_utils.Error("Conflict while rebasing this branch.\n"
575 "Fix the conflict and run gclient again.\n"
576 "See 'man git-rebase' for details.\n")
577 else:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000578 print(e.stdout.strip())
579 print('Rebase produced error output:\n%s' % e.stderr.strip())
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000580 raise gclient_utils.Error("Unrecognized error, please merge or rebase "
581 "manually.\ncd %s && git " %
582 self.checkout_path
583 + "%s" % ' '.join(rebase_cmd))
584
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000585 print(rebase_output.strip())
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000586 if not options.verbose:
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000587 # Make the output a little prettier. It's nice to have some
588 # whitespace between projects when syncing.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000589 print('')
nasser@codeaurora.orgd90ba3f2010-02-23 14:42:57 +0000590
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000591 @staticmethod
592 def _CheckMinVersion(min_version):
maruel@chromium.orgd0f854a2010-03-11 19:35:53 +0000593 (ok, current_version) = scm.GIT.AssertVersion(min_version)
594 if not ok:
595 raise gclient_utils.Error('git version %s < minimum required %s' %
596 (current_version, min_version))
msb@chromium.org923a0372009-12-11 20:42:43 +0000597
msb@chromium.org786fb682010-06-02 15:16:23 +0000598 def _IsRebasing(self):
599 # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't
600 # have a plumbing command to determine whether a rebase is in progress, so
601 # for now emualate (more-or-less) git-rebase.sh / git-completion.bash
602 g = os.path.join(self.checkout_path, '.git')
603 return (
604 os.path.isdir(os.path.join(g, "rebase-merge")) or
605 os.path.isdir(os.path.join(g, "rebase-apply")))
606
607 def _CheckClean(self, rev_str):
608 # Make sure the tree is clean; see git-rebase.sh for reference
609 try:
610 scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'],
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000611 cwd=self.checkout_path)
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000612 except gclient_utils.CheckCallError:
613 raise gclient_utils.Error('\n____ %s%s\n'
614 '\tYou have unstaged changes.\n'
615 '\tPlease commit, stash, or reset.\n'
616 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000617 try:
618 scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r',
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000619 '--ignore-submodules', 'HEAD', '--'],
620 cwd=self.checkout_path)
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000621 except gclient_utils.CheckCallError:
622 raise gclient_utils.Error('\n____ %s%s\n'
623 '\tYour index contains uncommitted changes\n'
624 '\tPlease commit, stash, or reset.\n'
625 % (self.relpath, rev_str))
msb@chromium.org786fb682010-06-02 15:16:23 +0000626
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000627 def _CheckDetachedHead(self, rev_str, options):
msb@chromium.org786fb682010-06-02 15:16:23 +0000628 # HEAD is detached. Make sure it is safe to move away from (i.e., it is
629 # reference by a commit). If not, error out -- most likely a rebase is
630 # in progress, try to detect so we can give a better error.
631 try:
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000632 scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'],
633 cwd=self.checkout_path)
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000634 except gclient_utils.CheckCallError:
msb@chromium.org786fb682010-06-02 15:16:23 +0000635 # Commit is not contained by any rev. See if the user is rebasing:
636 if self._IsRebasing():
637 # Punt to the user
638 raise gclient_utils.Error('\n____ %s%s\n'
639 '\tAlready in a conflict, i.e. (no branch).\n'
640 '\tFix the conflict and run gclient again.\n'
641 '\tOr to abort run:\n\t\tgit-rebase --abort\n'
642 '\tSee man git-rebase for details.\n'
643 % (self.relpath, rev_str))
644 # Let's just save off the commit so we can proceed.
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000645 name = ('saved-by-gclient-' +
646 self._Capture(['rev-parse', '--short', 'HEAD']))
647 self._Capture(['branch', name])
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000648 print('\n_____ found an unreferenced commit and saved it as \'%s\'' %
maruel@chromium.orgf5d37bf2010-09-02 00:50:34 +0000649 name)
msb@chromium.org786fb682010-06-02 15:16:23 +0000650
msb@chromium.org5bde4852009-12-14 16:47:12 +0000651 def _GetCurrentBranch(self):
msb@chromium.org786fb682010-06-02 15:16:23 +0000652 # Returns name of current branch or None for detached HEAD
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000653 branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD'])
msb@chromium.org786fb682010-06-02 15:16:23 +0000654 if branch == 'HEAD':
msb@chromium.org5bde4852009-12-14 16:47:12 +0000655 return None
656 return branch
657
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000658 def _Capture(self, args):
maruel@chromium.orgad80e3b2010-09-09 14:18:28 +0000659 return gclient_utils.CheckCall(
660 ['git'] + args, cwd=self.checkout_path, print_error=False)[0].strip()
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000661
maruel@chromium.org37e89872010-09-07 16:11:33 +0000662 def _Run(self, args, options, **kwargs):
maruel@chromium.org6cafa132010-09-07 14:17:26 +0000663 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org37e89872010-09-07 16:11:33 +0000664 gclient_utils.CheckCallAndFilterAndHeader(['git'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000665 always=options.verbose, **kwargs)
msb@chromium.orge28e4982009-09-25 20:51:45 +0000666
667
maruel@chromium.org55e724e2010-03-11 19:36:49 +0000668class SVNWrapper(SCMWrapper):
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000669 """ Wrapper for SVN """
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000670
671 def cleanup(self, options, args, file_list):
672 """Cleanup working copy."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000673 self._Run(['cleanup'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000674
675 def diff(self, options, args, file_list):
676 # NOTE: This function does not currently modify file_list.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000677 if not os.path.isdir(self.checkout_path):
678 raise gclient_utils.Error('Directory %s is not present.' %
679 self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000680 self._Run(['diff'] + args, options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000681
682 def export(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000683 """Export a clean directory tree into the given path."""
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000684 assert len(args) == 1
685 export_path = os.path.abspath(os.path.join(args[0], self.relpath))
686 try:
687 os.makedirs(export_path)
688 except OSError:
689 pass
690 assert os.path.exists(export_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000691 self._Run(['export', '--force', '.', export_path], options)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000692
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000693 def pack(self, options, args, file_list):
694 """Generates a patch file which can be applied to the root of the
695 repository."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000696 if not os.path.isdir(self.checkout_path):
697 raise gclient_utils.Error('Directory %s is not present.' %
698 self.checkout_path)
699 gclient_utils.CheckCallAndFilter(
700 ['svn', 'diff', '-x', '--ignore-eol-style'] + args,
701 cwd=self.checkout_path,
702 print_stdout=False,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000703 filter_fn=DiffFilterer(self.relpath).Filter)
maruel@chromium.orgee4071d2009-12-22 22:25:37 +0000704
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000705 def update(self, options, args, file_list):
msb@chromium.orgd6504212010-01-13 17:34:31 +0000706 """Runs svn to update or transparently checkout the working copy.
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000707
708 All updated files will be appended to file_list.
709
710 Raises:
711 Error: if can't get URL for relative path.
712 """
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000713 # Only update if git or hg is not controlling the directory.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000714 git_path = os.path.join(self.checkout_path, '.git')
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000715 if os.path.exists(git_path):
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000716 print('________ found .git directory; skipping %s' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000717 return
718
morrita@chromium.org21dca0e2010-10-05 00:55:12 +0000719 hg_path = os.path.join(self.checkout_path, '.hg')
720 if os.path.exists(hg_path):
721 print('________ found .hg directory; skipping %s' % self.relpath)
722 return
723
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000724 if args:
725 raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
726
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000727 # revision is the revision to match. It is None if no revision is specified,
728 # i.e. the 'deps ain't pinned'.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000729 url, revision = gclient_utils.SplitUrlRevision(self.url)
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000730 # Keep the original unpinned url for reference in case the repo is switched.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000731 base_url = url
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000732 if options.revision:
733 # Override the revision number.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000734 revision = str(options.revision)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000735 if revision:
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000736 forced_revision = True
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000737 # Reconstruct the url.
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000738 url = '%s@%s' % (url, revision)
msb@chromium.org770ff9e2009-09-23 17:18:18 +0000739 rev_str = ' at %s' % revision
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000740 else:
741 forced_revision = False
742 rev_str = ''
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000743
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000744 if not os.path.exists(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000745 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000746 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000747 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000748 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000749 return
750
751 # Get the existing scm url and the revision number of the current checkout.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000752 try:
753 from_info = scm.SVN.CaptureInfo(os.path.join(self.checkout_path, '.'))
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000754 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000755 raise gclient_utils.Error(
756 ('Can\'t update/checkout %s if an unversioned directory is present. '
757 'Delete the directory and try again.') % self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000758
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000759 # Look for locked directories.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000760 dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.'))
761 if [True for d in dir_info
762 if d[0][2] == 'L' and d[1] == self.checkout_path]:
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000763 # The current directory is locked, clean it up.
maruel@chromium.org669600d2010-09-01 19:06:31 +0000764 self._Run(['cleanup'], options)
maruel@chromium.orge407c9a2010-08-09 19:11:37 +0000765
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000766 # Retrieve the current HEAD version because svn is slow at null updates.
767 if options.manually_grab_svn_rev and not revision:
maruel@chromium.org54019f32010-09-09 13:50:11 +0000768 from_info_live = scm.SVN.CaptureInfo(from_info['URL'])
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000769 revision = str(from_info_live['Revision'])
770 rev_str = ' at %s' % revision
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000771
msb@chromium.orgac915bb2009-11-13 17:03:01 +0000772 if from_info['URL'] != base_url:
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000773 # The repository url changed, need to switch.
maruel@chromium.org54019f32010-09-09 13:50:11 +0000774 try:
775 to_info = scm.SVN.CaptureInfo(url)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000776 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.orge2ce0c72009-09-23 16:14:18 +0000777 # The url is invalid or the server is not accessible, it's safer to bail
778 # out right now.
779 raise gclient_utils.Error('This url is unreachable: %s' % url)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000780 can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
781 and (from_info['UUID'] == to_info['UUID']))
782 if can_switch:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000783 print('\n_____ relocating %s to a new checkout' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000784 # We have different roots, so check if we can switch --relocate.
785 # Subversion only permits this if the repository UUIDs match.
786 # Perform the switch --relocate, then rewrite the from_url
787 # to reflect where we "are now." (This is the same way that
788 # Subversion itself handles the metadata when switch --relocate
789 # is used.) This makes the checks below for whether we
790 # can update to a revision or have to switch to a different
791 # branch work as expected.
792 # TODO(maruel): TEST ME !
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000793 command = ['switch', '--relocate',
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000794 from_info['Repository Root'],
795 to_info['Repository Root'],
796 self.relpath]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000797 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000798 from_info['URL'] = from_info['URL'].replace(
799 from_info['Repository Root'],
800 to_info['Repository Root'])
801 else:
maruel@chromium.org3294f522010-08-18 19:54:57 +0000802 if not options.force and not options.reset:
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000803 # Look for local modifications but ignore unversioned files.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000804 for status in scm.SVN.CaptureStatus(self.checkout_path):
maruel@chromium.org86f0f952010-08-10 17:17:19 +0000805 if status[0] != '?':
806 raise gclient_utils.Error(
807 ('Can\'t switch the checkout to %s; UUID don\'t match and '
808 'there is local changes in %s. Delete the directory and '
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000809 'try again.') % (url, self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000810 # Ok delete it.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000811 print('\n_____ switching %s to a new checkout' % self.relpath)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000812 gclient_utils.RemoveDirectory(self.checkout_path)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000813 # We need to checkout.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000814 command = ['checkout', url, self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000815 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000816 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000817 return
818
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000819 # If the provided url has a revision number that matches the revision
820 # number of the existing directory, then we don't need to bother updating.
maruel@chromium.org2e0c6852009-09-24 00:02:07 +0000821 if not options.force and str(from_info['Revision']) == revision:
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000822 if options.verbose or not forced_revision:
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000823 print('\n_____ %s%s' % (self.relpath, rev_str))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000824 return
825
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000826 command = ['update', self.checkout_path]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000827 command = self._AddAdditionalUpdateFlags(command, options, revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000828 self._RunAndGetFileList(command, options, file_list, self._root_dir)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000829
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000830 def updatesingle(self, options, args, file_list):
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000831 filename = args.pop()
tony@chromium.org57564662010-04-14 02:35:12 +0000832 if scm.SVN.AssertVersion("1.5")[0]:
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000833 if not os.path.exists(os.path.join(self.checkout_path, '.svn')):
tony@chromium.org57564662010-04-14 02:35:12 +0000834 # Create an empty checkout and then update the one file we want. Future
835 # operations will only apply to the one file we checked out.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000836 command = ["checkout", "--depth", "empty", self.url, self.checkout_path]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000837 self._Run(command, options, cwd=self._root_dir)
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000838 if os.path.exists(os.path.join(self.checkout_path, filename)):
839 os.remove(os.path.join(self.checkout_path, filename))
tony@chromium.org57564662010-04-14 02:35:12 +0000840 command = ["update", filename]
maruel@chromium.org669600d2010-09-01 19:06:31 +0000841 self._RunAndGetFileList(command, options, file_list)
tony@chromium.org57564662010-04-14 02:35:12 +0000842 # After the initial checkout, we can use update as if it were any other
843 # dep.
844 self.update(options, args, file_list)
845 else:
846 # If the installed version of SVN doesn't support --depth, fallback to
847 # just exporting the file. This has the downside that revision
848 # information is not stored next to the file, so we will have to
849 # re-export the file every time we sync.
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000850 if not os.path.exists(self.checkout_path):
851 os.makedirs(self.checkout_path)
tony@chromium.org57564662010-04-14 02:35:12 +0000852 command = ["export", os.path.join(self.url, filename),
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000853 os.path.join(self.checkout_path, filename)]
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000854 command = self._AddAdditionalUpdateFlags(command, options,
855 options.revision)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000856 self._Run(command, options, cwd=self._root_dir)
tony@chromium.org4b5b1772010-04-08 01:52:56 +0000857
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000858 def revert(self, options, args, file_list):
859 """Reverts local modifications. Subversion specific.
860
861 All reverted files will be appended to file_list, even if Subversion
862 doesn't know about them.
863 """
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000864 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000865 # svn revert won't work if the directory doesn't exist. It needs to
866 # checkout instead.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000867 print('\n_____ %s is missing, synching instead' % self.relpath)
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000868 # Don't reuse the args.
869 return self.update(options, [], file_list)
870
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000871 def printcb(file_status):
872 file_list.append(file_status[1])
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000873 if logging.getLogger().isEnabledFor(logging.INFO):
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000874 logging.info('%s%s' % (file_status[0], file_status[1]))
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000875 else:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000876 print(os.path.join(self.checkout_path, file_status[1]))
877 scm.SVN.Revert(self.checkout_path, callback=printcb)
maruel@chromium.orgaa3dd472009-09-21 19:02:48 +0000878
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000879 try:
880 # svn revert is so broken we don't even use it. Using
881 # "svn up --revision BASE" achieve the same effect.
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000882 # file_list will contain duplicates.
maruel@chromium.org669600d2010-09-01 19:06:31 +0000883 self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
884 file_list)
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000885 except OSError, e:
maruel@chromium.org07ab60e2011-02-08 21:54:00 +0000886 # Maybe the directory disapeared meanwhile. Do not throw an exception.
maruel@chromium.org810a50b2009-10-05 23:03:18 +0000887 logging.error('Failed to update:\n%s' % str(e))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000888
msb@chromium.org0f282062009-11-06 20:14:02 +0000889 def revinfo(self, options, args, file_list):
890 """Display revision"""
maruel@chromium.org54019f32010-09-09 13:50:11 +0000891 try:
892 return scm.SVN.CaptureRevision(self.checkout_path)
maruel@chromium.org31cb48a2011-04-04 18:01:36 +0000893 except (gclient_utils.Error, subprocess2.CalledProcessError):
maruel@chromium.org54019f32010-09-09 13:50:11 +0000894 return None
msb@chromium.org0f282062009-11-06 20:14:02 +0000895
msb@chromium.orgcb5442b2009-09-22 16:51:24 +0000896 def runhooks(self, options, args, file_list):
897 self.status(options, args, file_list)
898
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000899 def status(self, options, args, file_list):
900 """Display status information."""
maruel@chromium.org669600d2010-09-01 19:06:31 +0000901 command = ['status'] + args
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000902 if not os.path.isdir(self.checkout_path):
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000903 # svn status won't work if the directory doesn't exist.
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000904 print(('\n________ couldn\'t run \'%s\' in \'%s\':\n'
905 'The directory does not exist.') %
906 (' '.join(command), self.checkout_path))
maruel@chromium.org5f3eee32009-09-17 00:34:30 +0000907 # There's no file list to retrieve.
908 else:
maruel@chromium.org669600d2010-09-01 19:06:31 +0000909 self._RunAndGetFileList(command, options, file_list)
msb@chromium.orge6f78352010-01-13 17:05:33 +0000910
911 def FullUrlForRelativeUrl(self, url):
912 # Find the forth '/' and strip from there. A bit hackish.
913 return '/'.join(self.url.split('/')[:4]) + url
tony@chromium.org99828122010-06-04 01:41:02 +0000914
maruel@chromium.org669600d2010-09-01 19:06:31 +0000915 def _Run(self, args, options, **kwargs):
916 """Runs a commands that goes to stdout."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000917 kwargs.setdefault('cwd', self.checkout_path)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000918 gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000919 always=options.verbose, **kwargs)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000920
921 def _RunAndGetFileList(self, args, options, file_list, cwd=None):
922 """Runs a commands that goes to stdout and grabs the file listed."""
maruel@chromium.org8469bf92010-09-03 19:03:15 +0000923 cwd = cwd or self.checkout_path
maruel@chromium.orgce117f62011-01-17 20:04:25 +0000924 scm.SVN.RunAndGetFileList(
925 options.verbose,
926 args + ['--ignore-externals'],
927 cwd=cwd,
maruel@chromium.org77e4eca2010-09-21 13:23:07 +0000928 file_list=file_list)
maruel@chromium.org669600d2010-09-01 19:06:31 +0000929
maruel@chromium.org6e29d572010-06-04 17:32:20 +0000930 @staticmethod
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000931 def _AddAdditionalUpdateFlags(command, options, revision):
tony@chromium.org99828122010-06-04 01:41:02 +0000932 """Add additional flags to command depending on what options are set.
933 command should be a list of strings that represents an svn command.
934
935 This method returns a new list to be used as a command."""
936 new_command = command[:]
937 if revision:
938 new_command.extend(['--revision', str(revision).strip()])
939 # --force was added to 'svn update' in svn 1.5.
maruel@chromium.org8e0e9262010-08-17 19:20:27 +0000940 if ((options.force or options.manually_grab_svn_rev) and
941 scm.SVN.AssertVersion("1.5")[0]):
tony@chromium.org99828122010-06-04 01:41:02 +0000942 new_command.append('--force')
943 return new_command