scherkus@chromium.org | 95f0f4e | 2010-05-22 00:55:26 +0000 | [diff] [blame] | 1 | # Copyright (c) 2010 The Chromium Authors. All rights reserved. |
maruel@chromium.org | 5aeb7dd | 2009-11-17 18:09:01 +0000 | [diff] [blame] | 2 | # Use of this source code is governed by a BSD-style license that can be |
| 3 | # found in the LICENSE file. |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 4 | |
maruel@chromium.org | d5800f1 | 2009-11-12 20:03:43 +0000 | [diff] [blame] | 5 | """Gclient-specific SCM-specific operations.""" |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 6 | |
maruel@chromium.org | 754960e | 2009-09-21 12:31:05 +0000 | [diff] [blame] | 7 | import logging |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 8 | import os |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 9 | import posixpath |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 10 | import re |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 11 | import sys |
maruel@chromium.org | fd87617 | 2010-04-30 14:01:05 +0000 | [diff] [blame] | 12 | import time |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 13 | |
| 14 | import gclient_utils |
maruel@chromium.org | 31cb48a | 2011-04-04 18:01:36 +0000 | [diff] [blame] | 15 | import scm |
| 16 | import subprocess2 |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 17 | |
| 18 | |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 19 | class 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.org | d650421 | 2010-01-13 17:34:31 +0000 | [diff] [blame] | 22 | working copy lines of the svn/git diff output.""" |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 23 | index_string = "Index: " |
| 24 | original_prefix = "--- " |
| 25 | working_prefix = "+++ " |
| 26 | |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 27 | def __init__(self, relpath): |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 28 | # 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.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 34 | def SetCurrentFile(self, current_file): |
| 35 | self._current_file = current_file |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 36 | # Note that we always use '/' as the path separator to be |
| 37 | # consistent with svn's cygwin-style output on Windows |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 38 | self._replacement_file = posixpath.join(self._relpath, current_file) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 39 | |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 40 | def _Replace(self, line): |
| 41 | return line.replace(self._current_file, self._replacement_file) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 42 | |
| 43 | def Filter(self, line): |
| 44 | if (line.startswith(self.index_string)): |
| 45 | self.SetCurrentFile(line[len(self.index_string):]) |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 46 | line = self._Replace(line) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 47 | else: |
| 48 | if (line.startswith(self.original_prefix) or |
| 49 | line.startswith(self.working_prefix)): |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 50 | line = self._Replace(line) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 51 | print(line) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 52 | |
| 53 | |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 54 | def 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.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 62 | ### SCM abstraction layer |
| 63 | |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 64 | # Factory Method for SCM wrapper creation |
| 65 | |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 66 | def 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.org | b74dca2 | 2010-06-11 20:10:40 +0000 | [diff] [blame] | 72 | elif (url.startswith('http://') or url.startswith('https://') or |
maruel@chromium.org | 54a07a2 | 2010-06-14 19:07:39 +0000 | [diff] [blame] | 73 | url.startswith('svn://') or url.startswith('svn+ssh://')): |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 74 | return 'svn' |
| 75 | return None |
| 76 | |
| 77 | |
| 78 | def CreateSCM(url, root_dir=None, relpath=None): |
| 79 | SCM_MAP = { |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 80 | 'svn' : SVNWrapper, |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 81 | 'git' : GitWrapper, |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 82 | } |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 83 | |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 84 | 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.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 88 | |
| 89 | |
| 90 | # SCMWrapper base class |
| 91 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 92 | class SCMWrapper(object): |
| 93 | """Add necessary glue between all the supported SCM. |
| 94 | |
msb@chromium.org | d650421 | 2010-01-13 17:34:31 +0000 | [diff] [blame] | 95 | This is the abstraction layer to bind to different SCM. |
| 96 | """ |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 97 | def __init__(self, url=None, root_dir=None, relpath=None): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 98 | self.url = url |
maruel@chromium.org | 5e73b0c | 2009-09-18 19:47:48 +0000 | [diff] [blame] | 99 | 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.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 105 | if self.relpath and self._root_dir: |
| 106 | self.checkout_path = os.path.join(self._root_dir, self.relpath) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 107 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 108 | def RunCommand(self, command, options, args, file_list=None): |
| 109 | # file_list will have all files that are modified appended to it. |
maruel@chromium.org | de754ac | 2009-09-17 18:04:50 +0000 | [diff] [blame] | 110 | if file_list is None: |
| 111 | file_list = [] |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 112 | |
phajdan.jr@chromium.org | 6e043f7 | 2011-05-02 07:24:32 +0000 | [diff] [blame] | 113 | commands = ['cleanup', 'update', 'updatesingle', 'revert', |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 114 | 'revinfo', 'status', 'diff', 'pack', 'runhooks'] |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 115 | |
| 116 | if not command in commands: |
| 117 | raise gclient_utils.Error('Unknown command %s' % command) |
| 118 | |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 119 | if not command in dir(self): |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 120 | raise gclient_utils.Error('Command %s not implemented in %s wrapper' % ( |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 121 | command, self.__class__.__name__)) |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 122 | |
| 123 | return getattr(self, command)(options, args, file_list) |
| 124 | |
| 125 | |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 126 | class GitWrapper(SCMWrapper): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 127 | """Wrapper for Git""" |
| 128 | |
floitsch@google.com | eaab784 | 2011-04-28 09:07:58 +0000 | [diff] [blame] | 129 | def GetRevisionDate(self, revision): |
| 130 | """Returns the given revision's date in ISO-8601 format (which contains the |
| 131 | time zone).""" |
| 132 | # TODO(floitsch): get the time-stamp of the given revision and not just the |
| 133 | # time-stamp of the currently checked out revision. |
| 134 | return self._Capture(['log', '-n', '1', '--format=%ai']) |
| 135 | |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 136 | @staticmethod |
| 137 | def cleanup(options, args, file_list): |
msb@chromium.org | d8a6378 | 2010-01-25 17:47:05 +0000 | [diff] [blame] | 138 | """'Cleanup' the repo. |
| 139 | |
| 140 | There's no real git equivalent for the svn cleanup command, do a no-op. |
| 141 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 142 | |
| 143 | def diff(self, options, args, file_list): |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 144 | merge_base = self._Capture(['merge-base', 'HEAD', 'origin']) |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 145 | self._Run(['diff', merge_base], options) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 146 | |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 147 | def pack(self, options, args, file_list): |
| 148 | """Generates a patch file which can be applied to the root of the |
msb@chromium.org | d650421 | 2010-01-13 17:34:31 +0000 | [diff] [blame] | 149 | repository. |
| 150 | |
| 151 | The patch file is generated from a diff of the merge base of HEAD and |
| 152 | its upstream branch. |
| 153 | """ |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 154 | merge_base = self._Capture(['merge-base', 'HEAD', 'origin']) |
maruel@chromium.org | 17d0179 | 2010-09-01 18:07:10 +0000 | [diff] [blame] | 155 | gclient_utils.CheckCallAndFilter( |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 156 | ['git', 'diff', merge_base], |
| 157 | cwd=self.checkout_path, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 158 | filter_fn=DiffFilterer(self.relpath).Filter) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 159 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 160 | def update(self, options, args, file_list): |
| 161 | """Runs git to update or transparently checkout the working copy. |
| 162 | |
| 163 | All updated files will be appended to file_list. |
| 164 | |
| 165 | Raises: |
| 166 | Error: if can't get URL for relative path. |
| 167 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 168 | if args: |
| 169 | raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args)) |
| 170 | |
nasser@codeaurora.org | ece406f | 2010-02-23 17:29:15 +0000 | [diff] [blame] | 171 | self._CheckMinVersion("1.6.6") |
msb@chromium.org | 923a037 | 2009-12-11 20:42:43 +0000 | [diff] [blame] | 172 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 173 | default_rev = "refs/heads/master" |
nasser@codeaurora.org | 7080e94 | 2010-03-15 15:06:16 +0000 | [diff] [blame] | 174 | url, deps_revision = gclient_utils.SplitUrlRevision(self.url) |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 175 | rev_str = "" |
nasser@codeaurora.org | 7080e94 | 2010-03-15 15:06:16 +0000 | [diff] [blame] | 176 | revision = deps_revision |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 177 | if options.revision: |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 178 | # Override the revision number. |
| 179 | revision = str(options.revision) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 180 | if not revision: |
| 181 | revision = default_rev |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 182 | |
floitsch@google.com | eaab784 | 2011-04-28 09:07:58 +0000 | [diff] [blame] | 183 | if gclient_utils.IsDateRevision(revision): |
| 184 | # Date-revisions only work on git-repositories if the reflog hasn't |
| 185 | # expired yet. Use rev-list to get the corresponding revision. |
| 186 | # git rev-list -n 1 --before='time-stamp' branchname |
| 187 | if options.transitive: |
| 188 | print('Warning: --transitive only works for SVN repositories.') |
| 189 | revision = default_rev |
| 190 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 191 | rev_str = ' at %s' % revision |
| 192 | files = [] |
| 193 | |
| 194 | printed_path = False |
| 195 | verbose = [] |
msb@chromium.org | b1a22bf | 2009-11-07 02:33:50 +0000 | [diff] [blame] | 196 | if options.verbose: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 197 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 198 | verbose = ['--verbose'] |
| 199 | printed_path = True |
| 200 | |
| 201 | if revision.startswith('refs/heads/'): |
| 202 | rev_type = "branch" |
| 203 | elif revision.startswith('origin/'): |
| 204 | # For compatability with old naming, translate 'origin' to 'refs/heads' |
| 205 | revision = revision.replace('origin/', 'refs/heads/') |
| 206 | rev_type = "branch" |
| 207 | else: |
| 208 | # hash is also a tag, only make a distinction at checkout |
| 209 | rev_type = "hash" |
| 210 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 211 | if not os.path.exists(self.checkout_path): |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 212 | self._Clone(revision, url, options) |
thomasvl@chromium.org | 858d645 | 2011-03-24 17:59:20 +0000 | [diff] [blame] | 213 | files = self._Capture(['ls-files']).splitlines() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 214 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 215 | if not verbose: |
| 216 | # Make the output a little prettier. It's nice to have some whitespace |
| 217 | # between projects when cloning. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 218 | print('') |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 219 | return |
| 220 | |
msb@chromium.org | e4af1ab | 2010-01-13 21:26:09 +0000 | [diff] [blame] | 221 | if not os.path.exists(os.path.join(self.checkout_path, '.git')): |
| 222 | raise gclient_utils.Error('\n____ %s%s\n' |
| 223 | '\tPath is not a git repo. No .git dir.\n' |
| 224 | '\tTo resolve:\n' |
| 225 | '\t\trm -rf %s\n' |
| 226 | '\tAnd run gclient sync again\n' |
| 227 | % (self.relpath, rev_str, self.relpath)) |
| 228 | |
thomasvl@chromium.org | d6f89d8 | 2011-03-25 20:41:58 +0000 | [diff] [blame] | 229 | # See if the url has changed (the unittests use git://foo for the url, let |
| 230 | # that through). |
thomasvl@chromium.org | 668667c | 2011-03-24 18:27:24 +0000 | [diff] [blame] | 231 | current_url = self._Capture(['config', 'remote.origin.url']) |
thomasvl@chromium.org | d6f89d8 | 2011-03-25 20:41:58 +0000 | [diff] [blame] | 232 | # TODO(maruel): Delete url != 'git://foo' since it's just to make the |
| 233 | # unit test pass. (and update the comment above) |
| 234 | if current_url != url and url != 'git://foo': |
thomasvl@chromium.org | 668667c | 2011-03-24 18:27:24 +0000 | [diff] [blame] | 235 | print('_____ switching %s to a new upstream' % self.relpath) |
| 236 | # Make sure it's clean |
| 237 | self._CheckClean(rev_str) |
| 238 | # Switch over to the new upstream |
| 239 | self._Run(['remote', 'set-url', 'origin', url], options) |
| 240 | quiet = [] |
| 241 | if not options.verbose: |
| 242 | quiet = ['--quiet'] |
| 243 | self._Run(['fetch', 'origin', '--prune'] + quiet, options) |
| 244 | self._Run(['reset', '--hard', 'origin/master'] + quiet, options) |
| 245 | files = self._Capture(['ls-files']).splitlines() |
| 246 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
| 247 | return |
| 248 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 249 | cur_branch = self._GetCurrentBranch() |
| 250 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 251 | # Cases: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 252 | # 0) HEAD is detached. Probably from our initial clone. |
| 253 | # - make sure HEAD is contained by a named ref, then update. |
| 254 | # Cases 1-4. HEAD is a branch. |
| 255 | # 1) current branch is not tracking a remote branch (could be git-svn) |
| 256 | # - try to rebase onto the new hash or branch |
| 257 | # 2) current branch is tracking a remote branch with local committed |
| 258 | # changes, but the DEPS file switched to point to a hash |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 259 | # - rebase those changes on top of the hash |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 260 | # 3) current branch is tracking a remote branch w/or w/out changes, |
| 261 | # no switch |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 262 | # - see if we can FF, if not, prompt the user for rebase, merge, or stop |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 263 | # 4) current branch is tracking a remote branch, switches to a different |
| 264 | # remote branch |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 265 | # - exit |
| 266 | |
maruel@chromium.org | 81e012c | 2010-04-29 16:07:24 +0000 | [diff] [blame] | 267 | # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for |
| 268 | # a tracking branch |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 269 | # or 'master' if not a tracking branch (it's based on a specific rev/hash) |
| 270 | # or it returns None if it couldn't find an upstream |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 271 | if cur_branch is None: |
| 272 | upstream_branch = None |
| 273 | current_type = "detached" |
| 274 | logging.debug("Detached HEAD") |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 275 | else: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 276 | upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path) |
| 277 | if not upstream_branch or not upstream_branch.startswith('refs/remotes'): |
| 278 | current_type = "hash" |
| 279 | logging.debug("Current branch is not tracking an upstream (remote)" |
| 280 | " branch.") |
| 281 | elif upstream_branch.startswith('refs/remotes'): |
| 282 | current_type = "branch" |
| 283 | else: |
| 284 | raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 285 | |
maruel@chromium.org | 0b1c246 | 2010-03-02 00:48:14 +0000 | [diff] [blame] | 286 | # Update the remotes first so we have all the refs. |
cbentzel@chromium.org | 2aee229 | 2010-09-03 14:15:25 +0000 | [diff] [blame] | 287 | backoff_time = 5 |
maruel@chromium.org | fd87617 | 2010-04-30 14:01:05 +0000 | [diff] [blame] | 288 | for _ in range(10): |
maruel@chromium.org | 0b1c246 | 2010-03-02 00:48:14 +0000 | [diff] [blame] | 289 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 290 | remote_output = scm.GIT.Capture( |
maruel@chromium.org | 0b1c246 | 2010-03-02 00:48:14 +0000 | [diff] [blame] | 291 | ['remote'] + verbose + ['update'], |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 292 | cwd=self.checkout_path) |
maruel@chromium.org | 0b1c246 | 2010-03-02 00:48:14 +0000 | [diff] [blame] | 293 | break |
maruel@chromium.org | 982984e | 2010-05-11 20:57:49 +0000 | [diff] [blame] | 294 | except gclient_utils.CheckCallError, e: |
maruel@chromium.org | 0b1c246 | 2010-03-02 00:48:14 +0000 | [diff] [blame] | 295 | # Hackish but at that point, git is known to work so just checking for |
| 296 | # 502 in stderr should be fine. |
| 297 | if '502' in e.stderr: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 298 | print(str(e)) |
| 299 | print('Sleeping %.1f seconds and retrying...' % backoff_time) |
cbentzel@chromium.org | 2aee229 | 2010-09-03 14:15:25 +0000 | [diff] [blame] | 300 | time.sleep(backoff_time) |
| 301 | backoff_time *= 1.3 |
maruel@chromium.org | 0b1c246 | 2010-03-02 00:48:14 +0000 | [diff] [blame] | 302 | continue |
maruel@chromium.org | fd87617 | 2010-04-30 14:01:05 +0000 | [diff] [blame] | 303 | raise |
maruel@chromium.org | 0b1c246 | 2010-03-02 00:48:14 +0000 | [diff] [blame] | 304 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 305 | if verbose: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 306 | print(remote_output.strip()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 307 | |
| 308 | # This is a big hammer, debatable if it should even be here... |
davemoore@chromium.org | 793796d | 2010-02-19 17:27:41 +0000 | [diff] [blame] | 309 | if options.force or options.reset: |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 310 | self._Run(['reset', '--hard', 'HEAD'], options) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 311 | |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 312 | if current_type == 'detached': |
| 313 | # case 0 |
| 314 | self._CheckClean(rev_str) |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 315 | self._CheckDetachedHead(rev_str, options) |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 316 | self._Capture(['checkout', '--quiet', '%s^0' % revision]) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 317 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 318 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 319 | elif current_type == 'hash': |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 320 | # case 1 |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 321 | if scm.GIT.IsGitSvn(self.checkout_path) and upstream_branch is not None: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 322 | # Our git-svn branch (upstream_branch) is our upstream |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 323 | self._AttemptRebase(upstream_branch, files, options, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 324 | newbase=revision, printed_path=printed_path) |
| 325 | printed_path = True |
| 326 | else: |
| 327 | # Can't find a merge-base since we don't know our upstream. That makes |
| 328 | # this command VERY likely to produce a rebase failure. For now we |
| 329 | # assume origin is our upstream since that's what the old behavior was. |
nasser@codeaurora.org | 3b29de1 | 2010-03-08 18:34:28 +0000 | [diff] [blame] | 330 | upstream_branch = 'origin' |
nasser@codeaurora.org | 7080e94 | 2010-03-15 15:06:16 +0000 | [diff] [blame] | 331 | if options.revision or deps_revision: |
nasser@codeaurora.org | 3b29de1 | 2010-03-08 18:34:28 +0000 | [diff] [blame] | 332 | upstream_branch = revision |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 333 | self._AttemptRebase(upstream_branch, files, options, |
| 334 | printed_path=printed_path) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 335 | printed_path = True |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 336 | elif rev_type == 'hash': |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 337 | # case 2 |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 338 | self._AttemptRebase(upstream_branch, files, options, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 339 | newbase=revision, printed_path=printed_path) |
| 340 | printed_path = True |
| 341 | elif revision.replace('heads', 'remotes/origin') != upstream_branch: |
| 342 | # case 4 |
| 343 | new_base = revision.replace('heads', 'remotes/origin') |
| 344 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 345 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 346 | switch_error = ("Switching upstream branch from %s to %s\n" |
| 347 | % (upstream_branch, new_base) + |
| 348 | "Please merge or rebase manually:\n" + |
| 349 | "cd %s; git rebase %s\n" % (self.checkout_path, new_base) + |
| 350 | "OR git checkout -b <some new branch> %s" % new_base) |
| 351 | raise gclient_utils.Error(switch_error) |
| 352 | else: |
| 353 | # case 3 - the default case |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 354 | files = self._Capture(['diff', upstream_branch, '--name-only']).split() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 355 | if verbose: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 356 | print('Trying fast-forward merge to branch : %s' % upstream_branch) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 357 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 358 | merge_output = scm.GIT.Capture(['merge', '--ff-only', upstream_branch], |
| 359 | cwd=self.checkout_path) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 360 | except gclient_utils.CheckCallError, e: |
| 361 | if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr): |
| 362 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 363 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 364 | printed_path = True |
| 365 | while True: |
| 366 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 367 | # TODO(maruel): That can't work with --jobs. |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 368 | action = ask_for_data( |
| 369 | 'Cannot fast-forward merge, attempt to rebase? ' |
| 370 | '(y)es / (q)uit / (s)kip : ') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 371 | except ValueError: |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 372 | raise gclient_utils.Error('Invalid Character') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 373 | if re.match(r'yes|y', action, re.I): |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 374 | self._AttemptRebase(upstream_branch, files, options, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 375 | printed_path=printed_path) |
| 376 | printed_path = True |
| 377 | break |
| 378 | elif re.match(r'quit|q', action, re.I): |
| 379 | raise gclient_utils.Error("Can't fast-forward, please merge or " |
| 380 | "rebase manually.\n" |
| 381 | "cd %s && git " % self.checkout_path |
| 382 | + "rebase %s" % upstream_branch) |
| 383 | elif re.match(r'skip|s', action, re.I): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 384 | print('Skipping %s' % self.relpath) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 385 | return |
| 386 | else: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 387 | print('Input not recognized') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 388 | elif re.match("error: Your local changes to '.*' would be " |
| 389 | "overwritten by merge. Aborting.\nPlease, commit your " |
| 390 | "changes or stash them before you can merge.\n", |
| 391 | e.stderr): |
| 392 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 393 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 394 | printed_path = True |
| 395 | raise gclient_utils.Error(e.stderr) |
| 396 | else: |
| 397 | # Some other problem happened with the merge |
| 398 | logging.error("Error during fast-forward merge in %s!" % self.relpath) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 399 | print(e.stderr) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 400 | raise |
| 401 | else: |
| 402 | # Fast-forward merge was successful |
| 403 | if not re.match('Already up-to-date.', merge_output) or verbose: |
| 404 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 405 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 406 | printed_path = True |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 407 | print(merge_output.strip()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 408 | if not verbose: |
| 409 | # Make the output a little prettier. It's nice to have some |
| 410 | # whitespace between projects when syncing. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 411 | print('') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 412 | |
| 413 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 414 | |
| 415 | # If the rebase generated a conflict, abort and ask user to fix |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 416 | if self._IsRebasing(): |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 417 | raise gclient_utils.Error('\n____ %s%s\n' |
| 418 | '\nConflict while rebasing this branch.\n' |
| 419 | 'Fix the conflict and run gclient again.\n' |
| 420 | 'See man git-rebase for details.\n' |
| 421 | % (self.relpath, rev_str)) |
| 422 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 423 | if verbose: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 424 | print('Checked out revision %s' % self.revinfo(options, (), None)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 425 | |
| 426 | def revert(self, options, args, file_list): |
| 427 | """Reverts local modifications. |
| 428 | |
| 429 | All reverted files will be appended to file_list. |
| 430 | """ |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 431 | if not os.path.isdir(self.checkout_path): |
msb@chromium.org | 260c653 | 2009-10-28 03:22:35 +0000 | [diff] [blame] | 432 | # revert won't work if the directory doesn't exist. It needs to |
| 433 | # checkout instead. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 434 | print('\n_____ %s is missing, synching instead' % self.relpath) |
msb@chromium.org | 260c653 | 2009-10-28 03:22:35 +0000 | [diff] [blame] | 435 | # Don't reuse the args. |
| 436 | return self.update(options, [], file_list) |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 437 | |
| 438 | default_rev = "refs/heads/master" |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 439 | _, deps_revision = gclient_utils.SplitUrlRevision(self.url) |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 440 | if not deps_revision: |
| 441 | deps_revision = default_rev |
| 442 | if deps_revision.startswith('refs/heads/'): |
| 443 | deps_revision = deps_revision.replace('refs/heads/', 'origin/') |
| 444 | |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 445 | files = self._Capture(['diff', deps_revision, '--name-only']).split() |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 446 | self._Run(['reset', '--hard', deps_revision], options) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 447 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
| 448 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 449 | def revinfo(self, options, args, file_list): |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 450 | """Returns revision""" |
| 451 | return self._Capture(['rev-parse', 'HEAD']) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 452 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 453 | def runhooks(self, options, args, file_list): |
| 454 | self.status(options, args, file_list) |
| 455 | |
| 456 | def status(self, options, args, file_list): |
| 457 | """Display status information.""" |
| 458 | if not os.path.isdir(self.checkout_path): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 459 | print(('\n________ couldn\'t run status in %s:\n' |
| 460 | 'The directory does not exist.') % self.checkout_path) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 461 | else: |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 462 | merge_base = self._Capture(['merge-base', 'HEAD', 'origin']) |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 463 | self._Run(['diff', '--name-status', merge_base], options) |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 464 | files = self._Capture(['diff', '--name-only', merge_base]).split() |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 465 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
| 466 | |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 467 | def FullUrlForRelativeUrl(self, url): |
| 468 | # Strip from last '/' |
| 469 | # Equivalent to unix basename |
| 470 | base_url = self.url |
| 471 | return base_url[:base_url.rfind('/')] + url |
| 472 | |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 473 | def _Clone(self, revision, url, options): |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 474 | """Clone a git repository from the given URL. |
| 475 | |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 476 | Once we've cloned the repo, we checkout a working branch if the specified |
| 477 | revision is a branch head. If it is a tag or a specific commit, then we |
| 478 | leave HEAD detached as it makes future updates simpler -- in this case the |
| 479 | user should first create a new branch or switch to an existing branch before |
| 480 | making changes in the repo.""" |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 481 | if not options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 482 | # git clone doesn't seem to insert a newline properly before printing |
| 483 | # to stdout |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 484 | print('') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 485 | |
| 486 | clone_cmd = ['clone'] |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 487 | if revision.startswith('refs/heads/'): |
| 488 | clone_cmd.extend(['-b', revision.replace('refs/heads/', '')]) |
| 489 | detach_head = False |
| 490 | else: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 491 | detach_head = True |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 492 | if options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 493 | clone_cmd.append('--verbose') |
| 494 | clone_cmd.extend([url, self.checkout_path]) |
| 495 | |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 496 | for _ in range(3): |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 497 | try: |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 498 | self._Run(clone_cmd, options, cwd=self._root_dir) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 499 | break |
maruel@chromium.org | 31cb48a | 2011-04-04 18:01:36 +0000 | [diff] [blame] | 500 | except (gclient_utils.Error, subprocess2.CalledProcessError), e: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 501 | # TODO(maruel): Hackish, should be fixed by moving _Run() to |
| 502 | # CheckCall(). |
| 503 | # Too bad we don't have access to the actual output. |
| 504 | # We should check for "transfer closed with NNN bytes remaining to |
| 505 | # read". In the meantime, just make sure .git exists. |
| 506 | if (e.args[0] == 'git command clone returned 128' and |
| 507 | os.path.exists(os.path.join(self.checkout_path, '.git'))): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 508 | print(str(e)) |
| 509 | print('Retrying...') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 510 | continue |
| 511 | raise e |
| 512 | |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 513 | if detach_head: |
| 514 | # Squelch git's very verbose detached HEAD warning and use our own |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 515 | self._Capture(['checkout', '--quiet', '%s^0' % revision]) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 516 | print( |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 517 | ('Checked out %s to a detached HEAD. Before making any commits\n' |
| 518 | 'in this repo, you should use \'git checkout <branch>\' to switch to\n' |
| 519 | 'an existing branch or use \'git checkout origin -b <branch>\' to\n' |
| 520 | 'create a new branch for your work.') % revision) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 521 | |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 522 | def _AttemptRebase(self, upstream, files, options, newbase=None, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 523 | branch=None, printed_path=False): |
| 524 | """Attempt to rebase onto either upstream or, if specified, newbase.""" |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 525 | files.extend(self._Capture(['diff', upstream, '--name-only']).split()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 526 | revision = upstream |
| 527 | if newbase: |
| 528 | revision = newbase |
| 529 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 530 | print('\n_____ %s : Attempting rebase onto %s...' % ( |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 531 | self.relpath, revision)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 532 | printed_path = True |
| 533 | else: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 534 | print('Attempting rebase onto %s...' % revision) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 535 | |
| 536 | # Build the rebase command here using the args |
| 537 | # git rebase [options] [--onto <newbase>] <upstream> [<branch>] |
| 538 | rebase_cmd = ['rebase'] |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 539 | if options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 540 | rebase_cmd.append('--verbose') |
| 541 | if newbase: |
| 542 | rebase_cmd.extend(['--onto', newbase]) |
| 543 | rebase_cmd.append(upstream) |
| 544 | if branch: |
| 545 | rebase_cmd.append(branch) |
| 546 | |
| 547 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 548 | rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 549 | except gclient_utils.CheckCallError, e: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 550 | if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or |
| 551 | re.match(r'cannot rebase: your index contains uncommitted changes', |
| 552 | e.stderr)): |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 553 | while True: |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 554 | rebase_action = ask_for_data( |
| 555 | 'Cannot rebase because of unstaged changes.\n' |
| 556 | '\'git reset --hard HEAD\' ?\n' |
| 557 | 'WARNING: destroys any uncommitted work in your current branch!' |
| 558 | ' (y)es / (q)uit / (s)how : ') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 559 | if re.match(r'yes|y', rebase_action, re.I): |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 560 | self._Run(['reset', '--hard', 'HEAD'], options) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 561 | # Should this be recursive? |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 562 | rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 563 | break |
| 564 | elif re.match(r'quit|q', rebase_action, re.I): |
| 565 | raise gclient_utils.Error("Please merge or rebase manually\n" |
| 566 | "cd %s && git " % self.checkout_path |
| 567 | + "%s" % ' '.join(rebase_cmd)) |
| 568 | elif re.match(r'show|s', rebase_action, re.I): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 569 | print('\n%s' % e.stderr.strip()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 570 | continue |
| 571 | else: |
| 572 | gclient_utils.Error("Input not recognized") |
| 573 | continue |
| 574 | elif re.search(r'^CONFLICT', e.stdout, re.M): |
| 575 | raise gclient_utils.Error("Conflict while rebasing this branch.\n" |
| 576 | "Fix the conflict and run gclient again.\n" |
| 577 | "See 'man git-rebase' for details.\n") |
| 578 | else: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 579 | print(e.stdout.strip()) |
| 580 | print('Rebase produced error output:\n%s' % e.stderr.strip()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 581 | raise gclient_utils.Error("Unrecognized error, please merge or rebase " |
| 582 | "manually.\ncd %s && git " % |
| 583 | self.checkout_path |
| 584 | + "%s" % ' '.join(rebase_cmd)) |
| 585 | |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 586 | print(rebase_output.strip()) |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 587 | if not options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 588 | # Make the output a little prettier. It's nice to have some |
| 589 | # whitespace between projects when syncing. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 590 | print('') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 591 | |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 592 | @staticmethod |
| 593 | def _CheckMinVersion(min_version): |
maruel@chromium.org | d0f854a | 2010-03-11 19:35:53 +0000 | [diff] [blame] | 594 | (ok, current_version) = scm.GIT.AssertVersion(min_version) |
| 595 | if not ok: |
| 596 | raise gclient_utils.Error('git version %s < minimum required %s' % |
| 597 | (current_version, min_version)) |
msb@chromium.org | 923a037 | 2009-12-11 20:42:43 +0000 | [diff] [blame] | 598 | |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 599 | def _IsRebasing(self): |
| 600 | # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't |
| 601 | # have a plumbing command to determine whether a rebase is in progress, so |
| 602 | # for now emualate (more-or-less) git-rebase.sh / git-completion.bash |
| 603 | g = os.path.join(self.checkout_path, '.git') |
| 604 | return ( |
| 605 | os.path.isdir(os.path.join(g, "rebase-merge")) or |
| 606 | os.path.isdir(os.path.join(g, "rebase-apply"))) |
| 607 | |
| 608 | def _CheckClean(self, rev_str): |
| 609 | # Make sure the tree is clean; see git-rebase.sh for reference |
| 610 | try: |
| 611 | scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'], |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 612 | cwd=self.checkout_path) |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 613 | except gclient_utils.CheckCallError: |
| 614 | raise gclient_utils.Error('\n____ %s%s\n' |
| 615 | '\tYou have unstaged changes.\n' |
| 616 | '\tPlease commit, stash, or reset.\n' |
| 617 | % (self.relpath, rev_str)) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 618 | try: |
| 619 | scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r', |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 620 | '--ignore-submodules', 'HEAD', '--'], |
| 621 | cwd=self.checkout_path) |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 622 | except gclient_utils.CheckCallError: |
| 623 | raise gclient_utils.Error('\n____ %s%s\n' |
| 624 | '\tYour index contains uncommitted changes\n' |
| 625 | '\tPlease commit, stash, or reset.\n' |
| 626 | % (self.relpath, rev_str)) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 627 | |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 628 | def _CheckDetachedHead(self, rev_str, options): |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 629 | # HEAD is detached. Make sure it is safe to move away from (i.e., it is |
| 630 | # reference by a commit). If not, error out -- most likely a rebase is |
| 631 | # in progress, try to detect so we can give a better error. |
| 632 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 633 | scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'], |
| 634 | cwd=self.checkout_path) |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 635 | except gclient_utils.CheckCallError: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 636 | # Commit is not contained by any rev. See if the user is rebasing: |
| 637 | if self._IsRebasing(): |
| 638 | # Punt to the user |
| 639 | raise gclient_utils.Error('\n____ %s%s\n' |
| 640 | '\tAlready in a conflict, i.e. (no branch).\n' |
| 641 | '\tFix the conflict and run gclient again.\n' |
| 642 | '\tOr to abort run:\n\t\tgit-rebase --abort\n' |
| 643 | '\tSee man git-rebase for details.\n' |
| 644 | % (self.relpath, rev_str)) |
| 645 | # Let's just save off the commit so we can proceed. |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 646 | name = ('saved-by-gclient-' + |
| 647 | self._Capture(['rev-parse', '--short', 'HEAD'])) |
| 648 | self._Capture(['branch', name]) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 649 | print('\n_____ found an unreferenced commit and saved it as \'%s\'' % |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 650 | name) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 651 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 652 | def _GetCurrentBranch(self): |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 653 | # Returns name of current branch or None for detached HEAD |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 654 | branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD']) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 655 | if branch == 'HEAD': |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 656 | return None |
| 657 | return branch |
| 658 | |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 659 | def _Capture(self, args): |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 660 | return gclient_utils.CheckCall( |
| 661 | ['git'] + args, cwd=self.checkout_path, print_error=False)[0].strip() |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 662 | |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 663 | def _Run(self, args, options, **kwargs): |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 664 | kwargs.setdefault('cwd', self.checkout_path) |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 665 | gclient_utils.CheckCallAndFilterAndHeader(['git'] + args, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 666 | always=options.verbose, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 667 | |
| 668 | |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 669 | class SVNWrapper(SCMWrapper): |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 670 | """ Wrapper for SVN """ |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 671 | |
floitsch@google.com | eaab784 | 2011-04-28 09:07:58 +0000 | [diff] [blame] | 672 | def GetRevisionDate(self, revision): |
| 673 | """Returns the given revision's date in ISO-8601 format (which contains the |
| 674 | time zone).""" |
| 675 | date = scm.SVN.Capture(['propget', '--revprop', 'svn:date', '-r', revision, |
| 676 | os.path.join(self.checkout_path, '.')]) |
| 677 | return date.strip() |
| 678 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 679 | def cleanup(self, options, args, file_list): |
| 680 | """Cleanup working copy.""" |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 681 | self._Run(['cleanup'] + args, options) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 682 | |
| 683 | def diff(self, options, args, file_list): |
| 684 | # NOTE: This function does not currently modify file_list. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 685 | if not os.path.isdir(self.checkout_path): |
| 686 | raise gclient_utils.Error('Directory %s is not present.' % |
| 687 | self.checkout_path) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 688 | self._Run(['diff'] + args, options) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 689 | |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 690 | def pack(self, options, args, file_list): |
| 691 | """Generates a patch file which can be applied to the root of the |
| 692 | repository.""" |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 693 | if not os.path.isdir(self.checkout_path): |
| 694 | raise gclient_utils.Error('Directory %s is not present.' % |
| 695 | self.checkout_path) |
| 696 | gclient_utils.CheckCallAndFilter( |
| 697 | ['svn', 'diff', '-x', '--ignore-eol-style'] + args, |
| 698 | cwd=self.checkout_path, |
| 699 | print_stdout=False, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 700 | filter_fn=DiffFilterer(self.relpath).Filter) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 701 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 702 | def update(self, options, args, file_list): |
msb@chromium.org | d650421 | 2010-01-13 17:34:31 +0000 | [diff] [blame] | 703 | """Runs svn to update or transparently checkout the working copy. |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 704 | |
| 705 | All updated files will be appended to file_list. |
| 706 | |
| 707 | Raises: |
| 708 | Error: if can't get URL for relative path. |
| 709 | """ |
morrita@chromium.org | 21dca0e | 2010-10-05 00:55:12 +0000 | [diff] [blame] | 710 | # Only update if git or hg is not controlling the directory. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 711 | git_path = os.path.join(self.checkout_path, '.git') |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 712 | if os.path.exists(git_path): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 713 | print('________ found .git directory; skipping %s' % self.relpath) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 714 | return |
| 715 | |
morrita@chromium.org | 21dca0e | 2010-10-05 00:55:12 +0000 | [diff] [blame] | 716 | hg_path = os.path.join(self.checkout_path, '.hg') |
| 717 | if os.path.exists(hg_path): |
| 718 | print('________ found .hg directory; skipping %s' % self.relpath) |
| 719 | return |
| 720 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 721 | if args: |
| 722 | raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args)) |
| 723 | |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 724 | # revision is the revision to match. It is None if no revision is specified, |
| 725 | # i.e. the 'deps ain't pinned'. |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 726 | url, revision = gclient_utils.SplitUrlRevision(self.url) |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 727 | # Keep the original unpinned url for reference in case the repo is switched. |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 728 | base_url = url |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 729 | if options.revision: |
| 730 | # Override the revision number. |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 731 | revision = str(options.revision) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 732 | if revision: |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 733 | forced_revision = True |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 734 | # Reconstruct the url. |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 735 | url = '%s@%s' % (url, revision) |
msb@chromium.org | 770ff9e | 2009-09-23 17:18:18 +0000 | [diff] [blame] | 736 | rev_str = ' at %s' % revision |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 737 | else: |
| 738 | forced_revision = False |
| 739 | rev_str = '' |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 740 | |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 741 | if not os.path.exists(self.checkout_path): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 742 | # We need to checkout. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 743 | command = ['checkout', url, self.checkout_path] |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 744 | command = self._AddAdditionalUpdateFlags(command, options, revision) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 745 | self._RunAndGetFileList(command, options, file_list, self._root_dir) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 746 | return |
| 747 | |
| 748 | # Get the existing scm url and the revision number of the current checkout. |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 749 | try: |
| 750 | from_info = scm.SVN.CaptureInfo(os.path.join(self.checkout_path, '.')) |
maruel@chromium.org | 31cb48a | 2011-04-04 18:01:36 +0000 | [diff] [blame] | 751 | except (gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 752 | raise gclient_utils.Error( |
| 753 | ('Can\'t update/checkout %s if an unversioned directory is present. ' |
| 754 | 'Delete the directory and try again.') % self.checkout_path) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 755 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 756 | # Look for locked directories. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 757 | dir_info = scm.SVN.CaptureStatus(os.path.join(self.checkout_path, '.')) |
| 758 | if [True for d in dir_info |
| 759 | if d[0][2] == 'L' and d[1] == self.checkout_path]: |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 760 | # The current directory is locked, clean it up. |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 761 | self._Run(['cleanup'], options) |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 762 | |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 763 | # Retrieve the current HEAD version because svn is slow at null updates. |
| 764 | if options.manually_grab_svn_rev and not revision: |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 765 | from_info_live = scm.SVN.CaptureInfo(from_info['URL']) |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 766 | revision = str(from_info_live['Revision']) |
| 767 | rev_str = ' at %s' % revision |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 768 | |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 769 | if from_info['URL'] != base_url: |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 770 | # The repository url changed, need to switch. |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 771 | try: |
| 772 | to_info = scm.SVN.CaptureInfo(url) |
maruel@chromium.org | 31cb48a | 2011-04-04 18:01:36 +0000 | [diff] [blame] | 773 | except (gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | e2ce0c7 | 2009-09-23 16:14:18 +0000 | [diff] [blame] | 774 | # The url is invalid or the server is not accessible, it's safer to bail |
| 775 | # out right now. |
| 776 | raise gclient_utils.Error('This url is unreachable: %s' % url) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 777 | can_switch = ((from_info['Repository Root'] != to_info['Repository Root']) |
| 778 | and (from_info['UUID'] == to_info['UUID'])) |
| 779 | if can_switch: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 780 | print('\n_____ relocating %s to a new checkout' % self.relpath) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 781 | # We have different roots, so check if we can switch --relocate. |
| 782 | # Subversion only permits this if the repository UUIDs match. |
| 783 | # Perform the switch --relocate, then rewrite the from_url |
| 784 | # to reflect where we "are now." (This is the same way that |
| 785 | # Subversion itself handles the metadata when switch --relocate |
| 786 | # is used.) This makes the checks below for whether we |
| 787 | # can update to a revision or have to switch to a different |
| 788 | # branch work as expected. |
| 789 | # TODO(maruel): TEST ME ! |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 790 | command = ['switch', '--relocate', |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 791 | from_info['Repository Root'], |
| 792 | to_info['Repository Root'], |
| 793 | self.relpath] |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 794 | self._Run(command, options, cwd=self._root_dir) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 795 | from_info['URL'] = from_info['URL'].replace( |
| 796 | from_info['Repository Root'], |
| 797 | to_info['Repository Root']) |
| 798 | else: |
maruel@chromium.org | 3294f52 | 2010-08-18 19:54:57 +0000 | [diff] [blame] | 799 | if not options.force and not options.reset: |
maruel@chromium.org | 86f0f95 | 2010-08-10 17:17:19 +0000 | [diff] [blame] | 800 | # Look for local modifications but ignore unversioned files. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 801 | for status in scm.SVN.CaptureStatus(self.checkout_path): |
maruel@chromium.org | 86f0f95 | 2010-08-10 17:17:19 +0000 | [diff] [blame] | 802 | if status[0] != '?': |
| 803 | raise gclient_utils.Error( |
| 804 | ('Can\'t switch the checkout to %s; UUID don\'t match and ' |
| 805 | 'there is local changes in %s. Delete the directory and ' |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 806 | 'try again.') % (url, self.checkout_path)) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 807 | # Ok delete it. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 808 | print('\n_____ switching %s to a new checkout' % self.relpath) |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 809 | gclient_utils.RemoveDirectory(self.checkout_path) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 810 | # We need to checkout. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 811 | command = ['checkout', url, self.checkout_path] |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 812 | command = self._AddAdditionalUpdateFlags(command, options, revision) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 813 | self._RunAndGetFileList(command, options, file_list, self._root_dir) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 814 | return |
| 815 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 816 | # If the provided url has a revision number that matches the revision |
| 817 | # number of the existing directory, then we don't need to bother updating. |
maruel@chromium.org | 2e0c685 | 2009-09-24 00:02:07 +0000 | [diff] [blame] | 818 | if not options.force and str(from_info['Revision']) == revision: |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 819 | if options.verbose or not forced_revision: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 820 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 821 | return |
| 822 | |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 823 | command = ['update', self.checkout_path] |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 824 | command = self._AddAdditionalUpdateFlags(command, options, revision) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 825 | self._RunAndGetFileList(command, options, file_list, self._root_dir) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 826 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 827 | def updatesingle(self, options, args, file_list): |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 828 | filename = args.pop() |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 829 | if scm.SVN.AssertVersion("1.5")[0]: |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 830 | if not os.path.exists(os.path.join(self.checkout_path, '.svn')): |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 831 | # Create an empty checkout and then update the one file we want. Future |
| 832 | # operations will only apply to the one file we checked out. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 833 | command = ["checkout", "--depth", "empty", self.url, self.checkout_path] |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 834 | self._Run(command, options, cwd=self._root_dir) |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 835 | if os.path.exists(os.path.join(self.checkout_path, filename)): |
| 836 | os.remove(os.path.join(self.checkout_path, filename)) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 837 | command = ["update", filename] |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 838 | self._RunAndGetFileList(command, options, file_list) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 839 | # After the initial checkout, we can use update as if it were any other |
| 840 | # dep. |
| 841 | self.update(options, args, file_list) |
| 842 | else: |
| 843 | # If the installed version of SVN doesn't support --depth, fallback to |
| 844 | # just exporting the file. This has the downside that revision |
| 845 | # information is not stored next to the file, so we will have to |
| 846 | # re-export the file every time we sync. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 847 | if not os.path.exists(self.checkout_path): |
| 848 | os.makedirs(self.checkout_path) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 849 | command = ["export", os.path.join(self.url, filename), |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 850 | os.path.join(self.checkout_path, filename)] |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 851 | command = self._AddAdditionalUpdateFlags(command, options, |
| 852 | options.revision) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 853 | self._Run(command, options, cwd=self._root_dir) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 854 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 855 | def revert(self, options, args, file_list): |
| 856 | """Reverts local modifications. Subversion specific. |
| 857 | |
| 858 | All reverted files will be appended to file_list, even if Subversion |
| 859 | doesn't know about them. |
| 860 | """ |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 861 | if not os.path.isdir(self.checkout_path): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 862 | # svn revert won't work if the directory doesn't exist. It needs to |
| 863 | # checkout instead. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 864 | print('\n_____ %s is missing, synching instead' % self.relpath) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 865 | # Don't reuse the args. |
| 866 | return self.update(options, [], file_list) |
| 867 | |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 868 | def printcb(file_status): |
| 869 | file_list.append(file_status[1]) |
maruel@chromium.org | aa3dd47 | 2009-09-21 19:02:48 +0000 | [diff] [blame] | 870 | if logging.getLogger().isEnabledFor(logging.INFO): |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 871 | logging.info('%s%s' % (file_status[0], file_status[1])) |
maruel@chromium.org | aa3dd47 | 2009-09-21 19:02:48 +0000 | [diff] [blame] | 872 | else: |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 873 | print(os.path.join(self.checkout_path, file_status[1])) |
| 874 | scm.SVN.Revert(self.checkout_path, callback=printcb) |
maruel@chromium.org | aa3dd47 | 2009-09-21 19:02:48 +0000 | [diff] [blame] | 875 | |
maruel@chromium.org | 810a50b | 2009-10-05 23:03:18 +0000 | [diff] [blame] | 876 | try: |
| 877 | # svn revert is so broken we don't even use it. Using |
| 878 | # "svn up --revision BASE" achieve the same effect. |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 879 | # file_list will contain duplicates. |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 880 | self._RunAndGetFileList(['update', '--revision', 'BASE'], options, |
| 881 | file_list) |
maruel@chromium.org | 810a50b | 2009-10-05 23:03:18 +0000 | [diff] [blame] | 882 | except OSError, e: |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 883 | # Maybe the directory disapeared meanwhile. Do not throw an exception. |
maruel@chromium.org | 810a50b | 2009-10-05 23:03:18 +0000 | [diff] [blame] | 884 | logging.error('Failed to update:\n%s' % str(e)) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 885 | |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 886 | def revinfo(self, options, args, file_list): |
| 887 | """Display revision""" |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 888 | try: |
| 889 | return scm.SVN.CaptureRevision(self.checkout_path) |
maruel@chromium.org | 31cb48a | 2011-04-04 18:01:36 +0000 | [diff] [blame] | 890 | except (gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 891 | return None |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 892 | |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 893 | def runhooks(self, options, args, file_list): |
| 894 | self.status(options, args, file_list) |
| 895 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 896 | def status(self, options, args, file_list): |
| 897 | """Display status information.""" |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 898 | command = ['status'] + args |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 899 | if not os.path.isdir(self.checkout_path): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 900 | # svn status won't work if the directory doesn't exist. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 901 | print(('\n________ couldn\'t run \'%s\' in \'%s\':\n' |
| 902 | 'The directory does not exist.') % |
| 903 | (' '.join(command), self.checkout_path)) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 904 | # There's no file list to retrieve. |
| 905 | else: |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 906 | self._RunAndGetFileList(command, options, file_list) |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 907 | |
| 908 | def FullUrlForRelativeUrl(self, url): |
| 909 | # Find the forth '/' and strip from there. A bit hackish. |
| 910 | return '/'.join(self.url.split('/')[:4]) + url |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 911 | |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 912 | def _Run(self, args, options, **kwargs): |
| 913 | """Runs a commands that goes to stdout.""" |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 914 | kwargs.setdefault('cwd', self.checkout_path) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 915 | gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 916 | always=options.verbose, **kwargs) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 917 | |
| 918 | def _RunAndGetFileList(self, args, options, file_list, cwd=None): |
| 919 | """Runs a commands that goes to stdout and grabs the file listed.""" |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 920 | cwd = cwd or self.checkout_path |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 921 | scm.SVN.RunAndGetFileList( |
| 922 | options.verbose, |
| 923 | args + ['--ignore-externals'], |
| 924 | cwd=cwd, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 925 | file_list=file_list) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 926 | |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 927 | @staticmethod |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 928 | def _AddAdditionalUpdateFlags(command, options, revision): |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 929 | """Add additional flags to command depending on what options are set. |
| 930 | command should be a list of strings that represents an svn command. |
| 931 | |
| 932 | This method returns a new list to be used as a command.""" |
| 933 | new_command = command[:] |
| 934 | if revision: |
| 935 | new_command.extend(['--revision', str(revision).strip()]) |
| 936 | # --force was added to 'svn update' in svn 1.5. |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 937 | if ((options.force or options.manually_grab_svn_rev) and |
| 938 | scm.SVN.AssertVersion("1.5")[0]): |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 939 | new_command.append('--force') |
| 940 | return new_command |