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