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