steveblock@chromium.org | 9356704 | 2012-02-15 01:02:26 +0000 | [diff] [blame] | 1 | # Copyright (c) 2012 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 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 7 | import collections |
maruel@chromium.org | 754960e | 2009-09-21 12:31:05 +0000 | [diff] [blame] | 8 | import logging |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 9 | import os |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 10 | import posixpath |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 11 | import re |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 12 | import sys |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 13 | import tempfile |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 14 | import threading |
maruel@chromium.org | fd87617 | 2010-04-30 14:01:05 +0000 | [diff] [blame] | 15 | import time |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 16 | import urlparse |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 17 | |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 18 | import download_from_google_storage |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 19 | import gclient_utils |
maruel@chromium.org | 31cb48a | 2011-04-04 18:01:36 +0000 | [diff] [blame] | 20 | import scm |
| 21 | import subprocess2 |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 22 | |
| 23 | |
szager@chromium.org | 71cbb50 | 2013-04-19 23:30:15 +0000 | [diff] [blame] | 24 | THIS_FILE_PATH = os.path.abspath(__file__) |
| 25 | |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 26 | GSUTIL_DEFAULT_PATH = os.path.join( |
| 27 | os.path.dirname(os.path.abspath(__file__)), |
| 28 | 'third_party', 'gsutil', 'gsutil') |
| 29 | |
szager@chromium.org | 71cbb50 | 2013-04-19 23:30:15 +0000 | [diff] [blame] | 30 | |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 31 | class DiffFiltererWrapper(object): |
| 32 | """Simple base class which tracks which file is being diffed and |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 33 | replaces instances of its file name in the original and |
msb@chromium.org | d650421 | 2010-01-13 17:34:31 +0000 | [diff] [blame] | 34 | working copy lines of the svn/git diff output.""" |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 35 | index_string = None |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 36 | original_prefix = "--- " |
| 37 | working_prefix = "+++ " |
| 38 | |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 39 | def __init__(self, relpath): |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 40 | # Note that we always use '/' as the path separator to be |
| 41 | # consistent with svn's cygwin-style output on Windows |
| 42 | self._relpath = relpath.replace("\\", "/") |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 43 | self._current_file = None |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 44 | |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 45 | def SetCurrentFile(self, current_file): |
| 46 | self._current_file = current_file |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 47 | |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 48 | @property |
| 49 | def _replacement_file(self): |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 50 | return posixpath.join(self._relpath, self._current_file) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 51 | |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 52 | def _Replace(self, line): |
| 53 | return line.replace(self._current_file, self._replacement_file) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 54 | |
| 55 | def Filter(self, line): |
| 56 | if (line.startswith(self.index_string)): |
| 57 | self.SetCurrentFile(line[len(self.index_string):]) |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 58 | line = self._Replace(line) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 59 | else: |
| 60 | if (line.startswith(self.original_prefix) or |
| 61 | line.startswith(self.working_prefix)): |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 62 | line = self._Replace(line) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 63 | print(line) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 64 | |
| 65 | |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 66 | class SvnDiffFilterer(DiffFiltererWrapper): |
| 67 | index_string = "Index: " |
| 68 | |
| 69 | |
| 70 | class GitDiffFilterer(DiffFiltererWrapper): |
| 71 | index_string = "diff --git " |
| 72 | |
| 73 | def SetCurrentFile(self, current_file): |
| 74 | # Get filename by parsing "a/<filename> b/<filename>" |
| 75 | self._current_file = current_file[:(len(current_file)/2)][2:] |
| 76 | |
| 77 | def _Replace(self, line): |
| 78 | return re.sub("[a|b]/" + self._current_file, self._replacement_file, line) |
| 79 | |
| 80 | |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 81 | def ask_for_data(prompt, options): |
| 82 | if options.jobs > 1: |
| 83 | raise gclient_utils.Error("Background task requires input. Rerun " |
| 84 | "gclient with --jobs=1 so that\n" |
| 85 | "interaction is possible.") |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 86 | try: |
| 87 | return raw_input(prompt) |
| 88 | except KeyboardInterrupt: |
| 89 | # Hide the exception. |
| 90 | sys.exit(1) |
| 91 | |
| 92 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 93 | ### SCM abstraction layer |
| 94 | |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 95 | # Factory Method for SCM wrapper creation |
| 96 | |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 97 | def GetScmName(url): |
| 98 | if url: |
| 99 | url, _ = gclient_utils.SplitUrlRevision(url) |
| 100 | if (url.startswith('git://') or url.startswith('ssh://') or |
igorgatis@gmail.com | 4e07567 | 2011-11-21 16:35:08 +0000 | [diff] [blame] | 101 | url.startswith('git+http://') or url.startswith('git+https://') or |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 102 | url.endswith('.git')): |
| 103 | return 'git' |
maruel@chromium.org | b74dca2 | 2010-06-11 20:10:40 +0000 | [diff] [blame] | 104 | elif (url.startswith('http://') or url.startswith('https://') or |
maruel@chromium.org | 54a07a2 | 2010-06-14 19:07:39 +0000 | [diff] [blame] | 105 | url.startswith('svn://') or url.startswith('svn+ssh://')): |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 106 | return 'svn' |
| 107 | return None |
| 108 | |
| 109 | |
| 110 | def CreateSCM(url, root_dir=None, relpath=None): |
| 111 | SCM_MAP = { |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 112 | 'svn' : SVNWrapper, |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 113 | 'git' : GitWrapper, |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 114 | } |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 115 | |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 116 | scm_name = GetScmName(url) |
| 117 | if not scm_name in SCM_MAP: |
| 118 | raise gclient_utils.Error('No SCM found for url %s' % url) |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 119 | scm_class = SCM_MAP[scm_name] |
| 120 | if not scm_class.BinaryExists(): |
| 121 | raise gclient_utils.Error('%s command not found' % scm_name) |
| 122 | return scm_class(url, root_dir, relpath) |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 123 | |
| 124 | |
| 125 | # SCMWrapper base class |
| 126 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 127 | class SCMWrapper(object): |
| 128 | """Add necessary glue between all the supported SCM. |
| 129 | |
msb@chromium.org | d650421 | 2010-01-13 17:34:31 +0000 | [diff] [blame] | 130 | This is the abstraction layer to bind to different SCM. |
| 131 | """ |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 132 | def __init__(self, url=None, root_dir=None, relpath=None): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 133 | self.url = url |
maruel@chromium.org | 5e73b0c | 2009-09-18 19:47:48 +0000 | [diff] [blame] | 134 | self._root_dir = root_dir |
| 135 | if self._root_dir: |
| 136 | self._root_dir = self._root_dir.replace('/', os.sep) |
| 137 | self.relpath = relpath |
| 138 | if self.relpath: |
| 139 | self.relpath = self.relpath.replace('/', os.sep) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 140 | if self.relpath and self._root_dir: |
| 141 | self.checkout_path = os.path.join(self._root_dir, self.relpath) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 142 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 143 | def RunCommand(self, command, options, args, file_list=None): |
phajdan.jr@chromium.org | 6e043f7 | 2011-05-02 07:24:32 +0000 | [diff] [blame] | 144 | commands = ['cleanup', 'update', 'updatesingle', 'revert', |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 145 | 'revinfo', 'status', 'diff', 'pack', 'runhooks'] |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 146 | |
| 147 | if not command in commands: |
| 148 | raise gclient_utils.Error('Unknown command %s' % command) |
| 149 | |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 150 | if not command in dir(self): |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 151 | raise gclient_utils.Error('Command %s not implemented in %s wrapper' % ( |
maruel@chromium.org | 9eda411 | 2010-06-11 18:56:10 +0000 | [diff] [blame] | 152 | command, self.__class__.__name__)) |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 153 | |
| 154 | return getattr(self, command)(options, args, file_list) |
| 155 | |
| 156 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 157 | class GitFilter(object): |
| 158 | """A filter_fn implementation for quieting down git output messages. |
| 159 | |
| 160 | Allows a custom function to skip certain lines (predicate), and will throttle |
| 161 | the output of percentage completed lines to only output every X seconds. |
| 162 | """ |
| 163 | PERCENT_RE = re.compile('.* ([0-9]{1,2})% .*') |
| 164 | |
| 165 | def __init__(self, time_throttle=0, predicate=None): |
| 166 | """ |
| 167 | Args: |
| 168 | time_throttle (int): GitFilter will throttle 'noisy' output (such as the |
| 169 | XX% complete messages) to only be printed at least |time_throttle| |
| 170 | seconds apart. |
| 171 | predicate (f(line)): An optional function which is invoked for every line. |
| 172 | The line will be skipped if predicate(line) returns False. |
| 173 | """ |
| 174 | self.last_time = 0 |
| 175 | self.time_throttle = time_throttle |
| 176 | self.predicate = predicate |
| 177 | |
| 178 | def __call__(self, line): |
| 179 | # git uses an escape sequence to clear the line; elide it. |
| 180 | esc = line.find(unichr(033)) |
| 181 | if esc > -1: |
| 182 | line = line[:esc] |
| 183 | if self.predicate and not self.predicate(line): |
| 184 | return |
| 185 | now = time.time() |
| 186 | match = self.PERCENT_RE.match(line) |
| 187 | if not match: |
| 188 | self.last_time = 0 |
| 189 | if (now - self.last_time) >= self.time_throttle: |
| 190 | self.last_time = now |
| 191 | print line |
| 192 | |
| 193 | |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 194 | class GitWrapper(SCMWrapper): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 195 | """Wrapper for Git""" |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 196 | name = 'git' |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 197 | remote = 'origin' |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 198 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 199 | cache_dir = None |
| 200 | # If a given cache is used in a solution more than once, prevent multiple |
| 201 | # threads from updating it simultaneously. |
| 202 | cache_locks = collections.defaultdict(threading.Lock) |
| 203 | |
igorgatis@gmail.com | 4e07567 | 2011-11-21 16:35:08 +0000 | [diff] [blame] | 204 | def __init__(self, url=None, root_dir=None, relpath=None): |
| 205 | """Removes 'git+' fake prefix from git URL.""" |
| 206 | if url.startswith('git+http://') or url.startswith('git+https://'): |
| 207 | url = url[4:] |
| 208 | SCMWrapper.__init__(self, url, root_dir, relpath) |
| 209 | |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 210 | @staticmethod |
| 211 | def BinaryExists(): |
| 212 | """Returns true if the command exists.""" |
| 213 | try: |
| 214 | # We assume git is newer than 1.7. See: crbug.com/114483 |
| 215 | result, version = scm.GIT.AssertVersion('1.7') |
| 216 | if not result: |
| 217 | raise gclient_utils.Error('Git version is older than 1.7: %s' % version) |
| 218 | return result |
| 219 | except OSError: |
| 220 | return False |
| 221 | |
xusydoc@chromium.org | 885a960 | 2013-05-31 09:54:40 +0000 | [diff] [blame] | 222 | def GetCheckoutRoot(self): |
| 223 | return scm.GIT.GetCheckoutRoot(self.checkout_path) |
| 224 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 225 | def GetRevisionDate(self, _revision): |
floitsch@google.com | eaab784 | 2011-04-28 09:07:58 +0000 | [diff] [blame] | 226 | """Returns the given revision's date in ISO-8601 format (which contains the |
| 227 | time zone).""" |
| 228 | # TODO(floitsch): get the time-stamp of the given revision and not just the |
| 229 | # time-stamp of the currently checked out revision. |
| 230 | return self._Capture(['log', '-n', '1', '--format=%ai']) |
| 231 | |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 232 | @staticmethod |
| 233 | def cleanup(options, args, file_list): |
msb@chromium.org | d8a6378 | 2010-01-25 17:47:05 +0000 | [diff] [blame] | 234 | """'Cleanup' the repo. |
| 235 | |
| 236 | There's no real git equivalent for the svn cleanup command, do a no-op. |
| 237 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 238 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 239 | def diff(self, options, _args, _file_list): |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 240 | merge_base = self._Capture(['merge-base', 'HEAD', self.remote]) |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 241 | self._Run(['diff', merge_base], options) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 242 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 243 | def pack(self, _options, _args, _file_list): |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 244 | """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] | 245 | repository. |
| 246 | |
| 247 | The patch file is generated from a diff of the merge base of HEAD and |
| 248 | its upstream branch. |
| 249 | """ |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 250 | merge_base = self._Capture(['merge-base', 'HEAD', self.remote]) |
maruel@chromium.org | 17d0179 | 2010-09-01 18:07:10 +0000 | [diff] [blame] | 251 | gclient_utils.CheckCallAndFilter( |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 252 | ['git', 'diff', merge_base], |
| 253 | cwd=self.checkout_path, |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 254 | filter_fn=GitDiffFilterer(self.relpath).Filter) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 255 | |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 256 | def UpdateSubmoduleConfig(self): |
| 257 | submod_cmd = ['git', 'config', '-f', '$toplevel/.git/config', |
szager@chromium.org | 37e4f23 | 2012-06-21 21:47:42 +0000 | [diff] [blame] | 258 | 'submodule.$name.ignore', 'all'] |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 259 | cmd = ['git', 'submodule', '--quiet', 'foreach', ' '.join(submod_cmd)] |
szager@chromium.org | 78f5c16 | 2012-06-22 22:34:25 +0000 | [diff] [blame] | 260 | cmd2 = ['git', 'config', 'diff.ignoreSubmodules', 'all'] |
szager@chromium.org | 987b061 | 2012-07-09 23:41:08 +0000 | [diff] [blame] | 261 | cmd3 = ['git', 'config', 'branch.autosetupmerge'] |
iannucci@chromium.org | 08b21bf | 2013-04-05 03:38:10 +0000 | [diff] [blame] | 262 | cmd4 = ['git', 'config', 'fetch.recurseSubmodules', 'false'] |
szager@chromium.org | 987b061 | 2012-07-09 23:41:08 +0000 | [diff] [blame] | 263 | kwargs = {'cwd': self.checkout_path, |
| 264 | 'print_stdout': False, |
| 265 | 'filter_fn': lambda x: None} |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 266 | try: |
szager@chromium.org | 987b061 | 2012-07-09 23:41:08 +0000 | [diff] [blame] | 267 | gclient_utils.CheckCallAndFilter(cmd, **kwargs) |
| 268 | gclient_utils.CheckCallAndFilter(cmd2, **kwargs) |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 269 | except subprocess2.CalledProcessError: |
| 270 | # Not a fatal error, or even very interesting in a non-git-submodule |
| 271 | # world. So just keep it quiet. |
| 272 | pass |
szager@chromium.org | 987b061 | 2012-07-09 23:41:08 +0000 | [diff] [blame] | 273 | try: |
| 274 | gclient_utils.CheckCallAndFilter(cmd3, **kwargs) |
| 275 | except subprocess2.CalledProcessError: |
| 276 | gclient_utils.CheckCallAndFilter(cmd3 + ['always'], **kwargs) |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 277 | |
iannucci@chromium.org | 08b21bf | 2013-04-05 03:38:10 +0000 | [diff] [blame] | 278 | gclient_utils.CheckCallAndFilter(cmd4, **kwargs) |
| 279 | |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 280 | def _FetchAndReset(self, revision, file_list, options): |
| 281 | """Equivalent to git fetch; git reset.""" |
| 282 | quiet = [] |
| 283 | if not options.verbose: |
| 284 | quiet = ['--quiet'] |
| 285 | self._UpdateBranchHeads(options, fetch=False) |
| 286 | |
| 287 | fetch_cmd = [ |
| 288 | '-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote, '--prune'] |
| 289 | self._Run(fetch_cmd + quiet, options, retry=True) |
| 290 | self._Run(['reset', '--hard', revision] + quiet, options) |
| 291 | self.UpdateSubmoduleConfig() |
| 292 | if file_list is not None: |
| 293 | files = self._Capture(['ls-files']).splitlines() |
| 294 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
| 295 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 296 | def update(self, options, args, file_list): |
| 297 | """Runs git to update or transparently checkout the working copy. |
| 298 | |
| 299 | All updated files will be appended to file_list. |
| 300 | |
| 301 | Raises: |
| 302 | Error: if can't get URL for relative path. |
| 303 | """ |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 304 | if args: |
| 305 | raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args)) |
| 306 | |
nasser@codeaurora.org | ece406f | 2010-02-23 17:29:15 +0000 | [diff] [blame] | 307 | self._CheckMinVersion("1.6.6") |
msb@chromium.org | 923a037 | 2009-12-11 20:42:43 +0000 | [diff] [blame] | 308 | |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 309 | # If a dependency is not pinned, track the default remote branch. |
| 310 | default_rev = 'refs/remotes/%s/master' % self.remote |
nasser@codeaurora.org | 7080e94 | 2010-03-15 15:06:16 +0000 | [diff] [blame] | 311 | url, deps_revision = gclient_utils.SplitUrlRevision(self.url) |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 312 | rev_str = "" |
nasser@codeaurora.org | 7080e94 | 2010-03-15 15:06:16 +0000 | [diff] [blame] | 313 | revision = deps_revision |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 314 | managed = True |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 315 | if options.revision: |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 316 | # Override the revision number. |
| 317 | revision = str(options.revision) |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 318 | if revision == 'unmanaged': |
| 319 | revision = None |
| 320 | managed = False |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 321 | if not revision: |
| 322 | revision = default_rev |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 323 | |
floitsch@google.com | eaab784 | 2011-04-28 09:07:58 +0000 | [diff] [blame] | 324 | if gclient_utils.IsDateRevision(revision): |
| 325 | # Date-revisions only work on git-repositories if the reflog hasn't |
| 326 | # expired yet. Use rev-list to get the corresponding revision. |
| 327 | # git rev-list -n 1 --before='time-stamp' branchname |
| 328 | if options.transitive: |
| 329 | print('Warning: --transitive only works for SVN repositories.') |
| 330 | revision = default_rev |
| 331 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 332 | rev_str = ' at %s' % revision |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 333 | files = [] if file_list is not None else None |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 334 | |
| 335 | printed_path = False |
| 336 | verbose = [] |
msb@chromium.org | b1a22bf | 2009-11-07 02:33:50 +0000 | [diff] [blame] | 337 | if options.verbose: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 338 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 339 | verbose = ['--verbose'] |
| 340 | printed_path = True |
| 341 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 342 | url = self._CreateOrUpdateCache(url, options) |
| 343 | |
ilevy@chromium.org | a41249c | 2013-07-03 00:09:12 +0000 | [diff] [blame] | 344 | if revision.startswith('refs/'): |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 345 | rev_type = "branch" |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 346 | elif revision.startswith(self.remote + '/'): |
| 347 | # For compatibility with old naming, translate 'origin' to 'refs/heads' |
| 348 | revision = revision.replace(self.remote + '/', 'refs/heads/') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 349 | rev_type = "branch" |
| 350 | else: |
| 351 | # hash is also a tag, only make a distinction at checkout |
| 352 | rev_type = "hash" |
| 353 | |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 354 | if (not os.path.exists(self.checkout_path) or |
| 355 | (os.path.isdir(self.checkout_path) and |
| 356 | not os.path.exists(os.path.join(self.checkout_path, '.git')))): |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 357 | self._Clone(revision, url, options) |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 358 | self.UpdateSubmoduleConfig() |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 359 | if file_list is not None: |
| 360 | files = self._Capture(['ls-files']).splitlines() |
| 361 | 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] | 362 | if not verbose: |
| 363 | # Make the output a little prettier. It's nice to have some whitespace |
| 364 | # between projects when cloning. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 365 | print('') |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 366 | return self._Capture(['rev-parse', '--verify', 'HEAD']) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 367 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 368 | if not managed: |
mmoss@chromium.org | 96833fa | 2013-04-17 03:26:37 +0000 | [diff] [blame] | 369 | self._UpdateBranchHeads(options, fetch=False) |
szager@chromium.org | f5cc427 | 2012-06-21 22:38:07 +0000 | [diff] [blame] | 370 | self.UpdateSubmoduleConfig() |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 371 | print ('________ unmanaged solution; skipping %s' % self.relpath) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 372 | return self._Capture(['rev-parse', '--verify', 'HEAD']) |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 373 | |
msb@chromium.org | e4af1ab | 2010-01-13 21:26:09 +0000 | [diff] [blame] | 374 | if not os.path.exists(os.path.join(self.checkout_path, '.git')): |
| 375 | raise gclient_utils.Error('\n____ %s%s\n' |
| 376 | '\tPath is not a git repo. No .git dir.\n' |
| 377 | '\tTo resolve:\n' |
| 378 | '\t\trm -rf %s\n' |
| 379 | '\tAnd run gclient sync again\n' |
| 380 | % (self.relpath, rev_str, self.relpath)) |
| 381 | |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 382 | # See if the url has changed (the unittests use git://foo for the url, let |
| 383 | # that through). |
| 384 | current_url = self._Capture(['config', 'remote.%s.url' % self.remote]) |
| 385 | return_early = False |
| 386 | # TODO(maruel): Delete url != 'git://foo' since it's just to make the |
| 387 | # unit test pass. (and update the comment above) |
| 388 | # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set. |
| 389 | # This allows devs to use experimental repos which have a different url |
| 390 | # but whose branch(s) are the same as official repos. |
| 391 | if (current_url != url and |
| 392 | url != 'git://foo' and |
| 393 | subprocess2.capture( |
| 394 | ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote], |
| 395 | cwd=self.checkout_path).strip() != 'False'): |
| 396 | print('_____ switching %s to a new upstream' % self.relpath) |
| 397 | # Make sure it's clean |
| 398 | self._CheckClean(rev_str) |
| 399 | # Switch over to the new upstream |
| 400 | self._Run(['remote', 'set-url', self.remote, url], options) |
| 401 | self._FetchAndReset(revision, file_list, options) |
| 402 | return_early = True |
| 403 | |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 404 | # Need to do this in the normal path as well as in the post-remote-switch |
| 405 | # path. |
| 406 | self._PossiblySwitchCache(url, options) |
| 407 | |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 408 | if return_early: |
| 409 | return self._Capture(['rev-parse', '--verify', 'HEAD']) |
| 410 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 411 | cur_branch = self._GetCurrentBranch() |
| 412 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 413 | # Cases: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 414 | # 0) HEAD is detached. Probably from our initial clone. |
| 415 | # - make sure HEAD is contained by a named ref, then update. |
| 416 | # Cases 1-4. HEAD is a branch. |
| 417 | # 1) current branch is not tracking a remote branch (could be git-svn) |
| 418 | # - try to rebase onto the new hash or branch |
| 419 | # 2) current branch is tracking a remote branch with local committed |
| 420 | # changes, but the DEPS file switched to point to a hash |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 421 | # - rebase those changes on top of the hash |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 422 | # 3) current branch is tracking a remote branch w/or w/out changes, |
| 423 | # no switch |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 424 | # - 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] | 425 | # 4) current branch is tracking a remote branch, switches to a different |
| 426 | # remote branch |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 427 | # - exit |
| 428 | |
maruel@chromium.org | 81e012c | 2010-04-29 16:07:24 +0000 | [diff] [blame] | 429 | # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for |
| 430 | # a tracking branch |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 431 | # or 'master' if not a tracking branch (it's based on a specific rev/hash) |
| 432 | # or it returns None if it couldn't find an upstream |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 433 | if cur_branch is None: |
| 434 | upstream_branch = None |
| 435 | current_type = "detached" |
| 436 | logging.debug("Detached HEAD") |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 437 | else: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 438 | upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path) |
| 439 | if not upstream_branch or not upstream_branch.startswith('refs/remotes'): |
| 440 | current_type = "hash" |
| 441 | logging.debug("Current branch is not tracking an upstream (remote)" |
| 442 | " branch.") |
| 443 | elif upstream_branch.startswith('refs/remotes'): |
| 444 | current_type = "branch" |
| 445 | else: |
| 446 | raise gclient_utils.Error('Invalid Upstream: %s' % upstream_branch) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 447 | |
ilevy@chromium.org | a41249c | 2013-07-03 00:09:12 +0000 | [diff] [blame] | 448 | if not scm.GIT.IsValidRevision(self.checkout_path, revision, sha_only=True): |
bauerb@chromium.org | cbd20a4 | 2012-06-27 13:49:27 +0000 | [diff] [blame] | 449 | # Update the remotes first so we have all the refs. |
ilevy@chromium.org | a41249c | 2013-07-03 00:09:12 +0000 | [diff] [blame] | 450 | remote_output = scm.GIT.Capture(['remote'] + verbose + ['update'], |
bauerb@chromium.org | cbd20a4 | 2012-06-27 13:49:27 +0000 | [diff] [blame] | 451 | cwd=self.checkout_path) |
bauerb@chromium.org | cbd20a4 | 2012-06-27 13:49:27 +0000 | [diff] [blame] | 452 | if verbose: |
ilevy@chromium.org | a41249c | 2013-07-03 00:09:12 +0000 | [diff] [blame] | 453 | print(remote_output) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 454 | |
mmoss@chromium.org | e409df6 | 2013-04-16 17:28:57 +0000 | [diff] [blame] | 455 | self._UpdateBranchHeads(options, fetch=True) |
| 456 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 457 | # 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] | 458 | if options.force or options.reset: |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 459 | target = 'HEAD' |
| 460 | if options.upstream and upstream_branch: |
| 461 | target = upstream_branch |
| 462 | self._Run(['reset', '--hard', target], options) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 463 | |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 464 | if current_type == 'detached': |
| 465 | # case 0 |
| 466 | self._CheckClean(rev_str) |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 467 | self._CheckDetachedHead(rev_str, options) |
nsylvain@chromium.org | f7826d7 | 2011-06-02 18:20:14 +0000 | [diff] [blame] | 468 | self._Capture(['checkout', '--quiet', '%s' % revision]) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 469 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 470 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 471 | elif current_type == 'hash': |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 472 | # case 1 |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 473 | 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] | 474 | # Our git-svn branch (upstream_branch) is our upstream |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 475 | self._AttemptRebase(upstream_branch, files, options, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 476 | newbase=revision, printed_path=printed_path) |
| 477 | printed_path = True |
| 478 | else: |
| 479 | # Can't find a merge-base since we don't know our upstream. That makes |
| 480 | # this command VERY likely to produce a rebase failure. For now we |
| 481 | # assume origin is our upstream since that's what the old behavior was. |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 482 | upstream_branch = self.remote |
nasser@codeaurora.org | 7080e94 | 2010-03-15 15:06:16 +0000 | [diff] [blame] | 483 | if options.revision or deps_revision: |
nasser@codeaurora.org | 3b29de1 | 2010-03-08 18:34:28 +0000 | [diff] [blame] | 484 | upstream_branch = revision |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 485 | self._AttemptRebase(upstream_branch, files, options, |
| 486 | printed_path=printed_path) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 487 | printed_path = True |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 488 | elif rev_type == 'hash': |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 489 | # case 2 |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 490 | self._AttemptRebase(upstream_branch, files, options, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 491 | newbase=revision, printed_path=printed_path) |
| 492 | printed_path = True |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 493 | elif revision.replace('heads', 'remotes/' + self.remote) != upstream_branch: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 494 | # case 4 |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 495 | new_base = revision.replace('heads', 'remotes/' + self.remote) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 496 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 497 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 498 | switch_error = ("Switching upstream branch from %s to %s\n" |
| 499 | % (upstream_branch, new_base) + |
| 500 | "Please merge or rebase manually:\n" + |
| 501 | "cd %s; git rebase %s\n" % (self.checkout_path, new_base) + |
| 502 | "OR git checkout -b <some new branch> %s" % new_base) |
| 503 | raise gclient_utils.Error(switch_error) |
| 504 | else: |
| 505 | # case 3 - the default case |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 506 | if files is not None: |
| 507 | files = self._Capture(['diff', upstream_branch, '--name-only']).split() |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 508 | if verbose: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 509 | print('Trying fast-forward merge to branch : %s' % upstream_branch) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 510 | try: |
bauerb@chromium.org | 2aad1b2 | 2011-07-22 12:00:41 +0000 | [diff] [blame] | 511 | merge_args = ['merge'] |
| 512 | if not options.merge: |
| 513 | merge_args.append('--ff-only') |
| 514 | merge_args.append(upstream_branch) |
| 515 | merge_output = scm.GIT.Capture(merge_args, cwd=self.checkout_path) |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 516 | except subprocess2.CalledProcessError as e: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 517 | if re.match('fatal: Not possible to fast-forward, aborting.', e.stderr): |
| 518 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 519 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 520 | printed_path = True |
| 521 | while True: |
| 522 | try: |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 523 | action = ask_for_data( |
| 524 | 'Cannot fast-forward merge, attempt to rebase? ' |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 525 | '(y)es / (q)uit / (s)kip : ', options) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 526 | except ValueError: |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 527 | raise gclient_utils.Error('Invalid Character') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 528 | if re.match(r'yes|y', action, re.I): |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 529 | self._AttemptRebase(upstream_branch, files, options, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 530 | printed_path=printed_path) |
| 531 | printed_path = True |
| 532 | break |
| 533 | elif re.match(r'quit|q', action, re.I): |
| 534 | raise gclient_utils.Error("Can't fast-forward, please merge or " |
| 535 | "rebase manually.\n" |
| 536 | "cd %s && git " % self.checkout_path |
| 537 | + "rebase %s" % upstream_branch) |
| 538 | elif re.match(r'skip|s', action, re.I): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 539 | print('Skipping %s' % self.relpath) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 540 | return |
| 541 | else: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 542 | print('Input not recognized') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 543 | elif re.match("error: Your local changes to '.*' would be " |
| 544 | "overwritten by merge. Aborting.\nPlease, commit your " |
| 545 | "changes or stash them before you can merge.\n", |
| 546 | e.stderr): |
| 547 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 548 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 549 | printed_path = True |
| 550 | raise gclient_utils.Error(e.stderr) |
| 551 | else: |
| 552 | # Some other problem happened with the merge |
| 553 | logging.error("Error during fast-forward merge in %s!" % self.relpath) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 554 | print(e.stderr) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 555 | raise |
| 556 | else: |
| 557 | # Fast-forward merge was successful |
| 558 | if not re.match('Already up-to-date.', merge_output) or verbose: |
| 559 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 560 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 561 | printed_path = True |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 562 | print(merge_output.strip()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 563 | if not verbose: |
| 564 | # Make the output a little prettier. It's nice to have some |
| 565 | # whitespace between projects when syncing. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 566 | print('') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 567 | |
szager@chromium.org | d4af662 | 2012-06-04 22:13:55 +0000 | [diff] [blame] | 568 | self.UpdateSubmoduleConfig() |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 569 | if file_list is not None: |
| 570 | 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] | 571 | |
| 572 | # 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] | 573 | if self._IsRebasing(): |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 574 | raise gclient_utils.Error('\n____ %s%s\n' |
| 575 | '\nConflict while rebasing this branch.\n' |
| 576 | 'Fix the conflict and run gclient again.\n' |
| 577 | 'See man git-rebase for details.\n' |
| 578 | % (self.relpath, rev_str)) |
| 579 | |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 580 | if verbose: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 581 | print('Checked out revision %s' % self.revinfo(options, (), None)) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 582 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 583 | # If --reset and --delete_unversioned_trees are specified, remove any |
| 584 | # untracked directories. |
| 585 | if options.reset and options.delete_unversioned_trees: |
| 586 | # GIT.CaptureStatus() uses 'dit diff' to compare to a specific SHA1 (the |
| 587 | # merge-base by default), so doesn't include untracked files. So we use |
| 588 | # 'git ls-files --directory --others --exclude-standard' here directly. |
| 589 | paths = scm.GIT.Capture( |
| 590 | ['ls-files', '--directory', '--others', '--exclude-standard'], |
| 591 | self.checkout_path) |
| 592 | for path in (p for p in paths.splitlines() if p.endswith('/')): |
| 593 | full_path = os.path.join(self.checkout_path, path) |
| 594 | if not os.path.islink(full_path): |
| 595 | print('\n_____ removing unversioned directory %s' % path) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 596 | gclient_utils.rmtree(full_path) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 597 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 598 | return self._Capture(['rev-parse', '--verify', 'HEAD']) |
| 599 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 600 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 601 | def revert(self, options, _args, file_list): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 602 | """Reverts local modifications. |
| 603 | |
| 604 | All reverted files will be appended to file_list. |
| 605 | """ |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 606 | if not os.path.isdir(self.checkout_path): |
msb@chromium.org | 260c653 | 2009-10-28 03:22:35 +0000 | [diff] [blame] | 607 | # revert won't work if the directory doesn't exist. It needs to |
| 608 | # checkout instead. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 609 | print('\n_____ %s is missing, synching instead' % self.relpath) |
msb@chromium.org | 260c653 | 2009-10-28 03:22:35 +0000 | [diff] [blame] | 610 | # Don't reuse the args. |
| 611 | return self.update(options, [], file_list) |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 612 | |
| 613 | default_rev = "refs/heads/master" |
iannucci@chromium.org | d4fffee | 2013-06-28 00:35:26 +0000 | [diff] [blame] | 614 | if options.upstream: |
| 615 | if self._GetCurrentBranch(): |
| 616 | upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path) |
| 617 | default_rev = upstream_branch or default_rev |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 618 | _, deps_revision = gclient_utils.SplitUrlRevision(self.url) |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 619 | if not deps_revision: |
| 620 | deps_revision = default_rev |
| 621 | if deps_revision.startswith('refs/heads/'): |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 622 | deps_revision = deps_revision.replace('refs/heads/', self.remote + '/') |
nasser@codeaurora.org | b2b4631 | 2010-04-30 20:58:03 +0000 | [diff] [blame] | 623 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 624 | if file_list is not None: |
| 625 | files = self._Capture(['diff', deps_revision, '--name-only']).split() |
| 626 | |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 627 | self._Run(['reset', '--hard', deps_revision], options) |
lliabraa@chromium.org | ade83db | 2012-09-27 14:06:49 +0000 | [diff] [blame] | 628 | self._Run(['clean', '-f', '-d'], options) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 629 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 630 | if file_list is not None: |
| 631 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
| 632 | |
| 633 | def revinfo(self, _options, _args, _file_list): |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 634 | """Returns revision""" |
| 635 | return self._Capture(['rev-parse', 'HEAD']) |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 636 | |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 637 | def runhooks(self, options, args, file_list): |
| 638 | self.status(options, args, file_list) |
| 639 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 640 | def status(self, options, _args, file_list): |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 641 | """Display status information.""" |
| 642 | if not os.path.isdir(self.checkout_path): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 643 | print(('\n________ couldn\'t run status in %s:\n' |
| 644 | 'The directory does not exist.') % self.checkout_path) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 645 | else: |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 646 | merge_base = self._Capture(['merge-base', 'HEAD', self.remote]) |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 647 | self._Run(['diff', '--name-status', merge_base], options) |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 648 | if file_list is not None: |
| 649 | files = self._Capture(['diff', '--name-only', merge_base]).split() |
| 650 | file_list.extend([os.path.join(self.checkout_path, f) for f in files]) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 651 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 652 | def GetUsableRev(self, rev, options): |
| 653 | """Finds a useful revision for this repository. |
| 654 | |
| 655 | If SCM is git-svn and the head revision is less than |rev|, git svn fetch |
| 656 | will be called on the source.""" |
| 657 | sha1 = None |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 658 | if not os.path.isdir(self.checkout_path): |
| 659 | raise gclient_utils.Error( |
| 660 | ( 'We could not find a valid hash for safesync_url response "%s".\n' |
| 661 | 'Safesync URLs with a git checkout currently require the repo to\n' |
| 662 | 'be cloned without a safesync_url before adding the safesync_url.\n' |
| 663 | 'For more info, see: ' |
| 664 | 'http://code.google.com/p/chromium/wiki/UsingNewGit' |
| 665 | '#Initial_checkout' ) % rev) |
| 666 | elif rev.isdigit() and len(rev) < 7: |
| 667 | # Handles an SVN rev. As an optimization, only verify an SVN revision as |
| 668 | # [0-9]{1,6} for now to avoid making a network request. |
| 669 | if scm.GIT.IsGitSvn(cwd=self.checkout_path): |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 670 | local_head = scm.GIT.GetGitSvnHeadRev(cwd=self.checkout_path) |
| 671 | if not local_head or local_head < int(rev): |
dbeam@chromium.org | 2a75fdb | 2012-02-15 01:32:57 +0000 | [diff] [blame] | 672 | try: |
| 673 | logging.debug('Looking for git-svn configuration optimizations.') |
| 674 | if scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'], |
| 675 | cwd=self.checkout_path): |
| 676 | scm.GIT.Capture(['fetch'], cwd=self.checkout_path) |
| 677 | except subprocess2.CalledProcessError: |
| 678 | logging.debug('git config --get svn-remote.svn.fetch failed, ' |
| 679 | 'ignoring possible optimization.') |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 680 | if options.verbose: |
| 681 | print('Running git svn fetch. This might take a while.\n') |
| 682 | scm.GIT.Capture(['svn', 'fetch'], cwd=self.checkout_path) |
szager@google.com | 312a6a4 | 2012-10-11 21:19:42 +0000 | [diff] [blame] | 683 | try: |
szager@chromium.org | c51def3 | 2012-10-15 18:50:37 +0000 | [diff] [blame] | 684 | sha1 = scm.GIT.GetBlessedSha1ForSvnRev( |
| 685 | cwd=self.checkout_path, rev=rev) |
szager@google.com | 312a6a4 | 2012-10-11 21:19:42 +0000 | [diff] [blame] | 686 | except gclient_utils.Error, e: |
| 687 | sha1 = e.message |
| 688 | print('\nWarning: Could not find a git revision with accurate\n' |
| 689 | '.DEPS.git that maps to SVN revision %s. Sync-ing to\n' |
| 690 | 'the closest sane git revision, which is:\n' |
| 691 | ' %s\n' % (rev, e.message)) |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 692 | if not sha1: |
| 693 | raise gclient_utils.Error( |
| 694 | ( 'It appears that either your git-svn remote is incorrectly\n' |
| 695 | 'configured or the revision in your safesync_url is\n' |
| 696 | 'higher than git-svn remote\'s HEAD as we couldn\'t find a\n' |
| 697 | 'corresponding git hash for SVN rev %s.' ) % rev) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 698 | else: |
| 699 | if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev): |
| 700 | sha1 = rev |
| 701 | else: |
| 702 | # May exist in origin, but we don't have it yet, so fetch and look |
| 703 | # again. |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 704 | scm.GIT.Capture(['fetch', self.remote], cwd=self.checkout_path) |
iannucci@chromium.org | 3830a67 | 2013-02-19 20:15:14 +0000 | [diff] [blame] | 705 | if scm.GIT.IsValidRevision(cwd=self.checkout_path, rev=rev): |
| 706 | sha1 = rev |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 707 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 708 | if not sha1: |
| 709 | raise gclient_utils.Error( |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 710 | ( 'We could not find a valid hash for safesync_url response "%s".\n' |
| 711 | 'Safesync URLs with a git checkout currently require a git-svn\n' |
| 712 | 'remote or a safesync_url that provides git sha1s. Please add a\n' |
| 713 | 'git-svn remote or change your safesync_url. For more info, see:\n' |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 714 | 'http://code.google.com/p/chromium/wiki/UsingNewGit' |
dbeam@chromium.org | 051c88b | 2011-12-22 00:23:03 +0000 | [diff] [blame] | 715 | '#Initial_checkout' ) % rev) |
| 716 | |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 717 | return sha1 |
| 718 | |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 719 | def FullUrlForRelativeUrl(self, url): |
| 720 | # Strip from last '/' |
| 721 | # Equivalent to unix basename |
| 722 | base_url = self.url |
| 723 | return base_url[:base_url.rfind('/')] + url |
| 724 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 725 | @staticmethod |
| 726 | def _NormalizeGitURL(url): |
| 727 | '''Takes a git url, strips the scheme, and ensures it ends with '.git'.''' |
| 728 | idx = url.find('://') |
| 729 | if idx != -1: |
| 730 | url = url[idx+3:] |
| 731 | if not url.endswith('.git'): |
| 732 | url += '.git' |
| 733 | return url |
| 734 | |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 735 | def _PossiblySwitchCache(self, url, options): |
| 736 | """Handles switching a repo from with-cache to direct, or vice versa. |
| 737 | |
| 738 | When we go from direct to with-cache, the remote url changes from the |
| 739 | 'real' url to the local file url (in cache_dir). Therefore, this function |
| 740 | assumes that |url| points to the correctly-switched-over local file url, if |
| 741 | we're in cache_mode. |
| 742 | |
| 743 | When we go from with-cache to direct, assume that the normal url-switching |
| 744 | code already flipped the remote over, and we just need to repack and break |
| 745 | the dependency to the cache. |
| 746 | """ |
| 747 | |
| 748 | altfile = os.path.join( |
| 749 | self.checkout_path, '.git', 'objects', 'info', 'alternates') |
| 750 | if self.cache_dir: |
| 751 | if not os.path.exists(altfile): |
| 752 | try: |
iannucci@chromium.org | 578e5e5 | 2013-07-18 20:55:16 +0000 | [diff] [blame] | 753 | with open(altfile, 'w') as f: |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 754 | f.write(os.path.join(url, 'objects')) |
| 755 | # pylint: disable=C0301 |
| 756 | # This dance is necessary according to emperical evidence, also at: |
| 757 | # http://lists-archives.com/git/713652-retrospectively-add-alternates-to-a-repository.html |
| 758 | self._Run(['repack', '-ad'], options) |
| 759 | self._Run(['repack', '-adl'], options) |
| 760 | except Exception: |
| 761 | # If something goes wrong, try to remove the altfile so we'll go down |
| 762 | # this path again next time. |
| 763 | try: |
| 764 | os.remove(altfile) |
iannucci@chromium.org | 578e5e5 | 2013-07-18 20:55:16 +0000 | [diff] [blame] | 765 | except OSError as e: |
| 766 | print >> sys.stderr, "FAILED: os.remove('%s') -> %s" % (altfile, e) |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 767 | raise |
| 768 | else: |
| 769 | if os.path.exists(altfile): |
| 770 | self._Run(['repack', '-a'], options) |
| 771 | os.remove(altfile) |
| 772 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 773 | def _CreateOrUpdateCache(self, url, options): |
| 774 | """Make a new git mirror or update existing mirror for |url|, and return the |
| 775 | mirror URI to clone from. |
| 776 | |
| 777 | If no cache-dir is specified, just return |url| unchanged. |
| 778 | """ |
| 779 | if not self.cache_dir: |
| 780 | return url |
| 781 | |
| 782 | # Replace - with -- to avoid ambiguity. / with - to flatten folder structure |
| 783 | folder = os.path.join( |
| 784 | self.cache_dir, |
| 785 | self._NormalizeGitURL(url).replace('-', '--').replace('/', '-')) |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 786 | altfile = os.path.join(folder, 'objects', 'info', 'alternates') |
| 787 | |
| 788 | # If we're bringing an old cache up to date or cloning a new cache, and the |
| 789 | # existing repo is currently a direct clone, use its objects to help out |
| 790 | # the fetch here. |
| 791 | checkout_objects = os.path.join(self.checkout_path, '.git', 'objects') |
| 792 | checkout_altfile = os.path.join(checkout_objects, 'info', 'alternates') |
| 793 | use_reference = ( |
| 794 | os.path.exists(checkout_objects) and |
| 795 | not os.path.exists(checkout_altfile)) |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 796 | |
| 797 | v = ['-v'] if options.verbose else [] |
| 798 | filter_fn = lambda l: '[up to date]' not in l |
| 799 | with self.cache_locks[folder]: |
| 800 | gclient_utils.safe_makedirs(self.cache_dir) |
| 801 | if not os.path.exists(os.path.join(folder, 'config')): |
| 802 | gclient_utils.rmtree(folder) |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 803 | cmd = ['clone'] + v + ['-c', 'core.deltaBaseCacheLimit=2g', |
| 804 | '--progress', '--mirror'] |
| 805 | |
| 806 | if use_reference: |
| 807 | cmd += ['--reference', os.path.abspath(self.checkout_path)] |
| 808 | |
| 809 | self._Run(cmd + [url, folder], |
agable@chromium.org | fd5b638 | 2013-10-25 20:54:34 +0000 | [diff] [blame] | 810 | options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True) |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 811 | else: |
| 812 | # For now, assert that host/path/to/repo.git is identical. We may want |
| 813 | # to relax this restriction in the future to allow for smarter cache |
| 814 | # repo update schemes (such as pulling the same repo, but from a |
| 815 | # different host). |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 816 | existing_url = self._Capture(['config', 'remote.%s.url' % self.remote], |
| 817 | cwd=folder) |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 818 | assert self._NormalizeGitURL(existing_url) == self._NormalizeGitURL(url) |
| 819 | |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 820 | if use_reference: |
| 821 | with open(altfile, 'w') as f: |
| 822 | f.write(os.path.abspath(checkout_objects)) |
| 823 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 824 | # Would normally use `git remote update`, but it doesn't support |
| 825 | # --progress, so use fetch instead. |
| 826 | self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'], |
agable@chromium.org | fd5b638 | 2013-10-25 20:54:34 +0000 | [diff] [blame] | 827 | options, filter_fn=filter_fn, cwd=folder, retry=True) |
iannucci@chromium.org | 976a14d | 2013-07-17 21:56:49 +0000 | [diff] [blame] | 828 | |
| 829 | # If the clone has an object dependency on the existing repo, break it |
| 830 | # with repack and remove the linkage. |
| 831 | if os.path.exists(altfile): |
| 832 | self._Run(['repack', '-a'], options, cwd=folder) |
| 833 | os.remove(altfile) |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 834 | return folder |
| 835 | |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 836 | def _Clone(self, revision, url, options): |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 837 | """Clone a git repository from the given URL. |
| 838 | |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 839 | Once we've cloned the repo, we checkout a working branch if the specified |
| 840 | revision is a branch head. If it is a tag or a specific commit, then we |
| 841 | leave HEAD detached as it makes future updates simpler -- in this case the |
| 842 | user should first create a new branch or switch to an existing branch before |
| 843 | making changes in the repo.""" |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 844 | if not options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 845 | # git clone doesn't seem to insert a newline properly before printing |
| 846 | # to stdout |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 847 | print('') |
szager@chromium.org | ecb7542 | 2013-07-12 21:57:33 +0000 | [diff] [blame] | 848 | template_path = os.path.join( |
| 849 | os.path.dirname(THIS_FILE_PATH), 'git-templates') |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 850 | clone_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'clone', '--no-checkout', |
| 851 | '--progress', '--template=%s' % template_path] |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 852 | if self.cache_dir: |
| 853 | clone_cmd.append('--shared') |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 854 | if options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 855 | clone_cmd.append('--verbose') |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 856 | clone_cmd.append(url) |
nsylvain@chromium.org | 328c3c7 | 2011-06-01 20:50:27 +0000 | [diff] [blame] | 857 | # If the parent directory does not exist, Git clone on Windows will not |
| 858 | # create it, so we need to do it manually. |
| 859 | parent_dir = os.path.dirname(self.checkout_path) |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 860 | gclient_utils.safe_makedirs(parent_dir) |
| 861 | tmp_dir = tempfile.mkdtemp( |
| 862 | prefix='_gclient_%s_' % os.path.basename(self.checkout_path), |
| 863 | dir=parent_dir) |
| 864 | try: |
| 865 | clone_cmd.append(tmp_dir) |
agable@chromium.org | fd5b638 | 2013-10-25 20:54:34 +0000 | [diff] [blame] | 866 | self._Run(clone_cmd, options, cwd=self._root_dir, retry=True) |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 867 | gclient_utils.safe_makedirs(self.checkout_path) |
cyrille@nnamrak.org | ef509e4 | 2013-09-20 13:19:08 +0000 | [diff] [blame] | 868 | gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'), |
| 869 | os.path.join(self.checkout_path, '.git')) |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 870 | finally: |
| 871 | if os.listdir(tmp_dir): |
| 872 | print('\n_____ removing non-empty tmp dir %s' % tmp_dir) |
| 873 | gclient_utils.rmtree(tmp_dir) |
| 874 | if revision.startswith('refs/heads/'): |
| 875 | self._Run( |
| 876 | ['checkout', '--quiet', revision.replace('refs/heads/', '')], options) |
| 877 | else: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 878 | # Squelch git's very verbose detached HEAD warning and use our own |
ilevy@chromium.org | 3534aa5 | 2013-07-20 01:58:08 +0000 | [diff] [blame] | 879 | self._Run(['checkout', '--quiet', revision], options) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 880 | print( |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 881 | ('Checked out %s to a detached HEAD. Before making any commits\n' |
| 882 | 'in this repo, you should use \'git checkout <branch>\' to switch to\n' |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 883 | 'an existing branch or use \'git checkout %s -b <branch>\' to\n' |
| 884 | 'create a new branch for your work.') % (revision, self.remote)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 885 | |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 886 | def _AttemptRebase(self, upstream, files, options, newbase=None, |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 887 | branch=None, printed_path=False): |
| 888 | """Attempt to rebase onto either upstream or, if specified, newbase.""" |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 889 | if files is not None: |
| 890 | files.extend(self._Capture(['diff', upstream, '--name-only']).split()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 891 | revision = upstream |
| 892 | if newbase: |
| 893 | revision = newbase |
| 894 | if not printed_path: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 895 | print('\n_____ %s : Attempting rebase onto %s...' % ( |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 896 | self.relpath, revision)) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 897 | printed_path = True |
| 898 | else: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 899 | print('Attempting rebase onto %s...' % revision) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 900 | |
| 901 | # Build the rebase command here using the args |
| 902 | # git rebase [options] [--onto <newbase>] <upstream> [<branch>] |
| 903 | rebase_cmd = ['rebase'] |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 904 | if options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 905 | rebase_cmd.append('--verbose') |
| 906 | if newbase: |
| 907 | rebase_cmd.extend(['--onto', newbase]) |
| 908 | rebase_cmd.append(upstream) |
| 909 | if branch: |
| 910 | rebase_cmd.append(branch) |
| 911 | |
| 912 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 913 | rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path) |
maruel@chromium.org | bffad37 | 2011-09-08 17:54:22 +0000 | [diff] [blame] | 914 | except subprocess2.CalledProcessError, e: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 915 | if (re.match(r'cannot rebase: you have unstaged changes', e.stderr) or |
| 916 | re.match(r'cannot rebase: your index contains uncommitted changes', |
| 917 | e.stderr)): |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 918 | while True: |
maruel@chromium.org | 9054173 | 2011-04-01 17:54:18 +0000 | [diff] [blame] | 919 | rebase_action = ask_for_data( |
| 920 | 'Cannot rebase because of unstaged changes.\n' |
| 921 | '\'git reset --hard HEAD\' ?\n' |
| 922 | 'WARNING: destroys any uncommitted work in your current branch!' |
bratell@opera.com | 18fa454 | 2013-05-21 13:30:46 +0000 | [diff] [blame] | 923 | ' (y)es / (q)uit / (s)how : ', options) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 924 | if re.match(r'yes|y', rebase_action, re.I): |
maruel@chromium.org | 37e8987 | 2010-09-07 16:11:33 +0000 | [diff] [blame] | 925 | self._Run(['reset', '--hard', 'HEAD'], options) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 926 | # Should this be recursive? |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 927 | rebase_output = scm.GIT.Capture(rebase_cmd, cwd=self.checkout_path) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 928 | break |
| 929 | elif re.match(r'quit|q', rebase_action, re.I): |
| 930 | raise gclient_utils.Error("Please merge or rebase manually\n" |
| 931 | "cd %s && git " % self.checkout_path |
| 932 | + "%s" % ' '.join(rebase_cmd)) |
| 933 | elif re.match(r'show|s', rebase_action, re.I): |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 934 | print('\n%s' % e.stderr.strip()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 935 | continue |
| 936 | else: |
| 937 | gclient_utils.Error("Input not recognized") |
| 938 | continue |
| 939 | elif re.search(r'^CONFLICT', e.stdout, re.M): |
| 940 | raise gclient_utils.Error("Conflict while rebasing this branch.\n" |
| 941 | "Fix the conflict and run gclient again.\n" |
| 942 | "See 'man git-rebase' for details.\n") |
| 943 | else: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 944 | print(e.stdout.strip()) |
| 945 | print('Rebase produced error output:\n%s' % e.stderr.strip()) |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 946 | raise gclient_utils.Error("Unrecognized error, please merge or rebase " |
| 947 | "manually.\ncd %s && git " % |
| 948 | self.checkout_path |
| 949 | + "%s" % ' '.join(rebase_cmd)) |
| 950 | |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 951 | print(rebase_output.strip()) |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 952 | if not options.verbose: |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 953 | # Make the output a little prettier. It's nice to have some |
| 954 | # whitespace between projects when syncing. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 955 | print('') |
nasser@codeaurora.org | d90ba3f | 2010-02-23 14:42:57 +0000 | [diff] [blame] | 956 | |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 957 | @staticmethod |
| 958 | def _CheckMinVersion(min_version): |
maruel@chromium.org | d0f854a | 2010-03-11 19:35:53 +0000 | [diff] [blame] | 959 | (ok, current_version) = scm.GIT.AssertVersion(min_version) |
| 960 | if not ok: |
| 961 | raise gclient_utils.Error('git version %s < minimum required %s' % |
| 962 | (current_version, min_version)) |
msb@chromium.org | 923a037 | 2009-12-11 20:42:43 +0000 | [diff] [blame] | 963 | |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 964 | def _IsRebasing(self): |
| 965 | # Check for any of REBASE-i/REBASE-m/REBASE/AM. Unfortunately git doesn't |
| 966 | # have a plumbing command to determine whether a rebase is in progress, so |
| 967 | # for now emualate (more-or-less) git-rebase.sh / git-completion.bash |
| 968 | g = os.path.join(self.checkout_path, '.git') |
| 969 | return ( |
| 970 | os.path.isdir(os.path.join(g, "rebase-merge")) or |
| 971 | os.path.isdir(os.path.join(g, "rebase-apply"))) |
| 972 | |
| 973 | def _CheckClean(self, rev_str): |
| 974 | # Make sure the tree is clean; see git-rebase.sh for reference |
| 975 | try: |
| 976 | scm.GIT.Capture(['update-index', '--ignore-submodules', '--refresh'], |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 977 | cwd=self.checkout_path) |
maruel@chromium.org | bffad37 | 2011-09-08 17:54:22 +0000 | [diff] [blame] | 978 | except subprocess2.CalledProcessError: |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 979 | raise gclient_utils.Error('\n____ %s%s\n' |
| 980 | '\tYou have unstaged changes.\n' |
| 981 | '\tPlease commit, stash, or reset.\n' |
| 982 | % (self.relpath, rev_str)) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 983 | try: |
| 984 | scm.GIT.Capture(['diff-index', '--cached', '--name-status', '-r', |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 985 | '--ignore-submodules', 'HEAD', '--'], |
| 986 | cwd=self.checkout_path) |
maruel@chromium.org | bffad37 | 2011-09-08 17:54:22 +0000 | [diff] [blame] | 987 | except subprocess2.CalledProcessError: |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 988 | raise gclient_utils.Error('\n____ %s%s\n' |
| 989 | '\tYour index contains uncommitted changes\n' |
| 990 | '\tPlease commit, stash, or reset.\n' |
| 991 | % (self.relpath, rev_str)) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 992 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 993 | def _CheckDetachedHead(self, rev_str, _options): |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 994 | # HEAD is detached. Make sure it is safe to move away from (i.e., it is |
| 995 | # reference by a commit). If not, error out -- most likely a rebase is |
| 996 | # in progress, try to detect so we can give a better error. |
| 997 | try: |
maruel@chromium.org | ad80e3b | 2010-09-09 14:18:28 +0000 | [diff] [blame] | 998 | scm.GIT.Capture(['name-rev', '--no-undefined', 'HEAD'], |
| 999 | cwd=self.checkout_path) |
maruel@chromium.org | bffad37 | 2011-09-08 17:54:22 +0000 | [diff] [blame] | 1000 | except subprocess2.CalledProcessError: |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 1001 | # Commit is not contained by any rev. See if the user is rebasing: |
| 1002 | if self._IsRebasing(): |
| 1003 | # Punt to the user |
| 1004 | raise gclient_utils.Error('\n____ %s%s\n' |
| 1005 | '\tAlready in a conflict, i.e. (no branch).\n' |
| 1006 | '\tFix the conflict and run gclient again.\n' |
| 1007 | '\tOr to abort run:\n\t\tgit-rebase --abort\n' |
| 1008 | '\tSee man git-rebase for details.\n' |
| 1009 | % (self.relpath, rev_str)) |
| 1010 | # Let's just save off the commit so we can proceed. |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 1011 | name = ('saved-by-gclient-' + |
| 1012 | self._Capture(['rev-parse', '--short', 'HEAD'])) |
mmoss@chromium.org | 77bd736 | 2013-09-25 23:46:14 +0000 | [diff] [blame] | 1013 | self._Capture(['branch', '-f', name]) |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 1014 | print('\n_____ found an unreferenced commit and saved it as \'%s\'' % |
maruel@chromium.org | f5d37bf | 2010-09-02 00:50:34 +0000 | [diff] [blame] | 1015 | name) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 1016 | |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1017 | def _GetCurrentBranch(self): |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 1018 | # Returns name of current branch or None for detached HEAD |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 1019 | branch = self._Capture(['rev-parse', '--abbrev-ref=strict', 'HEAD']) |
msb@chromium.org | 786fb68 | 2010-06-02 15:16:23 +0000 | [diff] [blame] | 1020 | if branch == 'HEAD': |
msb@chromium.org | 5bde485 | 2009-12-14 16:47:12 +0000 | [diff] [blame] | 1021 | return None |
| 1022 | return branch |
| 1023 | |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 1024 | def _Capture(self, args, cwd=None): |
maruel@chromium.org | bffad37 | 2011-09-08 17:54:22 +0000 | [diff] [blame] | 1025 | return subprocess2.check_output( |
maruel@chromium.org | 87e6d33 | 2011-09-09 19:01:28 +0000 | [diff] [blame] | 1026 | ['git'] + args, |
ilevy@chromium.org | f6f5840 | 2013-05-22 00:14:32 +0000 | [diff] [blame] | 1027 | stderr=subprocess2.VOID, |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 1028 | cwd=cwd or self.checkout_path).strip() |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 1029 | |
mmoss@chromium.org | e409df6 | 2013-04-16 17:28:57 +0000 | [diff] [blame] | 1030 | def _UpdateBranchHeads(self, options, fetch=False): |
| 1031 | """Adds, and optionally fetches, "branch-heads" refspecs if requested.""" |
| 1032 | if hasattr(options, 'with_branch_heads') and options.with_branch_heads: |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 1033 | config_cmd = ['config', 'remote.%s.fetch' % self.remote, |
szager@chromium.org | f2d7d6b | 2013-10-17 20:41:43 +0000 | [diff] [blame] | 1034 | '+refs/branch-heads/*:refs/remotes/branch-heads/*', |
| 1035 | '^\\+refs/branch-heads/\\*:.*$'] |
| 1036 | self._Run(config_cmd, options) |
| 1037 | if fetch: |
maruel@chromium.org | 1a60dca | 2013-11-26 14:06:26 +0000 | [diff] [blame] | 1038 | fetch_cmd = ['-c', 'core.deltaBaseCacheLimit=2g', 'fetch', self.remote] |
szager@chromium.org | f2d7d6b | 2013-10-17 20:41:43 +0000 | [diff] [blame] | 1039 | if options.verbose: |
| 1040 | fetch_cmd.append('--verbose') |
| 1041 | self._Run(fetch_cmd, options, retry=True) |
mmoss@chromium.org | e409df6 | 2013-04-16 17:28:57 +0000 | [diff] [blame] | 1042 | |
agable@chromium.org | fd5b638 | 2013-10-25 20:54:34 +0000 | [diff] [blame] | 1043 | def _Run(self, args, options, **kwargs): |
maruel@chromium.org | 6cafa13 | 2010-09-07 14:17:26 +0000 | [diff] [blame] | 1044 | kwargs.setdefault('cwd', self.checkout_path) |
agable@chromium.org | fd5b638 | 2013-10-25 20:54:34 +0000 | [diff] [blame] | 1045 | git_filter = not options.verbose |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 1046 | if git_filter: |
scottmg@chromium.org | f547c80 | 2013-09-27 17:55:26 +0000 | [diff] [blame] | 1047 | kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn')) |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 1048 | kwargs.setdefault('print_stdout', False) |
szager@chromium.org | 7f834ad | 2013-07-10 00:22:17 +0000 | [diff] [blame] | 1049 | # Don't prompt for passwords; just fail quickly and noisily. |
szager@chromium.org | 3ce4184 | 2013-07-11 17:38:57 +0000 | [diff] [blame] | 1050 | # By default, git will use an interactive terminal prompt when a username/ |
| 1051 | # password is needed. That shouldn't happen in the chromium workflow, |
| 1052 | # and if it does, then gclient may hide the prompt in the midst of a flood |
| 1053 | # of terminal spew. The only indication that something has gone wrong |
| 1054 | # will be when gclient hangs unresponsively. Instead, we disable the |
| 1055 | # password prompt and simply allow git to fail noisily. The error |
| 1056 | # message produced by git will be copied to gclient's output. |
szager@chromium.org | 7f834ad | 2013-07-10 00:22:17 +0000 | [diff] [blame] | 1057 | env = kwargs.get('env') or kwargs.setdefault('env', os.environ.copy()) |
| 1058 | env.setdefault('GIT_ASKPASS', 'true') |
| 1059 | env.setdefault('SSH_ASKPASS', 'true') |
iannucci@chromium.org | 53456aa | 2013-07-03 19:38:34 +0000 | [diff] [blame] | 1060 | else: |
| 1061 | kwargs.setdefault('print_stdout', True) |
szager@google.com | 85d3e3a | 2011-10-07 17:12:00 +0000 | [diff] [blame] | 1062 | stdout = kwargs.get('stdout', sys.stdout) |
| 1063 | stdout.write('\n________ running \'git %s\' in \'%s\'\n' % ( |
| 1064 | ' '.join(args), kwargs['cwd'])) |
| 1065 | gclient_utils.CheckCallAndFilter(['git'] + args, **kwargs) |
msb@chromium.org | e28e498 | 2009-09-25 20:51:45 +0000 | [diff] [blame] | 1066 | |
| 1067 | |
maruel@chromium.org | 55e724e | 2010-03-11 19:36:49 +0000 | [diff] [blame] | 1068 | class SVNWrapper(SCMWrapper): |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 1069 | """ Wrapper for SVN """ |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 1070 | name = 'svn' |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1071 | |
mukai@chromium.org | 9e3e82c | 2012-04-18 12:55:43 +0000 | [diff] [blame] | 1072 | @staticmethod |
| 1073 | def BinaryExists(): |
| 1074 | """Returns true if the command exists.""" |
| 1075 | try: |
| 1076 | result, version = scm.SVN.AssertVersion('1.4') |
| 1077 | if not result: |
| 1078 | raise gclient_utils.Error('SVN version is older than 1.4: %s' % version) |
| 1079 | return result |
| 1080 | except OSError: |
| 1081 | return False |
| 1082 | |
xusydoc@chromium.org | 885a960 | 2013-05-31 09:54:40 +0000 | [diff] [blame] | 1083 | def GetCheckoutRoot(self): |
| 1084 | return scm.SVN.GetCheckoutRoot(self.checkout_path) |
| 1085 | |
floitsch@google.com | eaab784 | 2011-04-28 09:07:58 +0000 | [diff] [blame] | 1086 | def GetRevisionDate(self, revision): |
| 1087 | """Returns the given revision's date in ISO-8601 format (which contains the |
| 1088 | time zone).""" |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 1089 | date = scm.SVN.Capture( |
| 1090 | ['propget', '--revprop', 'svn:date', '-r', revision], |
| 1091 | os.path.join(self.checkout_path, '.')) |
floitsch@google.com | eaab784 | 2011-04-28 09:07:58 +0000 | [diff] [blame] | 1092 | return date.strip() |
| 1093 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 1094 | def cleanup(self, options, args, _file_list): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1095 | """Cleanup working copy.""" |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1096 | self._Run(['cleanup'] + args, options) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1097 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 1098 | def diff(self, options, args, _file_list): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1099 | # NOTE: This function does not currently modify file_list. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1100 | if not os.path.isdir(self.checkout_path): |
| 1101 | raise gclient_utils.Error('Directory %s is not present.' % |
| 1102 | self.checkout_path) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1103 | self._Run(['diff'] + args, options) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1104 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 1105 | def pack(self, _options, args, _file_list): |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 1106 | """Generates a patch file which can be applied to the root of the |
| 1107 | repository.""" |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1108 | if not os.path.isdir(self.checkout_path): |
| 1109 | raise gclient_utils.Error('Directory %s is not present.' % |
| 1110 | self.checkout_path) |
| 1111 | gclient_utils.CheckCallAndFilter( |
| 1112 | ['svn', 'diff', '-x', '--ignore-eol-style'] + args, |
| 1113 | cwd=self.checkout_path, |
| 1114 | print_stdout=False, |
haitao.feng@intel.com | 306080c | 2012-05-04 13:11:29 +0000 | [diff] [blame] | 1115 | filter_fn=SvnDiffFilterer(self.relpath).Filter) |
maruel@chromium.org | ee4071d | 2009-12-22 22:25:37 +0000 | [diff] [blame] | 1116 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1117 | def update(self, options, args, file_list): |
msb@chromium.org | d650421 | 2010-01-13 17:34:31 +0000 | [diff] [blame] | 1118 | """Runs svn to update or transparently checkout the working copy. |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1119 | |
| 1120 | All updated files will be appended to file_list. |
| 1121 | |
| 1122 | Raises: |
| 1123 | Error: if can't get URL for relative path. |
| 1124 | """ |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 1125 | # Only update if git or hg is not controlling the directory. |
| 1126 | git_path = os.path.join(self.checkout_path, '.git') |
| 1127 | if os.path.exists(git_path): |
| 1128 | print('________ found .git directory; skipping %s' % self.relpath) |
| 1129 | return |
| 1130 | |
| 1131 | hg_path = os.path.join(self.checkout_path, '.hg') |
| 1132 | if os.path.exists(hg_path): |
| 1133 | print('________ found .hg directory; skipping %s' % self.relpath) |
| 1134 | return |
| 1135 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1136 | if args: |
| 1137 | raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args)) |
| 1138 | |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 1139 | # revision is the revision to match. It is None if no revision is specified, |
| 1140 | # i.e. the 'deps ain't pinned'. |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 1141 | url, revision = gclient_utils.SplitUrlRevision(self.url) |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 1142 | # Keep the original unpinned url for reference in case the repo is switched. |
| 1143 | base_url = url |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1144 | managed = True |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1145 | if options.revision: |
| 1146 | # Override the revision number. |
msb@chromium.org | ac915bb | 2009-11-13 17:03:01 +0000 | [diff] [blame] | 1147 | revision = str(options.revision) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1148 | if revision: |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1149 | if revision != 'unmanaged': |
| 1150 | forced_revision = True |
| 1151 | # Reconstruct the url. |
| 1152 | url = '%s@%s' % (url, revision) |
| 1153 | rev_str = ' at %s' % revision |
| 1154 | else: |
| 1155 | managed = False |
| 1156 | revision = None |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 1157 | else: |
| 1158 | forced_revision = False |
| 1159 | rev_str = '' |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1160 | |
davidjames@chromium.org | 13349e2 | 2012-11-15 17:11:28 +0000 | [diff] [blame] | 1161 | # Get the existing scm url and the revision number of the current checkout. |
| 1162 | exists = os.path.exists(self.checkout_path) |
| 1163 | if exists and managed: |
| 1164 | try: |
| 1165 | from_info = scm.SVN.CaptureLocalInfo( |
| 1166 | [], os.path.join(self.checkout_path, '.')) |
| 1167 | except (gclient_utils.Error, subprocess2.CalledProcessError): |
| 1168 | if options.reset and options.delete_unversioned_trees: |
| 1169 | print 'Removing troublesome path %s' % self.checkout_path |
| 1170 | gclient_utils.rmtree(self.checkout_path) |
| 1171 | exists = False |
| 1172 | else: |
| 1173 | msg = ('Can\'t update/checkout %s if an unversioned directory is ' |
| 1174 | 'present. Delete the directory and try again.') |
| 1175 | raise gclient_utils.Error(msg % self.checkout_path) |
| 1176 | |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 1177 | BASE_URLS = { |
| 1178 | '/chrome/trunk/src': 'gs://chromium-svn-checkout/chrome/', |
| 1179 | '/blink/trunk': 'gs://chromium-svn-checkout/blink/', |
| 1180 | } |
hinoka@google.com | ca35be3 | 2014-01-17 01:48:18 +0000 | [diff] [blame] | 1181 | WHITELISTED_ROOTS = [ |
| 1182 | 'svn://svn.chromium.org', |
| 1183 | 'svn://svn-mirror.golo.chromium.org', |
| 1184 | ] |
davidjames@chromium.org | 13349e2 | 2012-11-15 17:11:28 +0000 | [diff] [blame] | 1185 | if not exists: |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 1186 | try: |
| 1187 | # Split out the revision number since it's not useful for us. |
| 1188 | base_path = urlparse.urlparse(url).path.split('@')[0] |
hinoka@google.com | ca35be3 | 2014-01-17 01:48:18 +0000 | [diff] [blame] | 1189 | # Check to see if we're on a whitelisted root. We do this because |
| 1190 | # only some svn servers have matching UUIDs. |
| 1191 | local_parsed = urlparse.urlparse(url) |
| 1192 | local_root = '%s://%s' % (local_parsed.scheme, local_parsed.netloc) |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 1193 | if ('CHROME_HEADLESS' in os.environ |
| 1194 | and sys.platform == 'linux2' # TODO(hinoka): Enable for win/mac. |
hinoka@google.com | ca35be3 | 2014-01-17 01:48:18 +0000 | [diff] [blame] | 1195 | and base_path in BASE_URLS |
| 1196 | and local_root in WHITELISTED_ROOTS): |
| 1197 | |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 1198 | # Use a tarball for initial sync if we are on a bot. |
| 1199 | # Get an unauthenticated gsutil instance. |
| 1200 | gsutil = download_from_google_storage.Gsutil( |
| 1201 | GSUTIL_DEFAULT_PATH, boto_path=os.devnull) |
| 1202 | |
| 1203 | gs_path = BASE_URLS[base_path] |
| 1204 | _, out, _ = gsutil.check_call('ls', gs_path) |
| 1205 | # So that we can get the most recent revision. |
| 1206 | sorted_items = sorted(out.splitlines()) |
| 1207 | latest_checkout = sorted_items[-1] |
| 1208 | |
| 1209 | tempdir = tempfile.mkdtemp() |
| 1210 | print 'Downloading %s...' % latest_checkout |
| 1211 | code, out, err = gsutil.check_call('cp', latest_checkout, tempdir) |
| 1212 | if code: |
| 1213 | print '%s\n%s' % (out, err) |
| 1214 | raise Exception() |
| 1215 | filename = latest_checkout.split('/')[-1] |
| 1216 | tarball = os.path.join(tempdir, filename) |
| 1217 | print 'Unpacking into %s...' % self.checkout_path |
| 1218 | gclient_utils.safe_makedirs(self.checkout_path) |
| 1219 | # TODO(hinoka): Use 7z for windows. |
| 1220 | cmd = ['tar', '--extract', '--ungzip', |
| 1221 | '--directory', self.checkout_path, |
| 1222 | '--file', tarball] |
| 1223 | gclient_utils.CheckCallAndFilter( |
| 1224 | cmd, stdout=sys.stdout, print_stdout=True) |
| 1225 | |
| 1226 | print 'Deleting temp file' |
| 1227 | gclient_utils.rmtree(tempdir) |
| 1228 | |
| 1229 | # Rewrite the repository root to match. |
| 1230 | tarball_url = scm.SVN.CaptureLocalInfo( |
| 1231 | ['.'], self.checkout_path)['Repository Root'] |
| 1232 | tarball_parsed = urlparse.urlparse(tarball_url) |
| 1233 | tarball_root = '%s://%s' % (tarball_parsed.scheme, |
| 1234 | tarball_parsed.netloc) |
hinoka@google.com | 2f2ca14 | 2014-01-07 03:59:18 +0000 | [diff] [blame] | 1235 | |
| 1236 | if tarball_root != local_root: |
| 1237 | print 'Switching repository root to %s' % local_root |
| 1238 | self._Run(['switch', '--relocate', tarball_root, |
| 1239 | local_root, self.checkout_path], |
| 1240 | options) |
| 1241 | except Exception as e: |
| 1242 | print 'We tried to get a source tarball but failed.' |
| 1243 | print 'Resuming normal operations.' |
| 1244 | print str(e) |
| 1245 | |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 1246 | gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path)) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1247 | # We need to checkout. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1248 | command = ['checkout', url, self.checkout_path] |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 1249 | command = self._AddAdditionalUpdateFlags(command, options, revision) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1250 | self._RunAndGetFileList(command, options, file_list, self._root_dir) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 1251 | return self.Svnversion() |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1252 | |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1253 | if not managed: |
| 1254 | print ('________ unmanaged solution; skipping %s' % self.relpath) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 1255 | return self.Svnversion() |
cmp@chromium.org | eb2756d | 2011-09-20 20:17:51 +0000 | [diff] [blame] | 1256 | |
maruel@chromium.org | 49fcb0c | 2011-09-23 14:34:38 +0000 | [diff] [blame] | 1257 | if 'URL' not in from_info: |
| 1258 | raise gclient_utils.Error( |
| 1259 | ('gclient is confused. Couldn\'t get the url for %s.\n' |
| 1260 | 'Try using @unmanaged.\n%s') % ( |
| 1261 | self.checkout_path, from_info)) |
| 1262 | |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 1263 | # Look for locked directories. |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 1264 | dir_info = scm.SVN.CaptureStatus( |
| 1265 | None, os.path.join(self.checkout_path, '.')) |
phajdan.jr@chromium.org | d558c4b | 2011-09-22 18:56:24 +0000 | [diff] [blame] | 1266 | if any(d[0][2] == 'L' for d in dir_info): |
| 1267 | try: |
| 1268 | self._Run(['cleanup', self.checkout_path], options) |
| 1269 | except subprocess2.CalledProcessError, e: |
| 1270 | # Get the status again, svn cleanup may have cleaned up at least |
| 1271 | # something. |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 1272 | dir_info = scm.SVN.CaptureStatus( |
| 1273 | None, os.path.join(self.checkout_path, '.')) |
phajdan.jr@chromium.org | d558c4b | 2011-09-22 18:56:24 +0000 | [diff] [blame] | 1274 | |
| 1275 | # Try to fix the failures by removing troublesome files. |
| 1276 | for d in dir_info: |
| 1277 | if d[0][2] == 'L': |
| 1278 | if d[0][0] == '!' and options.force: |
kustermann@google.com | 1580d95 | 2013-08-19 07:31:40 +0000 | [diff] [blame] | 1279 | # We don't pass any files/directories to CaptureStatus and set |
| 1280 | # cwd=self.checkout_path, so we should get relative paths here. |
| 1281 | assert not os.path.isabs(d[1]) |
| 1282 | path_to_remove = os.path.normpath( |
| 1283 | os.path.join(self.checkout_path, d[1])) |
| 1284 | print 'Removing troublesome path %s' % path_to_remove |
| 1285 | gclient_utils.rmtree(path_to_remove) |
phajdan.jr@chromium.org | d558c4b | 2011-09-22 18:56:24 +0000 | [diff] [blame] | 1286 | else: |
| 1287 | print 'Not removing troublesome path %s automatically.' % d[1] |
| 1288 | if d[0][0] == '!': |
| 1289 | print 'You can pass --force to enable automatic removal.' |
| 1290 | raise e |
maruel@chromium.org | e407c9a | 2010-08-09 19:11:37 +0000 | [diff] [blame] | 1291 | |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 1292 | # Retrieve the current HEAD version because svn is slow at null updates. |
| 1293 | if options.manually_grab_svn_rev and not revision: |
maruel@chromium.org | d579fcf | 2011-12-13 20:36:03 +0000 | [diff] [blame] | 1294 | from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL']) |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 1295 | revision = str(from_info_live['Revision']) |
| 1296 | rev_str = ' at %s' % revision |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1297 | |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 1298 | if from_info['URL'] != base_url: |
| 1299 | # The repository url changed, need to switch. |
| 1300 | try: |
| 1301 | to_info = scm.SVN.CaptureRemoteInfo(url) |
| 1302 | except (gclient_utils.Error, subprocess2.CalledProcessError): |
| 1303 | # The url is invalid or the server is not accessible, it's safer to bail |
| 1304 | # out right now. |
| 1305 | raise gclient_utils.Error('This url is unreachable: %s' % url) |
| 1306 | can_switch = ((from_info['Repository Root'] != to_info['Repository Root']) |
| 1307 | and (from_info['UUID'] == to_info['UUID'])) |
| 1308 | if can_switch: |
| 1309 | print('\n_____ relocating %s to a new checkout' % self.relpath) |
| 1310 | # We have different roots, so check if we can switch --relocate. |
| 1311 | # Subversion only permits this if the repository UUIDs match. |
| 1312 | # Perform the switch --relocate, then rewrite the from_url |
| 1313 | # to reflect where we "are now." (This is the same way that |
| 1314 | # Subversion itself handles the metadata when switch --relocate |
| 1315 | # is used.) This makes the checks below for whether we |
| 1316 | # can update to a revision or have to switch to a different |
| 1317 | # branch work as expected. |
| 1318 | # TODO(maruel): TEST ME ! |
| 1319 | command = ['switch', '--relocate', |
| 1320 | from_info['Repository Root'], |
| 1321 | to_info['Repository Root'], |
| 1322 | self.relpath] |
| 1323 | self._Run(command, options, cwd=self._root_dir) |
| 1324 | from_info['URL'] = from_info['URL'].replace( |
| 1325 | from_info['Repository Root'], |
| 1326 | to_info['Repository Root']) |
| 1327 | else: |
| 1328 | if not options.force and not options.reset: |
| 1329 | # Look for local modifications but ignore unversioned files. |
| 1330 | for status in scm.SVN.CaptureStatus(None, self.checkout_path): |
| 1331 | if status[0][0] != '?': |
| 1332 | raise gclient_utils.Error( |
| 1333 | ('Can\'t switch the checkout to %s; UUID don\'t match and ' |
| 1334 | 'there is local changes in %s. Delete the directory and ' |
| 1335 | 'try again.') % (url, self.checkout_path)) |
| 1336 | # Ok delete it. |
| 1337 | print('\n_____ switching %s to a new checkout' % self.relpath) |
| 1338 | gclient_utils.rmtree(self.checkout_path) |
| 1339 | # We need to checkout. |
| 1340 | command = ['checkout', url, self.checkout_path] |
| 1341 | command = self._AddAdditionalUpdateFlags(command, options, revision) |
| 1342 | self._RunAndGetFileList(command, options, file_list, self._root_dir) |
| 1343 | return self.Svnversion() |
| 1344 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1345 | # If the provided url has a revision number that matches the revision |
| 1346 | # 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] | 1347 | if not options.force and str(from_info['Revision']) == revision: |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1348 | if options.verbose or not forced_revision: |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 1349 | print('\n_____ %s%s' % (self.relpath, rev_str)) |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1350 | else: |
| 1351 | command = ['update', self.checkout_path] |
| 1352 | command = self._AddAdditionalUpdateFlags(command, options, revision) |
| 1353 | self._RunAndGetFileList(command, options, file_list, self._root_dir) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1354 | |
steveblock@chromium.org | 98e6945 | 2012-02-16 16:36:43 +0000 | [diff] [blame] | 1355 | # If --reset and --delete_unversioned_trees are specified, remove any |
| 1356 | # untracked files and directories. |
| 1357 | if options.reset and options.delete_unversioned_trees: |
| 1358 | for status in scm.SVN.CaptureStatus(None, self.checkout_path): |
| 1359 | full_path = os.path.join(self.checkout_path, status[1]) |
| 1360 | if (status[0][0] == '?' |
| 1361 | and os.path.isdir(full_path) |
| 1362 | and not os.path.islink(full_path)): |
| 1363 | print('\n_____ removing unversioned directory %s' % status[1]) |
digit@chromium.org | dc112ac | 2013-04-24 13:00:19 +0000 | [diff] [blame] | 1364 | gclient_utils.rmtree(full_path) |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 1365 | return self.Svnversion() |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1366 | |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 1367 | def updatesingle(self, options, args, file_list): |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 1368 | filename = args.pop() |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 1369 | if scm.SVN.AssertVersion("1.5")[0]: |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1370 | 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] | 1371 | # Create an empty checkout and then update the one file we want. Future |
| 1372 | # operations will only apply to the one file we checked out. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1373 | command = ["checkout", "--depth", "empty", self.url, self.checkout_path] |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1374 | self._Run(command, options, cwd=self._root_dir) |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1375 | if os.path.exists(os.path.join(self.checkout_path, filename)): |
| 1376 | os.remove(os.path.join(self.checkout_path, filename)) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 1377 | command = ["update", filename] |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1378 | self._RunAndGetFileList(command, options, file_list) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 1379 | # After the initial checkout, we can use update as if it were any other |
| 1380 | # dep. |
| 1381 | self.update(options, args, file_list) |
| 1382 | else: |
| 1383 | # If the installed version of SVN doesn't support --depth, fallback to |
| 1384 | # just exporting the file. This has the downside that revision |
| 1385 | # information is not stored next to the file, so we will have to |
| 1386 | # re-export the file every time we sync. |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1387 | if not os.path.exists(self.checkout_path): |
maruel@chromium.org | 6c48a30 | 2011-10-20 23:44:20 +0000 | [diff] [blame] | 1388 | gclient_utils.safe_makedirs(self.checkout_path) |
tony@chromium.org | 5756466 | 2010-04-14 02:35:12 +0000 | [diff] [blame] | 1389 | command = ["export", os.path.join(self.url, filename), |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1390 | os.path.join(self.checkout_path, filename)] |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 1391 | command = self._AddAdditionalUpdateFlags(command, options, |
| 1392 | options.revision) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1393 | self._Run(command, options, cwd=self._root_dir) |
tony@chromium.org | 4b5b177 | 2010-04-08 01:52:56 +0000 | [diff] [blame] | 1394 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 1395 | def revert(self, options, _args, file_list): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1396 | """Reverts local modifications. Subversion specific. |
| 1397 | |
| 1398 | All reverted files will be appended to file_list, even if Subversion |
| 1399 | doesn't know about them. |
| 1400 | """ |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1401 | if not os.path.isdir(self.checkout_path): |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 1402 | if os.path.exists(self.checkout_path): |
| 1403 | gclient_utils.rmtree(self.checkout_path) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1404 | # svn revert won't work if the directory doesn't exist. It needs to |
| 1405 | # checkout instead. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 1406 | print('\n_____ %s is missing, synching instead' % self.relpath) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1407 | # Don't reuse the args. |
| 1408 | return self.update(options, [], file_list) |
| 1409 | |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 1410 | if not os.path.isdir(os.path.join(self.checkout_path, '.svn')): |
thakis@chromium.org | 0a0e310 | 2014-01-17 16:57:09 +0000 | [diff] [blame] | 1411 | if os.path.isdir(os.path.join(self.checkout_path, '.git')): |
| 1412 | print('________ found .git directory; skipping %s' % self.relpath) |
| 1413 | return |
| 1414 | if os.path.isdir(os.path.join(self.checkout_path, '.hg')): |
| 1415 | print('________ found .hg directory; skipping %s' % self.relpath) |
| 1416 | return |
maruel@chromium.org | c0cc087 | 2011-10-12 17:02:41 +0000 | [diff] [blame] | 1417 | if not options.force: |
| 1418 | raise gclient_utils.Error('Invalid checkout path, aborting') |
| 1419 | print( |
| 1420 | '\n_____ %s is not a valid svn checkout, synching instead' % |
| 1421 | self.relpath) |
| 1422 | gclient_utils.rmtree(self.checkout_path) |
| 1423 | # Don't reuse the args. |
| 1424 | return self.update(options, [], file_list) |
| 1425 | |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 1426 | def printcb(file_status): |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 1427 | if file_list is not None: |
| 1428 | file_list.append(file_status[1]) |
maruel@chromium.org | aa3dd47 | 2009-09-21 19:02:48 +0000 | [diff] [blame] | 1429 | if logging.getLogger().isEnabledFor(logging.INFO): |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 1430 | logging.info('%s%s' % (file_status[0], file_status[1])) |
maruel@chromium.org | aa3dd47 | 2009-09-21 19:02:48 +0000 | [diff] [blame] | 1431 | else: |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 1432 | print(os.path.join(self.checkout_path, file_status[1])) |
| 1433 | scm.SVN.Revert(self.checkout_path, callback=printcb) |
maruel@chromium.org | aa3dd47 | 2009-09-21 19:02:48 +0000 | [diff] [blame] | 1434 | |
maruel@chromium.org | 8b322b3 | 2011-11-01 19:05:50 +0000 | [diff] [blame] | 1435 | # Revert() may delete the directory altogether. |
| 1436 | if not os.path.isdir(self.checkout_path): |
| 1437 | # Don't reuse the args. |
| 1438 | return self.update(options, [], file_list) |
| 1439 | |
maruel@chromium.org | 810a50b | 2009-10-05 23:03:18 +0000 | [diff] [blame] | 1440 | try: |
| 1441 | # svn revert is so broken we don't even use it. Using |
| 1442 | # "svn up --revision BASE" achieve the same effect. |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 1443 | # file_list will contain duplicates. |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1444 | self._RunAndGetFileList(['update', '--revision', 'BASE'], options, |
| 1445 | file_list) |
maruel@chromium.org | 810a50b | 2009-10-05 23:03:18 +0000 | [diff] [blame] | 1446 | except OSError, e: |
maruel@chromium.org | 07ab60e | 2011-02-08 21:54:00 +0000 | [diff] [blame] | 1447 | # Maybe the directory disapeared meanwhile. Do not throw an exception. |
maruel@chromium.org | 810a50b | 2009-10-05 23:03:18 +0000 | [diff] [blame] | 1448 | logging.error('Failed to update:\n%s' % str(e)) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1449 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 1450 | def revinfo(self, _options, _args, _file_list): |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 1451 | """Display revision""" |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 1452 | try: |
| 1453 | return scm.SVN.CaptureRevision(self.checkout_path) |
maruel@chromium.org | 31cb48a | 2011-04-04 18:01:36 +0000 | [diff] [blame] | 1454 | except (gclient_utils.Error, subprocess2.CalledProcessError): |
maruel@chromium.org | 54019f3 | 2010-09-09 13:50:11 +0000 | [diff] [blame] | 1455 | return None |
msb@chromium.org | 0f28206 | 2009-11-06 20:14:02 +0000 | [diff] [blame] | 1456 | |
msb@chromium.org | cb5442b | 2009-09-22 16:51:24 +0000 | [diff] [blame] | 1457 | def runhooks(self, options, args, file_list): |
| 1458 | self.status(options, args, file_list) |
| 1459 | |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1460 | def status(self, options, args, file_list): |
| 1461 | """Display status information.""" |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1462 | command = ['status'] + args |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1463 | if not os.path.isdir(self.checkout_path): |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1464 | # svn status won't work if the directory doesn't exist. |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 1465 | print(('\n________ couldn\'t run \'%s\' in \'%s\':\n' |
| 1466 | 'The directory does not exist.') % |
| 1467 | (' '.join(command), self.checkout_path)) |
maruel@chromium.org | 5f3eee3 | 2009-09-17 00:34:30 +0000 | [diff] [blame] | 1468 | # There's no file list to retrieve. |
| 1469 | else: |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1470 | self._RunAndGetFileList(command, options, file_list) |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 1471 | |
iannucci@chromium.org | 396e1a6 | 2013-07-03 19:41:04 +0000 | [diff] [blame] | 1472 | def GetUsableRev(self, rev, _options): |
dbeam@chromium.org | e5d1e61 | 2011-12-19 19:49:19 +0000 | [diff] [blame] | 1473 | """Verifies the validity of the revision for this repository.""" |
| 1474 | if not scm.SVN.IsValidRevision(url='%s@%s' % (self.url, rev)): |
| 1475 | raise gclient_utils.Error( |
| 1476 | ( '%s isn\'t a valid revision. Please check that your safesync_url is\n' |
| 1477 | 'correct.') % rev) |
| 1478 | return rev |
| 1479 | |
msb@chromium.org | e6f7835 | 2010-01-13 17:05:33 +0000 | [diff] [blame] | 1480 | def FullUrlForRelativeUrl(self, url): |
| 1481 | # Find the forth '/' and strip from there. A bit hackish. |
| 1482 | return '/'.join(self.url.split('/')[:4]) + url |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 1483 | |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1484 | def _Run(self, args, options, **kwargs): |
| 1485 | """Runs a commands that goes to stdout.""" |
maruel@chromium.org | 8469bf9 | 2010-09-03 19:03:15 +0000 | [diff] [blame] | 1486 | kwargs.setdefault('cwd', self.checkout_path) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1487 | gclient_utils.CheckCallAndFilterAndHeader(['svn'] + args, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 1488 | always=options.verbose, **kwargs) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1489 | |
iannucci@chromium.org | 2702bcd | 2013-09-24 19:10:07 +0000 | [diff] [blame] | 1490 | def Svnversion(self): |
| 1491 | """Runs the lowest checked out revision in the current project.""" |
| 1492 | info = scm.SVN.CaptureLocalInfo([], os.path.join(self.checkout_path, '.')) |
| 1493 | return info['Revision'] |
| 1494 | |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1495 | def _RunAndGetFileList(self, args, options, file_list, cwd=None): |
| 1496 | """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] | 1497 | cwd = cwd or self.checkout_path |
maruel@chromium.org | ce117f6 | 2011-01-17 20:04:25 +0000 | [diff] [blame] | 1498 | scm.SVN.RunAndGetFileList( |
| 1499 | options.verbose, |
| 1500 | args + ['--ignore-externals'], |
| 1501 | cwd=cwd, |
maruel@chromium.org | 77e4eca | 2010-09-21 13:23:07 +0000 | [diff] [blame] | 1502 | file_list=file_list) |
maruel@chromium.org | 669600d | 2010-09-01 19:06:31 +0000 | [diff] [blame] | 1503 | |
maruel@chromium.org | 6e29d57 | 2010-06-04 17:32:20 +0000 | [diff] [blame] | 1504 | @staticmethod |
maruel@chromium.org | 8e0e926 | 2010-08-17 19:20:27 +0000 | [diff] [blame] | 1505 | def _AddAdditionalUpdateFlags(command, options, revision): |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 1506 | """Add additional flags to command depending on what options are set. |
| 1507 | command should be a list of strings that represents an svn command. |
| 1508 | |
| 1509 | This method returns a new list to be used as a command.""" |
| 1510 | new_command = command[:] |
| 1511 | if revision: |
| 1512 | new_command.extend(['--revision', str(revision).strip()]) |
maruel@chromium.org | 36ac239 | 2011-10-12 16:36:11 +0000 | [diff] [blame] | 1513 | # We don't want interaction when jobs are used. |
| 1514 | if options.jobs > 1: |
| 1515 | new_command.append('--non-interactive') |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 1516 | # --force was added to 'svn update' in svn 1.5. |
maruel@chromium.org | 36ac239 | 2011-10-12 16:36:11 +0000 | [diff] [blame] | 1517 | # --accept was added to 'svn update' in svn 1.6. |
| 1518 | if not scm.SVN.AssertVersion('1.5')[0]: |
| 1519 | return new_command |
| 1520 | |
| 1521 | # It's annoying to have it block in the middle of a sync, just sensible |
| 1522 | # defaults. |
| 1523 | if options.force: |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 1524 | new_command.append('--force') |
maruel@chromium.org | 36ac239 | 2011-10-12 16:36:11 +0000 | [diff] [blame] | 1525 | if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
| 1526 | new_command.extend(('--accept', 'theirs-conflict')) |
| 1527 | elif options.manually_grab_svn_rev: |
| 1528 | new_command.append('--force') |
| 1529 | if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
| 1530 | new_command.extend(('--accept', 'postpone')) |
| 1531 | elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]: |
| 1532 | new_command.extend(('--accept', 'postpone')) |
tony@chromium.org | 9982812 | 2010-06-04 01:41:02 +0000 | [diff] [blame] | 1533 | return new_command |