The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1 | # Copyright (C) 2008 The Android Open Source Project |
| 2 | # |
| 3 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | # you may not use this file except in compliance with the License. |
| 5 | # You may obtain a copy of the License at |
| 6 | # |
| 7 | # http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | # |
| 9 | # Unless required by applicable law or agreed to in writing, software |
| 10 | # distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | # See the License for the specific language governing permissions and |
| 13 | # limitations under the License. |
| 14 | |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 15 | from __future__ import print_function |
Shawn O. Pearce | 438ee1c | 2008-11-03 09:59:36 -0800 | [diff] [blame] | 16 | import errno |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 17 | import filecmp |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 18 | import glob |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 19 | import os |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 20 | import random |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 21 | import re |
| 22 | import shutil |
| 23 | import stat |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 24 | import subprocess |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 25 | import sys |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 26 | import tarfile |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 27 | import tempfile |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 28 | import time |
Dave Borowitz | 137d013 | 2015-01-02 11:12:54 -0800 | [diff] [blame] | 29 | import traceback |
Shawn O. Pearce | df5ee52 | 2011-10-11 14:05:21 -0700 | [diff] [blame] | 30 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 31 | from color import Coloring |
Dave Borowitz | b42b474 | 2012-10-31 12:27:27 -0700 | [diff] [blame] | 32 | from git_command import GitCommand, git_require |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 33 | from git_config import GitConfig, IsId, GetSchemeFromUrl, GetUrlCookieFile, \ |
| 34 | ID_RE |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 35 | from error import GitError, HookError, UploadError, DownloadError |
Shawn O. Pearce | 559b846 | 2009-03-02 12:56:08 -0800 | [diff] [blame] | 36 | from error import ManifestInvalidRevisionError |
Conley Owens | 75ee057 | 2012-11-15 17:33:11 -0800 | [diff] [blame] | 37 | from error import NoManifestException |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 38 | from trace import IsTrace, Trace |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 39 | |
Shawn O. Pearce | d237b69 | 2009-04-17 18:49:50 -0700 | [diff] [blame] | 40 | from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 41 | |
David Pursehouse | 59bbb58 | 2013-05-17 10:49:33 +0900 | [diff] [blame] | 42 | from pyversion import is_python3 |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 43 | if is_python3(): |
| 44 | import urllib.parse |
| 45 | else: |
| 46 | import imp |
| 47 | import urlparse |
| 48 | urllib = imp.new_module('urllib') |
| 49 | urllib.parse = urlparse |
David Pursehouse | 59bbb58 | 2013-05-17 10:49:33 +0900 | [diff] [blame] | 50 | # pylint:disable=W0622 |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 51 | input = raw_input |
David Pursehouse | 59bbb58 | 2013-05-17 10:49:33 +0900 | [diff] [blame] | 52 | # pylint:enable=W0622 |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 53 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 54 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 55 | def _lwrite(path, content): |
| 56 | lock = '%s.lock' % path |
| 57 | |
Chirayu Desai | 303a82f | 2014-08-19 22:57:17 +0530 | [diff] [blame] | 58 | fd = open(lock, 'w') |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 59 | try: |
| 60 | fd.write(content) |
| 61 | finally: |
| 62 | fd.close() |
| 63 | |
| 64 | try: |
| 65 | os.rename(lock, path) |
| 66 | except OSError: |
| 67 | os.remove(lock) |
| 68 | raise |
| 69 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 70 | |
Shawn O. Pearce | 4824478 | 2009-04-16 08:25:57 -0700 | [diff] [blame] | 71 | def _error(fmt, *args): |
| 72 | msg = fmt % args |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 73 | print('error: %s' % msg, file=sys.stderr) |
Shawn O. Pearce | 4824478 | 2009-04-16 08:25:57 -0700 | [diff] [blame] | 74 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 75 | |
David Pursehouse | f33929d | 2015-08-24 14:39:14 +0900 | [diff] [blame] | 76 | def _warn(fmt, *args): |
| 77 | msg = fmt % args |
| 78 | print('warn: %s' % msg, file=sys.stderr) |
| 79 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 80 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 81 | def not_rev(r): |
| 82 | return '^' + r |
| 83 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 84 | |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 85 | def sq(r): |
| 86 | return "'" + r.replace("'", "'\''") + "'" |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 87 | |
Jonathan Nieder | 9371979 | 2015-03-17 11:29:58 -0700 | [diff] [blame] | 88 | _project_hook_list = None |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 89 | |
| 90 | |
Jonathan Nieder | 9371979 | 2015-03-17 11:29:58 -0700 | [diff] [blame] | 91 | def _ProjectHooks(): |
| 92 | """List the hooks present in the 'hooks' directory. |
| 93 | |
| 94 | These hooks are project hooks and are copied to the '.git/hooks' directory |
| 95 | of all subprojects. |
| 96 | |
| 97 | This function caches the list of hooks (based on the contents of the |
| 98 | 'repo/hooks' directory) on the first call. |
| 99 | |
| 100 | Returns: |
| 101 | A list of absolute paths to all of the files in the hooks directory. |
| 102 | """ |
| 103 | global _project_hook_list |
| 104 | if _project_hook_list is None: |
| 105 | d = os.path.realpath(os.path.abspath(os.path.dirname(__file__))) |
| 106 | d = os.path.join(d, 'hooks') |
| 107 | _project_hook_list = [os.path.join(d, x) for x in os.listdir(d)] |
| 108 | return _project_hook_list |
| 109 | |
| 110 | |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 111 | class DownloadedChange(object): |
| 112 | _commit_cache = None |
| 113 | |
| 114 | def __init__(self, project, base, change_id, ps_id, commit): |
| 115 | self.project = project |
| 116 | self.base = base |
| 117 | self.change_id = change_id |
| 118 | self.ps_id = ps_id |
| 119 | self.commit = commit |
| 120 | |
| 121 | @property |
| 122 | def commits(self): |
| 123 | if self._commit_cache is None: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 124 | self._commit_cache = self.project.bare_git.rev_list('--abbrev=8', |
| 125 | '--abbrev-commit', |
| 126 | '--pretty=oneline', |
| 127 | '--reverse', |
| 128 | '--date-order', |
| 129 | not_rev(self.base), |
| 130 | self.commit, |
| 131 | '--') |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 132 | return self._commit_cache |
| 133 | |
| 134 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 135 | class ReviewableBranch(object): |
| 136 | _commit_cache = None |
| 137 | |
| 138 | def __init__(self, project, branch, base): |
| 139 | self.project = project |
| 140 | self.branch = branch |
| 141 | self.base = base |
| 142 | |
| 143 | @property |
| 144 | def name(self): |
| 145 | return self.branch.name |
| 146 | |
| 147 | @property |
| 148 | def commits(self): |
| 149 | if self._commit_cache is None: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 150 | self._commit_cache = self.project.bare_git.rev_list('--abbrev=8', |
| 151 | '--abbrev-commit', |
| 152 | '--pretty=oneline', |
| 153 | '--reverse', |
| 154 | '--date-order', |
| 155 | not_rev(self.base), |
| 156 | R_HEADS + self.name, |
| 157 | '--') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 158 | return self._commit_cache |
| 159 | |
| 160 | @property |
Shawn O. Pearce | c99883f | 2008-11-11 17:12:43 -0800 | [diff] [blame] | 161 | def unabbrev_commits(self): |
| 162 | r = dict() |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 163 | for commit in self.project.bare_git.rev_list(not_rev(self.base), |
| 164 | R_HEADS + self.name, |
| 165 | '--'): |
Shawn O. Pearce | c99883f | 2008-11-11 17:12:43 -0800 | [diff] [blame] | 166 | r[commit[0:8]] = commit |
| 167 | return r |
| 168 | |
| 169 | @property |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 170 | def date(self): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 171 | return self.project.bare_git.log('--pretty=format:%cd', |
| 172 | '-n', '1', |
| 173 | R_HEADS + self.name, |
| 174 | '--') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 175 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 176 | def UploadForReview(self, people, |
| 177 | auto_topic=False, |
Jonathan Nieder | c94d6eb | 2017-08-08 18:34:53 +0000 | [diff] [blame] | 178 | draft=False, |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 179 | private=False, |
| 180 | wip=False, |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 181 | dest_branch=None): |
Shawn O. Pearce | c99883f | 2008-11-11 17:12:43 -0800 | [diff] [blame] | 182 | self.project.UploadForReview(self.name, |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 183 | people, |
Brian Harring | 435370c | 2012-07-28 15:37:04 -0700 | [diff] [blame] | 184 | auto_topic=auto_topic, |
Jonathan Nieder | c94d6eb | 2017-08-08 18:34:53 +0000 | [diff] [blame] | 185 | draft=draft, |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 186 | private=private, |
| 187 | wip=wip, |
Bryan Jacobs | f609f91 | 2013-05-06 13:36:24 -0400 | [diff] [blame] | 188 | dest_branch=dest_branch) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 189 | |
Ficus Kirkpatrick | bc7ef67 | 2009-05-04 12:45:11 -0700 | [diff] [blame] | 190 | def GetPublishedRefs(self): |
| 191 | refs = {} |
| 192 | output = self.project.bare_git.ls_remote( |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 193 | self.branch.remote.SshReviewUrl(self.project.UserEmail), |
| 194 | 'refs/changes/*') |
Ficus Kirkpatrick | bc7ef67 | 2009-05-04 12:45:11 -0700 | [diff] [blame] | 195 | for line in output.split('\n'): |
| 196 | try: |
| 197 | (sha, ref) = line.split() |
| 198 | refs[sha] = ref |
| 199 | except ValueError: |
| 200 | pass |
| 201 | |
| 202 | return refs |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 203 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 204 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 205 | class StatusColoring(Coloring): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 206 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 207 | def __init__(self, config): |
| 208 | Coloring.__init__(self, config, 'status') |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 209 | self.project = self.printer('header', attr='bold') |
| 210 | self.branch = self.printer('header', attr='bold') |
| 211 | self.nobranch = self.printer('nobranch', fg='red') |
| 212 | self.important = self.printer('important', fg='red') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 213 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 214 | self.added = self.printer('added', fg='green') |
| 215 | self.changed = self.printer('changed', fg='red') |
| 216 | self.untracked = self.printer('untracked', fg='red') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 217 | |
| 218 | |
| 219 | class DiffColoring(Coloring): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 220 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 221 | def __init__(self, config): |
| 222 | Coloring.__init__(self, config, 'diff') |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 223 | self.project = self.printer('header', attr='bold') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 224 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 225 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 226 | class _Annotation(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 227 | |
James W. Mills | 24c1308 | 2012-04-12 15:04:13 -0500 | [diff] [blame] | 228 | def __init__(self, name, value, keep): |
| 229 | self.name = name |
| 230 | self.value = value |
| 231 | self.keep = keep |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 232 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 233 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 234 | class _CopyFile(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 235 | |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 236 | def __init__(self, src, dest, abssrc, absdest): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 237 | self.src = src |
| 238 | self.dest = dest |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 239 | self.abs_src = abssrc |
| 240 | self.abs_dest = absdest |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 241 | |
| 242 | def _Copy(self): |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 243 | src = self.abs_src |
| 244 | dest = self.abs_dest |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 245 | # copy file if it does not exist or is out of date |
| 246 | if not os.path.exists(dest) or not filecmp.cmp(src, dest): |
| 247 | try: |
| 248 | # remove existing file first, since it might be read-only |
| 249 | if os.path.exists(dest): |
| 250 | os.remove(dest) |
Matthew Buckett | 2daf667 | 2009-07-11 09:43:47 -0400 | [diff] [blame] | 251 | else: |
Mickaël Salaün | 2f6ab7f | 2012-09-30 00:37:55 +0200 | [diff] [blame] | 252 | dest_dir = os.path.dirname(dest) |
| 253 | if not os.path.isdir(dest_dir): |
| 254 | os.makedirs(dest_dir) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 255 | shutil.copy(src, dest) |
| 256 | # make the file read-only |
| 257 | mode = os.stat(dest)[stat.ST_MODE] |
| 258 | mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH) |
| 259 | os.chmod(dest, mode) |
| 260 | except IOError: |
Shawn O. Pearce | 4824478 | 2009-04-16 08:25:57 -0700 | [diff] [blame] | 261 | _error('Cannot copy file %s to %s', src, dest) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 262 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 263 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 264 | class _LinkFile(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 265 | |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 266 | def __init__(self, git_worktree, src, dest, relsrc, absdest): |
| 267 | self.git_worktree = git_worktree |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 268 | self.src = src |
| 269 | self.dest = dest |
Colin Cross | 0184dcc | 2015-05-05 00:24:54 -0700 | [diff] [blame] | 270 | self.src_rel_to_dest = relsrc |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 271 | self.abs_dest = absdest |
| 272 | |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 273 | def __linkIt(self, relSrc, absDest): |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 274 | # link file if it does not exist or is out of date |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 275 | if not os.path.islink(absDest) or (os.readlink(absDest) != relSrc): |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 276 | try: |
| 277 | # remove existing file first, since it might be read-only |
Dan Willemsen | e1e0bd1 | 2015-11-18 16:49:38 -0800 | [diff] [blame] | 278 | if os.path.lexists(absDest): |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 279 | os.remove(absDest) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 280 | else: |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 281 | dest_dir = os.path.dirname(absDest) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 282 | if not os.path.isdir(dest_dir): |
| 283 | os.makedirs(dest_dir) |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 284 | os.symlink(relSrc, absDest) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 285 | except IOError: |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 286 | _error('Cannot link file %s to %s', relSrc, absDest) |
| 287 | |
| 288 | def _Link(self): |
| 289 | """Link the self.rel_src_to_dest and self.abs_dest. Handles wild cards |
| 290 | on the src linking all of the files in the source in to the destination |
| 291 | directory. |
| 292 | """ |
| 293 | # We use the absSrc to handle the situation where the current directory |
| 294 | # is not the root of the repo |
| 295 | absSrc = os.path.join(self.git_worktree, self.src) |
| 296 | if os.path.exists(absSrc): |
| 297 | # Entity exists so just a simple one to one link operation |
| 298 | self.__linkIt(self.src_rel_to_dest, self.abs_dest) |
| 299 | else: |
| 300 | # Entity doesn't exist assume there is a wild card |
| 301 | absDestDir = self.abs_dest |
| 302 | if os.path.exists(absDestDir) and not os.path.isdir(absDestDir): |
| 303 | _error('Link error: src with wildcard, %s must be a directory', |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 304 | absDestDir) |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 305 | else: |
| 306 | absSrcFiles = glob.glob(absSrc) |
| 307 | for absSrcFile in absSrcFiles: |
| 308 | # Create a releative path from source dir to destination dir |
| 309 | absSrcDir = os.path.dirname(absSrcFile) |
| 310 | relSrcDir = os.path.relpath(absSrcDir, absDestDir) |
| 311 | |
| 312 | # Get the source file name |
| 313 | srcFile = os.path.basename(absSrcFile) |
| 314 | |
| 315 | # Now form the final full paths to srcFile. They will be |
| 316 | # absolute for the desintaiton and relative for the srouce. |
| 317 | absDest = os.path.join(absDestDir, srcFile) |
| 318 | relSrc = os.path.join(relSrcDir, srcFile) |
| 319 | self.__linkIt(relSrc, absDest) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 320 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 321 | |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 322 | class RemoteSpec(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 323 | |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 324 | def __init__(self, |
| 325 | name, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 326 | url=None, |
Steve Rae | d648045 | 2016-08-10 15:00:00 -0700 | [diff] [blame] | 327 | pushUrl=None, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 328 | review=None, |
Dan Willemsen | 96c2d65 | 2016-04-06 16:03:54 -0700 | [diff] [blame] | 329 | revision=None, |
David Riley | e0684ad | 2017-04-05 00:02:59 -0700 | [diff] [blame] | 330 | orig_name=None, |
| 331 | fetchUrl=None): |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 332 | self.name = name |
| 333 | self.url = url |
Steve Rae | d648045 | 2016-08-10 15:00:00 -0700 | [diff] [blame] | 334 | self.pushUrl = pushUrl |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 335 | self.review = review |
Anthony King | 36ea2fb | 2014-05-06 11:54:01 +0100 | [diff] [blame] | 336 | self.revision = revision |
Dan Willemsen | 96c2d65 | 2016-04-06 16:03:54 -0700 | [diff] [blame] | 337 | self.orig_name = orig_name |
David Riley | e0684ad | 2017-04-05 00:02:59 -0700 | [diff] [blame] | 338 | self.fetchUrl = fetchUrl |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 339 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 340 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 341 | class RepoHook(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 342 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 343 | """A RepoHook contains information about a script to run as a hook. |
| 344 | |
| 345 | Hooks are used to run a python script before running an upload (for instance, |
| 346 | to run presubmit checks). Eventually, we may have hooks for other actions. |
| 347 | |
| 348 | This shouldn't be confused with files in the 'repo/hooks' directory. Those |
| 349 | files are copied into each '.git/hooks' folder for each project. Repo-level |
| 350 | hooks are associated instead with repo actions. |
| 351 | |
| 352 | Hooks are always python. When a hook is run, we will load the hook into the |
| 353 | interpreter and execute its main() function. |
| 354 | """ |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 355 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 356 | def __init__(self, |
| 357 | hook_type, |
| 358 | hooks_project, |
| 359 | topdir, |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 360 | manifest_url, |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 361 | abort_if_user_denies=False): |
| 362 | """RepoHook constructor. |
| 363 | |
| 364 | Params: |
| 365 | hook_type: A string representing the type of hook. This is also used |
| 366 | to figure out the name of the file containing the hook. For |
| 367 | example: 'pre-upload'. |
| 368 | hooks_project: The project containing the repo hooks. If you have a |
| 369 | manifest, this is manifest.repo_hooks_project. OK if this is None, |
| 370 | which will make the hook a no-op. |
| 371 | topdir: Repo's top directory (the one containing the .repo directory). |
| 372 | Scripts will run with CWD as this directory. If you have a manifest, |
| 373 | this is manifest.topdir |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 374 | manifest_url: The URL to the manifest git repo. |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 375 | abort_if_user_denies: If True, we'll throw a HookError() if the user |
| 376 | doesn't allow us to run the hook. |
| 377 | """ |
| 378 | self._hook_type = hook_type |
| 379 | self._hooks_project = hooks_project |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 380 | self._manifest_url = manifest_url |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 381 | self._topdir = topdir |
| 382 | self._abort_if_user_denies = abort_if_user_denies |
| 383 | |
| 384 | # Store the full path to the script for convenience. |
| 385 | if self._hooks_project: |
| 386 | self._script_fullpath = os.path.join(self._hooks_project.worktree, |
| 387 | self._hook_type + '.py') |
| 388 | else: |
| 389 | self._script_fullpath = None |
| 390 | |
| 391 | def _GetHash(self): |
| 392 | """Return a hash of the contents of the hooks directory. |
| 393 | |
| 394 | We'll just use git to do this. This hash has the property that if anything |
| 395 | changes in the directory we will return a different has. |
| 396 | |
| 397 | SECURITY CONSIDERATION: |
| 398 | This hash only represents the contents of files in the hook directory, not |
| 399 | any other files imported or called by hooks. Changes to imported files |
| 400 | can change the script behavior without affecting the hash. |
| 401 | |
| 402 | Returns: |
| 403 | A string representing the hash. This will always be ASCII so that it can |
| 404 | be printed to the user easily. |
| 405 | """ |
| 406 | assert self._hooks_project, "Must have hooks to calculate their hash." |
| 407 | |
| 408 | # We will use the work_git object rather than just calling GetRevisionId(). |
| 409 | # That gives us a hash of the latest checked in version of the files that |
| 410 | # the user will actually be executing. Specifically, GetRevisionId() |
| 411 | # doesn't appear to change even if a user checks out a different version |
| 412 | # of the hooks repo (via git checkout) nor if a user commits their own revs. |
| 413 | # |
| 414 | # NOTE: Local (non-committed) changes will not be factored into this hash. |
| 415 | # I think this is OK, since we're really only worried about warning the user |
| 416 | # about upstream changes. |
| 417 | return self._hooks_project.work_git.rev_parse('HEAD') |
| 418 | |
| 419 | def _GetMustVerb(self): |
| 420 | """Return 'must' if the hook is required; 'should' if not.""" |
| 421 | if self._abort_if_user_denies: |
| 422 | return 'must' |
| 423 | else: |
| 424 | return 'should' |
| 425 | |
| 426 | def _CheckForHookApproval(self): |
| 427 | """Check to see whether this hook has been approved. |
| 428 | |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 429 | We'll accept approval of manifest URLs if they're using secure transports. |
| 430 | This way the user can say they trust the manifest hoster. For insecure |
| 431 | hosts, we fall back to checking the hash of the hooks repo. |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 432 | |
| 433 | Note that we ask permission for each individual hook even though we use |
| 434 | the hash of all hooks when detecting changes. We'd like the user to be |
| 435 | able to approve / deny each hook individually. We only use the hash of all |
| 436 | hooks because there is no other easy way to detect changes to local imports. |
| 437 | |
| 438 | Returns: |
| 439 | True if this hook is approved to run; False otherwise. |
| 440 | |
| 441 | Raises: |
| 442 | HookError: Raised if the user doesn't approve and abort_if_user_denies |
| 443 | was passed to the consturctor. |
| 444 | """ |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 445 | if self._ManifestUrlHasSecureScheme(): |
| 446 | return self._CheckForHookApprovalManifest() |
| 447 | else: |
| 448 | return self._CheckForHookApprovalHash() |
| 449 | |
| 450 | def _CheckForHookApprovalHelper(self, subkey, new_val, main_prompt, |
| 451 | changed_prompt): |
| 452 | """Check for approval for a particular attribute and hook. |
| 453 | |
| 454 | Args: |
| 455 | subkey: The git config key under [repo.hooks.<hook_type>] to store the |
| 456 | last approved string. |
| 457 | new_val: The new value to compare against the last approved one. |
| 458 | main_prompt: Message to display to the user to ask for approval. |
| 459 | changed_prompt: Message explaining why we're re-asking for approval. |
| 460 | |
| 461 | Returns: |
| 462 | True if this hook is approved to run; False otherwise. |
| 463 | |
| 464 | Raises: |
| 465 | HookError: Raised if the user doesn't approve and abort_if_user_denies |
| 466 | was passed to the consturctor. |
| 467 | """ |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 468 | hooks_config = self._hooks_project.config |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 469 | git_approval_key = 'repo.hooks.%s.%s' % (self._hook_type, subkey) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 470 | |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 471 | # Get the last value that the user approved for this hook; may be None. |
| 472 | old_val = hooks_config.GetString(git_approval_key) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 473 | |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 474 | if old_val is not None: |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 475 | # User previously approved hook and asked not to be prompted again. |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 476 | if new_val == old_val: |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 477 | # Approval matched. We're done. |
| 478 | return True |
| 479 | else: |
| 480 | # Give the user a reason why we're prompting, since they last told |
| 481 | # us to "never ask again". |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 482 | prompt = 'WARNING: %s\n\n' % (changed_prompt,) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 483 | else: |
| 484 | prompt = '' |
| 485 | |
| 486 | # Prompt the user if we're not on a tty; on a tty we'll assume "no". |
| 487 | if sys.stdout.isatty(): |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 488 | prompt += main_prompt + ' (yes/always/NO)? ' |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 489 | response = input(prompt).lower() |
David Pursehouse | 98ffba1 | 2012-11-14 11:18:00 +0900 | [diff] [blame] | 490 | print() |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 491 | |
| 492 | # User is doing a one-time approval. |
| 493 | if response in ('y', 'yes'): |
| 494 | return True |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 495 | elif response == 'always': |
| 496 | hooks_config.SetString(git_approval_key, new_val) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 497 | return True |
| 498 | |
| 499 | # For anything else, we'll assume no approval. |
| 500 | if self._abort_if_user_denies: |
| 501 | raise HookError('You must allow the %s hook or use --no-verify.' % |
| 502 | self._hook_type) |
| 503 | |
| 504 | return False |
| 505 | |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 506 | def _ManifestUrlHasSecureScheme(self): |
| 507 | """Check if the URI for the manifest is a secure transport.""" |
| 508 | secure_schemes = ('file', 'https', 'ssh', 'persistent-https', 'sso', 'rpc') |
| 509 | parse_results = urllib.parse.urlparse(self._manifest_url) |
| 510 | return parse_results.scheme in secure_schemes |
| 511 | |
| 512 | def _CheckForHookApprovalManifest(self): |
| 513 | """Check whether the user has approved this manifest host. |
| 514 | |
| 515 | Returns: |
| 516 | True if this hook is approved to run; False otherwise. |
| 517 | """ |
| 518 | return self._CheckForHookApprovalHelper( |
| 519 | 'approvedmanifest', |
| 520 | self._manifest_url, |
| 521 | 'Run hook scripts from %s' % (self._manifest_url,), |
| 522 | 'Manifest URL has changed since %s was allowed.' % (self._hook_type,)) |
| 523 | |
| 524 | def _CheckForHookApprovalHash(self): |
| 525 | """Check whether the user has approved the hooks repo. |
| 526 | |
| 527 | Returns: |
| 528 | True if this hook is approved to run; False otherwise. |
| 529 | """ |
| 530 | prompt = ('Repo %s run the script:\n' |
| 531 | ' %s\n' |
| 532 | '\n' |
Jonathan Nieder | 71e4cea | 2016-08-16 12:05:09 -0700 | [diff] [blame] | 533 | 'Do you want to allow this script to run') |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 534 | return self._CheckForHookApprovalHelper( |
| 535 | 'approvedhash', |
| 536 | self._GetHash(), |
Jonathan Nieder | 71e4cea | 2016-08-16 12:05:09 -0700 | [diff] [blame] | 537 | prompt % (self._GetMustVerb(), self._script_fullpath), |
Mike Frysinger | 40252c2 | 2016-08-15 21:23:44 -0400 | [diff] [blame] | 538 | 'Scripts have changed since %s was allowed.' % (self._hook_type,)) |
| 539 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 540 | def _ExecuteHook(self, **kwargs): |
| 541 | """Actually execute the given hook. |
| 542 | |
| 543 | This will run the hook's 'main' function in our python interpreter. |
| 544 | |
| 545 | Args: |
| 546 | kwargs: Keyword arguments to pass to the hook. These are often specific |
| 547 | to the hook type. For instance, pre-upload hooks will contain |
| 548 | a project_list. |
| 549 | """ |
| 550 | # Keep sys.path and CWD stashed away so that we can always restore them |
| 551 | # upon function exit. |
| 552 | orig_path = os.getcwd() |
| 553 | orig_syspath = sys.path |
| 554 | |
| 555 | try: |
| 556 | # Always run hooks with CWD as topdir. |
| 557 | os.chdir(self._topdir) |
| 558 | |
| 559 | # Put the hook dir as the first item of sys.path so hooks can do |
| 560 | # relative imports. We want to replace the repo dir as [0] so |
| 561 | # hooks can't import repo files. |
| 562 | sys.path = [os.path.dirname(self._script_fullpath)] + sys.path[1:] |
| 563 | |
| 564 | # Exec, storing global context in the context dict. We catch exceptions |
| 565 | # and convert to a HookError w/ just the failing traceback. |
Mike Frysinger | 4aa4b21 | 2016-03-04 15:03:00 -0500 | [diff] [blame] | 566 | context = {'__file__': self._script_fullpath} |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 567 | try: |
Anthony King | 70f6890 | 2014-05-05 21:15:34 +0100 | [diff] [blame] | 568 | exec(compile(open(self._script_fullpath).read(), |
| 569 | self._script_fullpath, 'exec'), context) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 570 | except Exception: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 571 | raise HookError('%s\nFailed to import %s hook; see traceback above.' % |
| 572 | (traceback.format_exc(), self._hook_type)) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 573 | |
| 574 | # Running the script should have defined a main() function. |
| 575 | if 'main' not in context: |
| 576 | raise HookError('Missing main() in: "%s"' % self._script_fullpath) |
| 577 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 578 | # Add 'hook_should_take_kwargs' to the arguments to be passed to main. |
| 579 | # We don't actually want hooks to define their main with this argument-- |
| 580 | # it's there to remind them that their hook should always take **kwargs. |
| 581 | # For instance, a pre-upload hook should be defined like: |
| 582 | # def main(project_list, **kwargs): |
| 583 | # |
| 584 | # This allows us to later expand the API without breaking old hooks. |
| 585 | kwargs = kwargs.copy() |
| 586 | kwargs['hook_should_take_kwargs'] = True |
| 587 | |
| 588 | # Call the main function in the hook. If the hook should cause the |
| 589 | # build to fail, it will raise an Exception. We'll catch that convert |
| 590 | # to a HookError w/ just the failing traceback. |
| 591 | try: |
| 592 | context['main'](**kwargs) |
| 593 | except Exception: |
| 594 | raise HookError('%s\nFailed to run main() for %s hook; see traceback ' |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 595 | 'above.' % (traceback.format_exc(), |
| 596 | self._hook_type)) |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 597 | finally: |
| 598 | # Restore sys.path and CWD. |
| 599 | sys.path = orig_syspath |
| 600 | os.chdir(orig_path) |
| 601 | |
| 602 | def Run(self, user_allows_all_hooks, **kwargs): |
| 603 | """Run the hook. |
| 604 | |
| 605 | If the hook doesn't exist (because there is no hooks project or because |
| 606 | this particular hook is not enabled), this is a no-op. |
| 607 | |
| 608 | Args: |
| 609 | user_allows_all_hooks: If True, we will never prompt about running the |
| 610 | hook--we'll just assume it's OK to run it. |
| 611 | kwargs: Keyword arguments to pass to the hook. These are often specific |
| 612 | to the hook type. For instance, pre-upload hooks will contain |
| 613 | a project_list. |
| 614 | |
| 615 | Raises: |
| 616 | HookError: If there was a problem finding the hook or the user declined |
| 617 | to run a required hook (from _CheckForHookApproval). |
| 618 | """ |
| 619 | # No-op if there is no hooks project or if hook is disabled. |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 620 | if ((not self._hooks_project) or (self._hook_type not in |
| 621 | self._hooks_project.enabled_repo_hooks)): |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 622 | return |
| 623 | |
| 624 | # Bail with a nice error if we can't find the hook. |
| 625 | if not os.path.isfile(self._script_fullpath): |
| 626 | raise HookError('Couldn\'t find repo hook: "%s"' % self._script_fullpath) |
| 627 | |
| 628 | # Make sure the user is OK with running the hook. |
| 629 | if (not user_allows_all_hooks) and (not self._CheckForHookApproval()): |
| 630 | return |
| 631 | |
| 632 | # Run the hook with the same version of python we're using. |
| 633 | self._ExecuteHook(**kwargs) |
| 634 | |
| 635 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 636 | class Project(object): |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 637 | # These objects can be shared between several working trees. |
| 638 | shareable_files = ['description', 'info'] |
| 639 | shareable_dirs = ['hooks', 'objects', 'rr-cache', 'svn'] |
| 640 | # These objects can only be used by a single working tree. |
| 641 | working_tree_files = ['config', 'packed-refs', 'shallow'] |
| 642 | working_tree_dirs = ['logs', 'refs'] |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 643 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 644 | def __init__(self, |
| 645 | manifest, |
| 646 | name, |
| 647 | remote, |
| 648 | gitdir, |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 649 | objdir, |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 650 | worktree, |
| 651 | relpath, |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 652 | revisionExpr, |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 653 | revisionId, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 654 | rebase=True, |
| 655 | groups=None, |
| 656 | sync_c=False, |
| 657 | sync_s=False, |
| 658 | clone_depth=None, |
| 659 | upstream=None, |
| 660 | parent=None, |
| 661 | is_derived=False, |
David Pursehouse | b155354 | 2014-09-04 21:28:09 +0900 | [diff] [blame] | 662 | dest_branch=None, |
Simran Basi | b9a1b73 | 2015-08-20 12:19:28 -0700 | [diff] [blame] | 663 | optimized_fetch=False, |
| 664 | old_revision=None): |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 665 | """Init a Project object. |
| 666 | |
| 667 | Args: |
| 668 | manifest: The XmlManifest object. |
| 669 | name: The `name` attribute of manifest.xml's project element. |
| 670 | remote: RemoteSpec object specifying its remote's properties. |
| 671 | gitdir: Absolute path of git directory. |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 672 | objdir: Absolute path of directory to store git objects. |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 673 | worktree: Absolute path of git working tree. |
| 674 | relpath: Relative path of git working tree to repo's top directory. |
| 675 | revisionExpr: The `revision` attribute of manifest.xml's project element. |
| 676 | revisionId: git commit id for checking out. |
| 677 | rebase: The `rebase` attribute of manifest.xml's project element. |
| 678 | groups: The `groups` attribute of manifest.xml's project element. |
| 679 | sync_c: The `sync-c` attribute of manifest.xml's project element. |
| 680 | sync_s: The `sync-s` attribute of manifest.xml's project element. |
| 681 | upstream: The `upstream` attribute of manifest.xml's project element. |
| 682 | parent: The parent Project object. |
| 683 | is_derived: False if the project was explicitly defined in the manifest; |
| 684 | True if the project is a discovered submodule. |
Bryan Jacobs | f609f91 | 2013-05-06 13:36:24 -0400 | [diff] [blame] | 685 | dest_branch: The branch to which to push changes for review by default. |
David Pursehouse | b155354 | 2014-09-04 21:28:09 +0900 | [diff] [blame] | 686 | optimized_fetch: If True, when a project is set to a sha1 revision, only |
| 687 | fetch from the remote if the sha1 is not present locally. |
Simran Basi | b9a1b73 | 2015-08-20 12:19:28 -0700 | [diff] [blame] | 688 | old_revision: saved git commit id for open GITC projects. |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 689 | """ |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 690 | self.manifest = manifest |
| 691 | self.name = name |
| 692 | self.remote = remote |
Anthony Newnam | df14a70 | 2011-01-09 17:31:57 -0800 | [diff] [blame] | 693 | self.gitdir = gitdir.replace('\\', '/') |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 694 | self.objdir = objdir.replace('\\', '/') |
Shawn O. Pearce | 0ce6ca9 | 2011-01-10 13:26:01 -0800 | [diff] [blame] | 695 | if worktree: |
Renaud Paquay | fef9f21 | 2016-11-01 18:28:01 -0700 | [diff] [blame] | 696 | self.worktree = os.path.normpath(worktree).replace('\\', '/') |
Shawn O. Pearce | 0ce6ca9 | 2011-01-10 13:26:01 -0800 | [diff] [blame] | 697 | else: |
| 698 | self.worktree = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 699 | self.relpath = relpath |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 700 | self.revisionExpr = revisionExpr |
| 701 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 702 | if revisionId is None \ |
| 703 | and revisionExpr \ |
| 704 | and IsId(revisionExpr): |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 705 | self.revisionId = revisionExpr |
| 706 | else: |
| 707 | self.revisionId = revisionId |
| 708 | |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 709 | self.rebase = rebase |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 710 | self.groups = groups |
Anatol Pomazau | 79770d2 | 2012-04-20 14:41:59 -0700 | [diff] [blame] | 711 | self.sync_c = sync_c |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 712 | self.sync_s = sync_s |
David Pursehouse | ede7f12 | 2012-11-27 22:25:30 +0900 | [diff] [blame] | 713 | self.clone_depth = clone_depth |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 714 | self.upstream = upstream |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 715 | self.parent = parent |
| 716 | self.is_derived = is_derived |
David Pursehouse | b155354 | 2014-09-04 21:28:09 +0900 | [diff] [blame] | 717 | self.optimized_fetch = optimized_fetch |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 718 | self.subprojects = [] |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 719 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 720 | self.snapshots = {} |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 721 | self.copyfiles = [] |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 722 | self.linkfiles = [] |
James W. Mills | 24c1308 | 2012-04-12 15:04:13 -0500 | [diff] [blame] | 723 | self.annotations = [] |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 724 | self.config = GitConfig.ForRepository(gitdir=self.gitdir, |
| 725 | defaults=self.manifest.globalConfig) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 726 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 727 | if self.worktree: |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 728 | self.work_git = self._GitGetByExec(self, bare=False, gitdir=gitdir) |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 729 | else: |
| 730 | self.work_git = None |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 731 | self.bare_git = self._GitGetByExec(self, bare=True, gitdir=gitdir) |
Shawn O. Pearce | d237b69 | 2009-04-17 18:49:50 -0700 | [diff] [blame] | 732 | self.bare_ref = GitRefs(gitdir) |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 733 | self.bare_objdir = self._GitGetByExec(self, bare=True, gitdir=objdir) |
Bryan Jacobs | f609f91 | 2013-05-06 13:36:24 -0400 | [diff] [blame] | 734 | self.dest_branch = dest_branch |
Simran Basi | b9a1b73 | 2015-08-20 12:19:28 -0700 | [diff] [blame] | 735 | self.old_revision = old_revision |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 736 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 737 | # This will be filled in if a project is later identified to be the |
| 738 | # project containing repo hooks. |
| 739 | self.enabled_repo_hooks = [] |
| 740 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 741 | @property |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 742 | def Derived(self): |
| 743 | return self.is_derived |
| 744 | |
| 745 | @property |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 746 | def Exists(self): |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 747 | return os.path.isdir(self.gitdir) and os.path.isdir(self.objdir) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 748 | |
| 749 | @property |
| 750 | def CurrentBranch(self): |
| 751 | """Obtain the name of the currently checked out branch. |
| 752 | The branch name omits the 'refs/heads/' prefix. |
| 753 | None is returned if the project is on a detached HEAD. |
| 754 | """ |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 755 | b = self.work_git.GetHead() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 756 | if b.startswith(R_HEADS): |
| 757 | return b[len(R_HEADS):] |
| 758 | return None |
| 759 | |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 760 | def IsRebaseInProgress(self): |
| 761 | w = self.worktree |
| 762 | g = os.path.join(w, '.git') |
| 763 | return os.path.exists(os.path.join(g, 'rebase-apply')) \ |
| 764 | or os.path.exists(os.path.join(g, 'rebase-merge')) \ |
| 765 | or os.path.exists(os.path.join(w, '.dotest')) |
Julius Gustavsson | 0cb1b3f | 2010-06-17 17:55:02 +0200 | [diff] [blame] | 766 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 767 | def IsDirty(self, consider_untracked=True): |
| 768 | """Is the working directory modified in some way? |
| 769 | """ |
| 770 | self.work_git.update_index('-q', |
| 771 | '--unmerged', |
| 772 | '--ignore-missing', |
| 773 | '--refresh') |
David Pursehouse | 8f62fb7 | 2012-11-14 12:09:38 +0900 | [diff] [blame] | 774 | if self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 775 | return True |
| 776 | if self.work_git.DiffZ('diff-files'): |
| 777 | return True |
| 778 | if consider_untracked and self.work_git.LsOthers(): |
| 779 | return True |
| 780 | return False |
| 781 | |
| 782 | _userident_name = None |
| 783 | _userident_email = None |
| 784 | |
| 785 | @property |
| 786 | def UserName(self): |
| 787 | """Obtain the user's personal name. |
| 788 | """ |
| 789 | if self._userident_name is None: |
| 790 | self._LoadUserIdentity() |
| 791 | return self._userident_name |
| 792 | |
| 793 | @property |
| 794 | def UserEmail(self): |
| 795 | """Obtain the user's email address. This is very likely |
| 796 | to be their Gerrit login. |
| 797 | """ |
| 798 | if self._userident_email is None: |
| 799 | self._LoadUserIdentity() |
| 800 | return self._userident_email |
| 801 | |
| 802 | def _LoadUserIdentity(self): |
David Pursehouse | c1b86a2 | 2012-11-14 11:36:51 +0900 | [diff] [blame] | 803 | u = self.bare_git.var('GIT_COMMITTER_IDENT') |
| 804 | m = re.compile("^(.*) <([^>]*)> ").match(u) |
| 805 | if m: |
| 806 | self._userident_name = m.group(1) |
| 807 | self._userident_email = m.group(2) |
| 808 | else: |
| 809 | self._userident_name = '' |
| 810 | self._userident_email = '' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 811 | |
| 812 | def GetRemote(self, name): |
| 813 | """Get the configuration for a single remote. |
| 814 | """ |
| 815 | return self.config.GetRemote(name) |
| 816 | |
| 817 | def GetBranch(self, name): |
| 818 | """Get the configuration for a single branch. |
| 819 | """ |
| 820 | return self.config.GetBranch(name) |
| 821 | |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 822 | def GetBranches(self): |
| 823 | """Get all existing local branches. |
| 824 | """ |
| 825 | current = self.CurrentBranch |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 826 | all_refs = self._allrefs |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 827 | heads = {} |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 828 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 829 | for name, ref_id in all_refs.items(): |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 830 | if name.startswith(R_HEADS): |
| 831 | name = name[len(R_HEADS):] |
| 832 | b = self.GetBranch(name) |
| 833 | b.current = name == current |
| 834 | b.published = None |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 835 | b.revision = ref_id |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 836 | heads[name] = b |
| 837 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 838 | for name, ref_id in all_refs.items(): |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 839 | if name.startswith(R_PUB): |
| 840 | name = name[len(R_PUB):] |
| 841 | b = heads.get(name) |
| 842 | if b: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 843 | b.published = ref_id |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 844 | |
| 845 | return heads |
| 846 | |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 847 | def MatchesGroups(self, manifest_groups): |
| 848 | """Returns true if the manifest groups specified at init should cause |
| 849 | this project to be synced. |
| 850 | Prefixing a manifest group with "-" inverts the meaning of a group. |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 851 | All projects are implicitly labelled with "all". |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 852 | |
| 853 | labels are resolved in order. In the example case of |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 854 | project_groups: "all,group1,group2" |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 855 | manifest_groups: "-group1,group2" |
| 856 | the project will be matched. |
David Holmer | 0a1c6a1 | 2012-11-14 19:19:00 -0500 | [diff] [blame] | 857 | |
| 858 | The special manifest group "default" will match any project that |
| 859 | does not have the special project group "notdefault" |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 860 | """ |
David Holmer | 0a1c6a1 | 2012-11-14 19:19:00 -0500 | [diff] [blame] | 861 | expanded_manifest_groups = manifest_groups or ['default'] |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 862 | expanded_project_groups = ['all'] + (self.groups or []) |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 863 | if 'notdefault' not in expanded_project_groups: |
David Holmer | 0a1c6a1 | 2012-11-14 19:19:00 -0500 | [diff] [blame] | 864 | expanded_project_groups += ['default'] |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 865 | |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 866 | matched = False |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 867 | for group in expanded_manifest_groups: |
| 868 | if group.startswith('-') and group[1:] in expanded_project_groups: |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 869 | matched = False |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 870 | elif group in expanded_project_groups: |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 871 | matched = True |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 872 | |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 873 | return matched |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 874 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 875 | # Status Display ## |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 876 | def UncommitedFiles(self, get_all=True): |
| 877 | """Returns a list of strings, uncommitted files in the git tree. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 878 | |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 879 | Args: |
| 880 | get_all: a boolean, if True - get information about all different |
| 881 | uncommitted files. If False - return as soon as any kind of |
| 882 | uncommitted files is detected. |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 883 | """ |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 884 | details = [] |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 885 | self.work_git.update_index('-q', |
| 886 | '--unmerged', |
| 887 | '--ignore-missing', |
| 888 | '--refresh') |
| 889 | if self.IsRebaseInProgress(): |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 890 | details.append("rebase in progress") |
| 891 | if not get_all: |
| 892 | return details |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 893 | |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 894 | changes = self.work_git.DiffZ('diff-index', '--cached', HEAD).keys() |
| 895 | if changes: |
| 896 | details.extend(changes) |
| 897 | if not get_all: |
| 898 | return details |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 899 | |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 900 | changes = self.work_git.DiffZ('diff-files').keys() |
| 901 | if changes: |
| 902 | details.extend(changes) |
| 903 | if not get_all: |
| 904 | return details |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 905 | |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 906 | changes = self.work_git.LsOthers() |
| 907 | if changes: |
| 908 | details.extend(changes) |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 909 | |
Vadim Bendebury | 14e134d | 2014-10-05 15:40:30 -0700 | [diff] [blame] | 910 | return details |
| 911 | |
| 912 | def HasChanges(self): |
| 913 | """Returns true if there are uncommitted changes. |
| 914 | """ |
| 915 | if self.UncommitedFiles(get_all=False): |
| 916 | return True |
| 917 | else: |
| 918 | return False |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 919 | |
Andrew Wheeler | 4d5bb68 | 2012-02-27 13:52:22 -0600 | [diff] [blame] | 920 | def PrintWorkTreeStatus(self, output_redir=None, quiet=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 921 | """Prints the status of the repository to stdout. |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 922 | |
| 923 | Args: |
| 924 | output: If specified, redirect the output to this object. |
Andrew Wheeler | 4d5bb68 | 2012-02-27 13:52:22 -0600 | [diff] [blame] | 925 | quiet: If True then only print the project name. Do not print |
| 926 | the modified files, branch name, etc. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 927 | """ |
| 928 | if not os.path.isdir(self.worktree): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 929 | if output_redir is None: |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 930 | output_redir = sys.stdout |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 931 | print(file=output_redir) |
| 932 | print('project %s/' % self.relpath, file=output_redir) |
| 933 | print(' missing (run "repo sync")', file=output_redir) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 934 | return |
| 935 | |
| 936 | self.work_git.update_index('-q', |
| 937 | '--unmerged', |
| 938 | '--ignore-missing', |
| 939 | '--refresh') |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 940 | rb = self.IsRebaseInProgress() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 941 | di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD) |
| 942 | df = self.work_git.DiffZ('diff-files') |
| 943 | do = self.work_git.LsOthers() |
Ali Utku Selen | 76abcc1 | 2012-01-25 10:51:12 +0100 | [diff] [blame] | 944 | if not rb and not di and not df and not do and not self.CurrentBranch: |
Shawn O. Pearce | 161f445 | 2009-04-10 17:41:44 -0700 | [diff] [blame] | 945 | return 'CLEAN' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 946 | |
| 947 | out = StatusColoring(self.config) |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 948 | if output_redir is not None: |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 949 | out.redirect(output_redir) |
Jakub Vrana | 0402cd8 | 2014-09-09 15:39:15 -0700 | [diff] [blame] | 950 | out.project('project %-40s', self.relpath + '/ ') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 951 | |
Andrew Wheeler | 4d5bb68 | 2012-02-27 13:52:22 -0600 | [diff] [blame] | 952 | if quiet: |
| 953 | out.nl() |
| 954 | return 'DIRTY' |
| 955 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 956 | branch = self.CurrentBranch |
| 957 | if branch is None: |
| 958 | out.nobranch('(*** NO BRANCH ***)') |
| 959 | else: |
| 960 | out.branch('branch %s', branch) |
| 961 | out.nl() |
| 962 | |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 963 | if rb: |
| 964 | out.important('prior sync failed; rebase still in progress') |
| 965 | out.nl() |
| 966 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 967 | paths = list() |
| 968 | paths.extend(di.keys()) |
| 969 | paths.extend(df.keys()) |
| 970 | paths.extend(do) |
| 971 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 972 | for p in sorted(set(paths)): |
David Pursehouse | 5c6eeac | 2012-10-11 16:44:48 +0900 | [diff] [blame] | 973 | try: |
| 974 | i = di[p] |
| 975 | except KeyError: |
| 976 | i = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 977 | |
David Pursehouse | 5c6eeac | 2012-10-11 16:44:48 +0900 | [diff] [blame] | 978 | try: |
| 979 | f = df[p] |
| 980 | except KeyError: |
| 981 | f = None |
Julius Gustavsson | 0cb1b3f | 2010-06-17 17:55:02 +0200 | [diff] [blame] | 982 | |
David Pursehouse | 5c6eeac | 2012-10-11 16:44:48 +0900 | [diff] [blame] | 983 | if i: |
| 984 | i_status = i.status.upper() |
| 985 | else: |
| 986 | i_status = '-' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 987 | |
David Pursehouse | 5c6eeac | 2012-10-11 16:44:48 +0900 | [diff] [blame] | 988 | if f: |
| 989 | f_status = f.status.lower() |
| 990 | else: |
| 991 | f_status = '-' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 992 | |
| 993 | if i and i.src_path: |
Shawn O. Pearce | fe08675 | 2009-03-03 13:49:48 -0800 | [diff] [blame] | 994 | line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status, |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 995 | i.src_path, p, i.level) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 996 | else: |
| 997 | line = ' %s%s\t%s' % (i_status, f_status, p) |
| 998 | |
| 999 | if i and not f: |
| 1000 | out.added('%s', line) |
| 1001 | elif (i and f) or (not i and f): |
| 1002 | out.changed('%s', line) |
| 1003 | elif not i and not f: |
| 1004 | out.untracked('%s', line) |
| 1005 | else: |
| 1006 | out.write('%s', line) |
| 1007 | out.nl() |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 1008 | |
Shawn O. Pearce | 161f445 | 2009-04-10 17:41:44 -0700 | [diff] [blame] | 1009 | return 'DIRTY' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1010 | |
pelya | d67872d | 2012-03-28 14:49:58 +0300 | [diff] [blame] | 1011 | def PrintWorkTreeDiff(self, absolute_paths=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1012 | """Prints the status of the repository to stdout. |
| 1013 | """ |
| 1014 | out = DiffColoring(self.config) |
| 1015 | cmd = ['diff'] |
| 1016 | if out.is_on: |
| 1017 | cmd.append('--color') |
| 1018 | cmd.append(HEAD) |
pelya | d67872d | 2012-03-28 14:49:58 +0300 | [diff] [blame] | 1019 | if absolute_paths: |
| 1020 | cmd.append('--src-prefix=a/%s/' % self.relpath) |
| 1021 | cmd.append('--dst-prefix=b/%s/' % self.relpath) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1022 | cmd.append('--') |
| 1023 | p = GitCommand(self, |
| 1024 | cmd, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1025 | capture_stdout=True, |
| 1026 | capture_stderr=True) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1027 | has_diff = False |
| 1028 | for line in p.process.stdout: |
| 1029 | if not has_diff: |
| 1030 | out.nl() |
| 1031 | out.project('project %s/' % self.relpath) |
| 1032 | out.nl() |
| 1033 | has_diff = True |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 1034 | print(line[:-1]) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1035 | p.Wait() |
| 1036 | |
| 1037 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1038 | # Publish / Upload ## |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1039 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1040 | def WasPublished(self, branch, all_refs=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1041 | """Was the branch published (uploaded) for code review? |
| 1042 | If so, returns the SHA-1 hash of the last published |
| 1043 | state for the branch. |
| 1044 | """ |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1045 | key = R_PUB + branch |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1046 | if all_refs is None: |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1047 | try: |
| 1048 | return self.bare_git.rev_parse(key) |
| 1049 | except GitError: |
| 1050 | return None |
| 1051 | else: |
| 1052 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1053 | return all_refs[key] |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1054 | except KeyError: |
| 1055 | return None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1056 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1057 | def CleanPublishedCache(self, all_refs=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1058 | """Prunes any stale published refs. |
| 1059 | """ |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1060 | if all_refs is None: |
| 1061 | all_refs = self._allrefs |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1062 | heads = set() |
| 1063 | canrm = {} |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 1064 | for name, ref_id in all_refs.items(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1065 | if name.startswith(R_HEADS): |
| 1066 | heads.add(name) |
| 1067 | elif name.startswith(R_PUB): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1068 | canrm[name] = ref_id |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1069 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 1070 | for name, ref_id in canrm.items(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1071 | n = name[len(R_PUB):] |
| 1072 | if R_HEADS + n not in heads: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1073 | self.bare_git.DeleteRef(name, ref_id) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1074 | |
Mandeep Singh Baines | d6c93a2 | 2011-05-26 10:34:11 -0700 | [diff] [blame] | 1075 | def GetUploadableBranches(self, selected_branch=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1076 | """List any branches which can be uploaded for review. |
| 1077 | """ |
| 1078 | heads = {} |
| 1079 | pubed = {} |
| 1080 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 1081 | for name, ref_id in self._allrefs.items(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1082 | if name.startswith(R_HEADS): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1083 | heads[name[len(R_HEADS):]] = ref_id |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1084 | elif name.startswith(R_PUB): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1085 | pubed[name[len(R_PUB):]] = ref_id |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1086 | |
| 1087 | ready = [] |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 1088 | for branch, ref_id in heads.items(): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1089 | if branch in pubed and pubed[branch] == ref_id: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1090 | continue |
Mandeep Singh Baines | d6c93a2 | 2011-05-26 10:34:11 -0700 | [diff] [blame] | 1091 | if selected_branch and branch != selected_branch: |
| 1092 | continue |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1093 | |
Shawn O. Pearce | 35f2596 | 2008-11-11 17:03:13 -0800 | [diff] [blame] | 1094 | rb = self.GetUploadableBranch(branch) |
| 1095 | if rb: |
| 1096 | ready.append(rb) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1097 | return ready |
| 1098 | |
Shawn O. Pearce | 35f2596 | 2008-11-11 17:03:13 -0800 | [diff] [blame] | 1099 | def GetUploadableBranch(self, branch_name): |
| 1100 | """Get a single uploadable branch, or None. |
| 1101 | """ |
| 1102 | branch = self.GetBranch(branch_name) |
| 1103 | base = branch.LocalMerge |
| 1104 | if branch.LocalMerge: |
| 1105 | rb = ReviewableBranch(self, branch, base) |
| 1106 | if rb.commits: |
| 1107 | return rb |
| 1108 | return None |
| 1109 | |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 1110 | def UploadForReview(self, branch=None, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1111 | people=([], []), |
Brian Harring | 435370c | 2012-07-28 15:37:04 -0700 | [diff] [blame] | 1112 | auto_topic=False, |
Jonathan Nieder | c94d6eb | 2017-08-08 18:34:53 +0000 | [diff] [blame] | 1113 | draft=False, |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 1114 | private=False, |
| 1115 | wip=False, |
Bryan Jacobs | f609f91 | 2013-05-06 13:36:24 -0400 | [diff] [blame] | 1116 | dest_branch=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1117 | """Uploads the named branch for code review. |
| 1118 | """ |
| 1119 | if branch is None: |
| 1120 | branch = self.CurrentBranch |
| 1121 | if branch is None: |
| 1122 | raise GitError('not currently on a branch') |
| 1123 | |
| 1124 | branch = self.GetBranch(branch) |
| 1125 | if not branch.LocalMerge: |
| 1126 | raise GitError('branch %s does not track a remote' % branch.name) |
| 1127 | if not branch.remote.review: |
| 1128 | raise GitError('remote %s has no review url' % branch.remote.name) |
| 1129 | |
Bryan Jacobs | f609f91 | 2013-05-06 13:36:24 -0400 | [diff] [blame] | 1130 | if dest_branch is None: |
| 1131 | dest_branch = self.dest_branch |
| 1132 | if dest_branch is None: |
| 1133 | dest_branch = branch.merge |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1134 | if not dest_branch.startswith(R_HEADS): |
| 1135 | dest_branch = R_HEADS + dest_branch |
| 1136 | |
Shawn O. Pearce | 339ba9f | 2008-11-06 09:52:51 -0800 | [diff] [blame] | 1137 | if not branch.remote.projectname: |
| 1138 | branch.remote.projectname = self.name |
| 1139 | branch.remote.Save() |
| 1140 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 1141 | url = branch.remote.ReviewUrl(self.UserEmail) |
| 1142 | if url is None: |
| 1143 | raise UploadError('review not configured') |
| 1144 | cmd = ['push'] |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 1145 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 1146 | if url.startswith('ssh://'): |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 1147 | rp = ['gerrit receive-pack'] |
| 1148 | for e in people[0]: |
| 1149 | rp.append('--reviewer=%s' % sq(e)) |
| 1150 | for e in people[1]: |
| 1151 | rp.append('--cc=%s' % sq(e)) |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 1152 | cmd.append('--receive-pack=%s' % " ".join(rp)) |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 1153 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 1154 | cmd.append(url) |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 1155 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 1156 | if dest_branch.startswith(R_HEADS): |
| 1157 | dest_branch = dest_branch[len(R_HEADS):] |
Brian Harring | 435370c | 2012-07-28 15:37:04 -0700 | [diff] [blame] | 1158 | |
Jonathan Nieder | c94d6eb | 2017-08-08 18:34:53 +0000 | [diff] [blame] | 1159 | upload_type = 'for' |
| 1160 | if draft: |
| 1161 | upload_type = 'drafts' |
| 1162 | |
| 1163 | ref_spec = '%s:refs/%s/%s' % (R_HEADS + branch.name, upload_type, |
| 1164 | dest_branch) |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 1165 | if auto_topic: |
| 1166 | ref_spec = ref_spec + '/' + branch.name |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 1167 | |
Shawn Pearce | 45d2168 | 2013-02-28 00:35:51 -0800 | [diff] [blame] | 1168 | if not url.startswith('ssh://'): |
| 1169 | rp = ['r=%s' % p for p in people[0]] + \ |
| 1170 | ['cc=%s' % p for p in people[1]] |
Changcheng Xiao | 87984c6 | 2017-08-02 16:55:03 +0200 | [diff] [blame] | 1171 | if private: |
| 1172 | rp = rp + ['private'] |
| 1173 | if wip: |
| 1174 | rp = rp + ['wip'] |
Shawn Pearce | 45d2168 | 2013-02-28 00:35:51 -0800 | [diff] [blame] | 1175 | if rp: |
| 1176 | ref_spec = ref_spec + '%' + ','.join(rp) |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 1177 | cmd.append(ref_spec) |
| 1178 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1179 | if GitCommand(self, cmd, bare=True).Wait() != 0: |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 1180 | raise UploadError('Upload failed') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1181 | |
| 1182 | msg = "posted to %s for %s" % (branch.remote.review, dest_branch) |
| 1183 | self.bare_git.UpdateRef(R_PUB + branch.name, |
| 1184 | R_HEADS + branch.name, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1185 | message=msg) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1186 | |
| 1187 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1188 | # Sync ## |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1189 | |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 1190 | def _ExtractArchive(self, tarpath, path=None): |
| 1191 | """Extract the given tar on its current location |
| 1192 | |
| 1193 | Args: |
| 1194 | - tarpath: The path to the actual tar file |
| 1195 | |
| 1196 | """ |
| 1197 | try: |
| 1198 | with tarfile.open(tarpath, 'r') as tar: |
| 1199 | tar.extractall(path=path) |
| 1200 | return True |
| 1201 | except (IOError, tarfile.TarError) as e: |
David Pursehouse | f33929d | 2015-08-24 14:39:14 +0900 | [diff] [blame] | 1202 | _error("Cannot extract archive %s: %s", tarpath, str(e)) |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 1203 | return False |
| 1204 | |
Shawn O. Pearce | e02ac0a | 2012-03-14 15:36:59 -0700 | [diff] [blame] | 1205 | def Sync_NetworkHalf(self, |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1206 | quiet=False, |
| 1207 | is_new=None, |
| 1208 | current_branch_only=False, |
| 1209 | force_sync=False, |
| 1210 | clone_bundle=True, |
| 1211 | no_tags=False, |
| 1212 | archive=False, |
| 1213 | optimized_fetch=False, |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1214 | prune=False, |
| 1215 | submodules=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1216 | """Perform only the network IO portion of the sync process. |
| 1217 | Local working directory/branch state is not affected. |
| 1218 | """ |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 1219 | if archive and not isinstance(self, MetaProject): |
| 1220 | if self.remote.url.startswith(('http://', 'https://')): |
David Pursehouse | f33929d | 2015-08-24 14:39:14 +0900 | [diff] [blame] | 1221 | _error("%s: Cannot fetch archives from http/https remotes.", self.name) |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 1222 | return False |
| 1223 | |
| 1224 | name = self.relpath.replace('\\', '/') |
| 1225 | name = name.replace('/', '_') |
| 1226 | tarpath = '%s.tar' % name |
| 1227 | topdir = self.manifest.topdir |
| 1228 | |
| 1229 | try: |
| 1230 | self._FetchArchive(tarpath, cwd=topdir) |
| 1231 | except GitError as e: |
David Pursehouse | f33929d | 2015-08-24 14:39:14 +0900 | [diff] [blame] | 1232 | _error('%s', e) |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 1233 | return False |
| 1234 | |
| 1235 | # From now on, we only need absolute tarpath |
| 1236 | tarpath = os.path.join(topdir, tarpath) |
| 1237 | |
| 1238 | if not self._ExtractArchive(tarpath, path=topdir): |
| 1239 | return False |
| 1240 | try: |
| 1241 | os.remove(tarpath) |
| 1242 | except OSError as e: |
David Pursehouse | f33929d | 2015-08-24 14:39:14 +0900 | [diff] [blame] | 1243 | _warn("Cannot remove archive %s: %s", tarpath, str(e)) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1244 | self._CopyAndLinkFiles() |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 1245 | return True |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1246 | if is_new is None: |
| 1247 | is_new = not self.Exists |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1248 | if is_new: |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 1249 | self._InitGitDir(force_sync=force_sync) |
Jimmie Wester | a044458 | 2012-10-24 13:44:42 +0200 | [diff] [blame] | 1250 | else: |
| 1251 | self._UpdateHooks() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1252 | self._InitRemote() |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1253 | |
| 1254 | if is_new: |
| 1255 | alt = os.path.join(self.gitdir, 'objects/info/alternates') |
| 1256 | try: |
| 1257 | fd = open(alt, 'rb') |
| 1258 | try: |
| 1259 | alt_dir = fd.readline().rstrip() |
| 1260 | finally: |
| 1261 | fd.close() |
| 1262 | except IOError: |
| 1263 | alt_dir = None |
| 1264 | else: |
| 1265 | alt_dir = None |
| 1266 | |
Shawn O. Pearce | e02ac0a | 2012-03-14 15:36:59 -0700 | [diff] [blame] | 1267 | if clone_bundle \ |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1268 | and alt_dir is None \ |
| 1269 | and self._ApplyCloneBundle(initial=is_new, quiet=quiet): |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1270 | is_new = False |
| 1271 | |
Shawn O. Pearce | 6ba6ba0 | 2012-05-24 09:46:50 -0700 | [diff] [blame] | 1272 | if not current_branch_only: |
| 1273 | if self.sync_c: |
| 1274 | current_branch_only = True |
| 1275 | elif not self.manifest._loaded: |
| 1276 | # Manifest cannot check defaults until it syncs. |
| 1277 | current_branch_only = False |
| 1278 | elif self.manifest.default.sync_c: |
| 1279 | current_branch_only = True |
| 1280 | |
Aymen Bouaziz | 6c59446 | 2016-10-25 18:03:51 +0200 | [diff] [blame] | 1281 | if self.clone_depth: |
| 1282 | depth = self.clone_depth |
| 1283 | else: |
| 1284 | depth = self.manifest.manifestProject.config.GetString('repo.depth') |
| 1285 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1286 | need_to_fetch = not (optimized_fetch and |
| 1287 | (ID_RE.match(self.revisionExpr) and |
Zac Livingston | e433226 | 2017-06-16 08:56:09 -0600 | [diff] [blame^] | 1288 | self._CheckForImmutableRevision())) |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1289 | if (need_to_fetch and |
| 1290 | not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir, |
| 1291 | current_branch_only=current_branch_only, |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1292 | no_tags=no_tags, prune=prune, depth=depth, |
| 1293 | submodules=submodules)): |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1294 | return False |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 1295 | |
| 1296 | if self.worktree: |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 1297 | self._InitMRef() |
| 1298 | else: |
| 1299 | self._InitMirrorHead() |
| 1300 | try: |
| 1301 | os.remove(os.path.join(self.gitdir, 'FETCH_HEAD')) |
| 1302 | except OSError: |
| 1303 | pass |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1304 | return True |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 1305 | |
| 1306 | def PostRepoUpgrade(self): |
| 1307 | self._InitHooks() |
| 1308 | |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1309 | def _CopyAndLinkFiles(self): |
Simran Basi | b9a1b73 | 2015-08-20 12:19:28 -0700 | [diff] [blame] | 1310 | if self.manifest.isGitcClient: |
| 1311 | return |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1312 | for copyfile in self.copyfiles: |
| 1313 | copyfile._Copy() |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1314 | for linkfile in self.linkfiles: |
| 1315 | linkfile._Link() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1316 | |
Julien Campergue | dd65422 | 2014-01-09 16:21:37 +0100 | [diff] [blame] | 1317 | def GetCommitRevisionId(self): |
| 1318 | """Get revisionId of a commit. |
| 1319 | |
| 1320 | Use this method instead of GetRevisionId to get the id of the commit rather |
| 1321 | than the id of the current git object (for example, a tag) |
| 1322 | |
| 1323 | """ |
| 1324 | if not self.revisionExpr.startswith(R_TAGS): |
| 1325 | return self.GetRevisionId(self._allrefs) |
| 1326 | |
| 1327 | try: |
| 1328 | return self.bare_git.rev_list(self.revisionExpr, '-1')[0] |
| 1329 | except GitError: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1330 | raise ManifestInvalidRevisionError('revision %s in %s not found' % |
| 1331 | (self.revisionExpr, self.name)) |
Julien Campergue | dd65422 | 2014-01-09 16:21:37 +0100 | [diff] [blame] | 1332 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1333 | def GetRevisionId(self, all_refs=None): |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1334 | if self.revisionId: |
| 1335 | return self.revisionId |
| 1336 | |
| 1337 | rem = self.GetRemote(self.remote.name) |
| 1338 | rev = rem.ToLocal(self.revisionExpr) |
| 1339 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1340 | if all_refs is not None and rev in all_refs: |
| 1341 | return all_refs[rev] |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1342 | |
| 1343 | try: |
| 1344 | return self.bare_git.rev_parse('--verify', '%s^0' % rev) |
| 1345 | except GitError: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1346 | raise ManifestInvalidRevisionError('revision %s in %s not found' % |
| 1347 | (self.revisionExpr, self.name)) |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1348 | |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1349 | def Sync_LocalHalf(self, syncbuf, force_sync=False, submodules=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1350 | """Perform only the local IO portion of the sync process. |
| 1351 | Network access is not required. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1352 | """ |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1353 | self._InitWorkTree(force_sync=force_sync, submodules=submodules) |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1354 | all_refs = self.bare_ref.all |
| 1355 | self.CleanPublishedCache(all_refs) |
| 1356 | revid = self.GetRevisionId(all_refs) |
Skyler Kaufman | 835cd68 | 2011-03-08 12:14:41 -0800 | [diff] [blame] | 1357 | |
David Pursehouse | 1d947b3 | 2012-10-25 12:23:11 +0900 | [diff] [blame] | 1358 | def _doff(): |
| 1359 | self._FastForward(revid) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1360 | self._CopyAndLinkFiles() |
David Pursehouse | 1d947b3 | 2012-10-25 12:23:11 +0900 | [diff] [blame] | 1361 | |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1362 | def _dosubmodules(): |
| 1363 | self._SyncSubmodules(quiet=True) |
| 1364 | |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1365 | head = self.work_git.GetHead() |
| 1366 | if head.startswith(R_HEADS): |
| 1367 | branch = head[len(R_HEADS):] |
| 1368 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1369 | head = all_refs[head] |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1370 | except KeyError: |
| 1371 | head = None |
| 1372 | else: |
| 1373 | branch = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1374 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1375 | if branch is None or syncbuf.detach_head: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1376 | # Currently on a detached HEAD. The user is assumed to |
| 1377 | # not have any local modifications worth worrying about. |
| 1378 | # |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 1379 | if self.IsRebaseInProgress(): |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1380 | syncbuf.fail(self, _PriorSyncFailedError()) |
| 1381 | return |
| 1382 | |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1383 | if head == revid: |
| 1384 | # No changes; don't do anything further. |
Florian Vallee | 7cf1b36 | 2012-06-07 17:11:42 +0200 | [diff] [blame] | 1385 | # Except if the head needs to be detached |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1386 | # |
Florian Vallee | 7cf1b36 | 2012-06-07 17:11:42 +0200 | [diff] [blame] | 1387 | if not syncbuf.detach_head: |
Dan Willemsen | 029eaf3 | 2015-09-03 12:52:28 -0700 | [diff] [blame] | 1388 | # The copy/linkfile config may have changed. |
| 1389 | self._CopyAndLinkFiles() |
Florian Vallee | 7cf1b36 | 2012-06-07 17:11:42 +0200 | [diff] [blame] | 1390 | return |
| 1391 | else: |
| 1392 | lost = self._revlist(not_rev(revid), HEAD) |
| 1393 | if lost: |
| 1394 | syncbuf.info(self, "discarding %d commits", len(lost)) |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1395 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1396 | try: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1397 | self._Checkout(revid, quiet=True) |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1398 | if submodules: |
| 1399 | self._SyncSubmodules(quiet=True) |
Sarah Owens | a5be53f | 2012-09-09 15:37:57 -0700 | [diff] [blame] | 1400 | except GitError as e: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1401 | syncbuf.fail(self, e) |
| 1402 | return |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1403 | self._CopyAndLinkFiles() |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1404 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1405 | |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1406 | if head == revid: |
| 1407 | # No changes; don't do anything further. |
| 1408 | # |
Dan Willemsen | 029eaf3 | 2015-09-03 12:52:28 -0700 | [diff] [blame] | 1409 | # The copy/linkfile config may have changed. |
| 1410 | self._CopyAndLinkFiles() |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1411 | return |
| 1412 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1413 | branch = self.GetBranch(branch) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1414 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1415 | if not branch.LocalMerge: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1416 | # The current branch has no tracking configuration. |
Anatol Pomazau | 2a32f6a | 2011-08-30 10:52:33 -0700 | [diff] [blame] | 1417 | # Jump off it to a detached HEAD. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1418 | # |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1419 | syncbuf.info(self, |
| 1420 | "leaving %s; does not track upstream", |
| 1421 | branch.name) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1422 | try: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1423 | self._Checkout(revid, quiet=True) |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1424 | if submodules: |
| 1425 | self._SyncSubmodules(quiet=True) |
Sarah Owens | a5be53f | 2012-09-09 15:37:57 -0700 | [diff] [blame] | 1426 | except GitError as e: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1427 | syncbuf.fail(self, e) |
| 1428 | return |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1429 | self._CopyAndLinkFiles() |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1430 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1431 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1432 | upstream_gain = self._revlist(not_rev(HEAD), revid) |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1433 | pub = self.WasPublished(branch.name, all_refs) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1434 | if pub: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1435 | not_merged = self._revlist(not_rev(revid), pub) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1436 | if not_merged: |
| 1437 | if upstream_gain: |
| 1438 | # The user has published this branch and some of those |
| 1439 | # commits are not yet merged upstream. We do not want |
| 1440 | # to rewrite the published commits so we punt. |
| 1441 | # |
Daniel Sandler | 4c50dee | 2010-03-02 15:38:03 -0500 | [diff] [blame] | 1442 | syncbuf.fail(self, |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1443 | "branch %s is published (but not merged) and is now " |
| 1444 | "%d commits behind" % (branch.name, len(upstream_gain))) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1445 | return |
Shawn O. Pearce | 05f66b6 | 2009-04-21 08:26:32 -0700 | [diff] [blame] | 1446 | elif pub == head: |
| 1447 | # All published commits are merged, and thus we are a |
| 1448 | # strict subset. We can fast-forward safely. |
Shawn O. Pearce | a54c527 | 2008-10-30 11:03:00 -0700 | [diff] [blame] | 1449 | # |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1450 | syncbuf.later1(self, _doff) |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1451 | if submodules: |
| 1452 | syncbuf.later1(self, _dosubmodules) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1453 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1454 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1455 | # Examine the local commits not in the remote. Find the |
| 1456 | # last one attributed to this user, if any. |
| 1457 | # |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1458 | local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce') |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1459 | last_mine = None |
| 1460 | cnt_mine = 0 |
| 1461 | for commit in local_changes: |
Chirayu Desai | 0eb35cb | 2013-11-19 18:46:29 +0530 | [diff] [blame] | 1462 | commit_id, committer_email = commit.decode('utf-8').split(' ', 1) |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1463 | if committer_email == self.UserEmail: |
| 1464 | last_mine = commit_id |
| 1465 | cnt_mine += 1 |
| 1466 | |
Shawn O. Pearce | da88ff4 | 2009-06-03 11:09:12 -0700 | [diff] [blame] | 1467 | if not upstream_gain and cnt_mine == len(local_changes): |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1468 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1469 | |
| 1470 | if self.IsDirty(consider_untracked=False): |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1471 | syncbuf.fail(self, _DirtyError()) |
| 1472 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1473 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1474 | # If the upstream switched on us, warn the user. |
| 1475 | # |
| 1476 | if branch.merge != self.revisionExpr: |
| 1477 | if branch.merge and self.revisionExpr: |
| 1478 | syncbuf.info(self, |
| 1479 | 'manifest switched %s...%s', |
| 1480 | branch.merge, |
| 1481 | self.revisionExpr) |
| 1482 | elif branch.merge: |
| 1483 | syncbuf.info(self, |
| 1484 | 'manifest no longer tracks %s', |
| 1485 | branch.merge) |
| 1486 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1487 | if cnt_mine < len(local_changes): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1488 | # Upstream rebased. Not everything in HEAD |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1489 | # was created by this user. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1490 | # |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1491 | syncbuf.info(self, |
| 1492 | "discarding %d commits removed from upstream", |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1493 | len(local_changes) - cnt_mine) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1494 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1495 | branch.remote = self.GetRemote(self.remote.name) |
Anatol Pomazau | cd7c5de | 2012-03-20 13:45:00 -0700 | [diff] [blame] | 1496 | if not ID_RE.match(self.revisionExpr): |
| 1497 | # in case of manifest sync the revisionExpr might be a SHA1 |
| 1498 | branch.merge = self.revisionExpr |
Conley Owens | 04f2f0e | 2014-10-01 17:22:46 -0700 | [diff] [blame] | 1499 | if not branch.merge.startswith('refs/'): |
| 1500 | branch.merge = R_HEADS + branch.merge |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1501 | branch.Save() |
| 1502 | |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 1503 | if cnt_mine > 0 and self.rebase: |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1504 | def _docopyandlink(): |
| 1505 | self._CopyAndLinkFiles() |
| 1506 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1507 | def _dorebase(): |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1508 | self._Rebase(upstream='%s^1' % last_mine, onto=revid) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1509 | syncbuf.later2(self, _dorebase) |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1510 | if submodules: |
| 1511 | syncbuf.later2(self, _dosubmodules) |
| 1512 | syncbuf.later2(self, _docopyandlink) |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1513 | elif local_changes: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1514 | try: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1515 | self._ResetHard(revid) |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1516 | if submodules: |
| 1517 | self._SyncSubmodules(quiet=True) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1518 | self._CopyAndLinkFiles() |
Sarah Owens | a5be53f | 2012-09-09 15:37:57 -0700 | [diff] [blame] | 1519 | except GitError as e: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1520 | syncbuf.fail(self, e) |
| 1521 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1522 | else: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1523 | syncbuf.later1(self, _doff) |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1524 | if submodules: |
| 1525 | syncbuf.later1(self, _dosubmodules) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1526 | |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 1527 | def AddCopyFile(self, src, dest, absdest): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1528 | # dest should already be an absolute path, but src is project relative |
| 1529 | # make src an absolute path |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 1530 | abssrc = os.path.join(self.worktree, src) |
| 1531 | self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest)) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1532 | |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1533 | def AddLinkFile(self, src, dest, absdest): |
| 1534 | # dest should already be an absolute path, but src is project relative |
Colin Cross | 0184dcc | 2015-05-05 00:24:54 -0700 | [diff] [blame] | 1535 | # make src relative path to dest |
| 1536 | absdestdir = os.path.dirname(absdest) |
| 1537 | relsrc = os.path.relpath(os.path.join(self.worktree, src), absdestdir) |
Wink Saville | 4c426ef | 2015-06-03 08:05:17 -0700 | [diff] [blame] | 1538 | self.linkfiles.append(_LinkFile(self.worktree, src, dest, relsrc, absdest)) |
Jeff Hamilton | e0df232 | 2014-04-21 17:10:59 -0500 | [diff] [blame] | 1539 | |
James W. Mills | 24c1308 | 2012-04-12 15:04:13 -0500 | [diff] [blame] | 1540 | def AddAnnotation(self, name, value, keep): |
| 1541 | self.annotations.append(_Annotation(name, value, keep)) |
| 1542 | |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 1543 | def DownloadPatchSet(self, change_id, patch_id): |
| 1544 | """Download a single patch set of a single change to FETCH_HEAD. |
| 1545 | """ |
| 1546 | remote = self.GetRemote(self.remote.name) |
| 1547 | |
| 1548 | cmd = ['fetch', remote.name] |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1549 | cmd.append('refs/changes/%2.2d/%d/%d' |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 1550 | % (change_id % 100, change_id, patch_id)) |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 1551 | if GitCommand(self, cmd, bare=True).Wait() != 0: |
| 1552 | return None |
| 1553 | return DownloadedChange(self, |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1554 | self.GetRevisionId(), |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 1555 | change_id, |
| 1556 | patch_id, |
| 1557 | self.bare_git.rev_parse('FETCH_HEAD')) |
| 1558 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1559 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1560 | # Branch Management ## |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1561 | |
Simran Basi | b9a1b73 | 2015-08-20 12:19:28 -0700 | [diff] [blame] | 1562 | def StartBranch(self, name, branch_merge=''): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1563 | """Create a new branch off the manifest's revision. |
| 1564 | """ |
Simran Basi | b9a1b73 | 2015-08-20 12:19:28 -0700 | [diff] [blame] | 1565 | if not branch_merge: |
| 1566 | branch_merge = self.revisionExpr |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1567 | head = self.work_git.GetHead() |
| 1568 | if head == (R_HEADS + name): |
| 1569 | return True |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1570 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1571 | all_refs = self.bare_ref.all |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1572 | if R_HEADS + name in all_refs: |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1573 | return GitCommand(self, |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1574 | ['checkout', name, '--'], |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1575 | capture_stdout=True, |
| 1576 | capture_stderr=True).Wait() == 0 |
Shawn O. Pearce | 0a389e9 | 2009-04-10 16:21:18 -0700 | [diff] [blame] | 1577 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1578 | branch = self.GetBranch(name) |
| 1579 | branch.remote = self.GetRemote(self.remote.name) |
Simran Basi | b9a1b73 | 2015-08-20 12:19:28 -0700 | [diff] [blame] | 1580 | branch.merge = branch_merge |
| 1581 | if not branch.merge.startswith('refs/') and not ID_RE.match(branch_merge): |
| 1582 | branch.merge = R_HEADS + branch_merge |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1583 | revid = self.GetRevisionId(all_refs) |
Shawn O. Pearce | 0a389e9 | 2009-04-10 16:21:18 -0700 | [diff] [blame] | 1584 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1585 | if head.startswith(R_HEADS): |
| 1586 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1587 | head = all_refs[head] |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1588 | except KeyError: |
| 1589 | head = None |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1590 | if revid and head and revid == head: |
| 1591 | ref = os.path.join(self.gitdir, R_HEADS + name) |
| 1592 | try: |
| 1593 | os.makedirs(os.path.dirname(ref)) |
| 1594 | except OSError: |
| 1595 | pass |
| 1596 | _lwrite(ref, '%s\n' % revid) |
| 1597 | _lwrite(os.path.join(self.worktree, '.git', HEAD), |
| 1598 | 'ref: %s%s\n' % (R_HEADS, name)) |
| 1599 | branch.Save() |
| 1600 | return True |
| 1601 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1602 | if GitCommand(self, |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1603 | ['checkout', '-b', branch.name, revid], |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1604 | capture_stdout=True, |
| 1605 | capture_stderr=True).Wait() == 0: |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1606 | branch.Save() |
| 1607 | return True |
| 1608 | return False |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1609 | |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1610 | def CheckoutBranch(self, name): |
| 1611 | """Checkout a local topic branch. |
Doug Anderson | 3ba5f95 | 2011-04-07 12:51:04 -0700 | [diff] [blame] | 1612 | |
| 1613 | Args: |
| 1614 | name: The name of the branch to checkout. |
| 1615 | |
| 1616 | Returns: |
| 1617 | True if the checkout succeeded; False if it didn't; None if the branch |
| 1618 | didn't exist. |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1619 | """ |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1620 | rev = R_HEADS + name |
| 1621 | head = self.work_git.GetHead() |
| 1622 | if head == rev: |
| 1623 | # Already on the branch |
| 1624 | # |
| 1625 | return True |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1626 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1627 | all_refs = self.bare_ref.all |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1628 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1629 | revid = all_refs[rev] |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1630 | except KeyError: |
| 1631 | # Branch does not exist in this project |
| 1632 | # |
Doug Anderson | 3ba5f95 | 2011-04-07 12:51:04 -0700 | [diff] [blame] | 1633 | return None |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1634 | |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1635 | if head.startswith(R_HEADS): |
| 1636 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1637 | head = all_refs[head] |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1638 | except KeyError: |
| 1639 | head = None |
| 1640 | |
| 1641 | if head == revid: |
| 1642 | # Same revision; just update HEAD to point to the new |
| 1643 | # target branch, but otherwise take no other action. |
| 1644 | # |
| 1645 | _lwrite(os.path.join(self.worktree, '.git', HEAD), |
| 1646 | 'ref: %s%s\n' % (R_HEADS, name)) |
| 1647 | return True |
| 1648 | |
| 1649 | return GitCommand(self, |
| 1650 | ['checkout', name, '--'], |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1651 | capture_stdout=True, |
| 1652 | capture_stderr=True).Wait() == 0 |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1653 | |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1654 | def AbandonBranch(self, name): |
| 1655 | """Destroy a local topic branch. |
Doug Anderson | dafb1d6 | 2011-04-07 11:46:59 -0700 | [diff] [blame] | 1656 | |
| 1657 | Args: |
| 1658 | name: The name of the branch to abandon. |
| 1659 | |
| 1660 | Returns: |
| 1661 | True if the abandon succeeded; False if it didn't; None if the branch |
| 1662 | didn't exist. |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1663 | """ |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1664 | rev = R_HEADS + name |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1665 | all_refs = self.bare_ref.all |
| 1666 | if rev not in all_refs: |
Doug Anderson | dafb1d6 | 2011-04-07 11:46:59 -0700 | [diff] [blame] | 1667 | # Doesn't exist |
| 1668 | return None |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1669 | |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1670 | head = self.work_git.GetHead() |
| 1671 | if head == rev: |
| 1672 | # We can't destroy the branch while we are sitting |
| 1673 | # on it. Switch to a detached HEAD. |
| 1674 | # |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1675 | head = all_refs[head] |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1676 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1677 | revid = self.GetRevisionId(all_refs) |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1678 | if head == revid: |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1679 | _lwrite(os.path.join(self.worktree, '.git', HEAD), |
| 1680 | '%s\n' % revid) |
| 1681 | else: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1682 | self._Checkout(revid, quiet=True) |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1683 | |
| 1684 | return GitCommand(self, |
| 1685 | ['branch', '-D', name], |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1686 | capture_stdout=True, |
| 1687 | capture_stderr=True).Wait() == 0 |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1688 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1689 | def PruneHeads(self): |
| 1690 | """Prune any topic branches already merged into upstream. |
| 1691 | """ |
| 1692 | cb = self.CurrentBranch |
| 1693 | kill = [] |
Shawn O. Pearce | 3778f9d | 2009-03-02 12:30:50 -0800 | [diff] [blame] | 1694 | left = self._allrefs |
| 1695 | for name in left.keys(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1696 | if name.startswith(R_HEADS): |
| 1697 | name = name[len(R_HEADS):] |
| 1698 | if cb is None or name != cb: |
| 1699 | kill.append(name) |
| 1700 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1701 | rev = self.GetRevisionId(left) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1702 | if cb is not None \ |
| 1703 | and not self._revlist(HEAD + '...' + rev) \ |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1704 | and not self.IsDirty(consider_untracked=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1705 | self.work_git.DetachHead(HEAD) |
| 1706 | kill.append(cb) |
| 1707 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1708 | if kill: |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 1709 | old = self.bare_git.GetHead() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1710 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1711 | try: |
| 1712 | self.bare_git.DetachHead(rev) |
| 1713 | |
| 1714 | b = ['branch', '-d'] |
| 1715 | b.extend(kill) |
| 1716 | b = GitCommand(self, b, bare=True, |
| 1717 | capture_stdout=True, |
| 1718 | capture_stderr=True) |
| 1719 | b.Wait() |
| 1720 | finally: |
Dan Willemsen | 1a799d1 | 2015-12-15 13:40:05 -0800 | [diff] [blame] | 1721 | if ID_RE.match(old): |
| 1722 | self.bare_git.DetachHead(old) |
| 1723 | else: |
| 1724 | self.bare_git.SetHead(old) |
Shawn O. Pearce | 3778f9d | 2009-03-02 12:30:50 -0800 | [diff] [blame] | 1725 | left = self._allrefs |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1726 | |
Shawn O. Pearce | 3778f9d | 2009-03-02 12:30:50 -0800 | [diff] [blame] | 1727 | for branch in kill: |
| 1728 | if (R_HEADS + branch) not in left: |
| 1729 | self.CleanPublishedCache() |
| 1730 | break |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1731 | |
| 1732 | if cb and cb not in kill: |
| 1733 | kill.append(cb) |
Shawn O. Pearce | 7c6c64d | 2009-03-02 12:38:13 -0800 | [diff] [blame] | 1734 | kill.sort() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1735 | |
| 1736 | kept = [] |
| 1737 | for branch in kill: |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1738 | if R_HEADS + branch in left: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1739 | branch = self.GetBranch(branch) |
| 1740 | base = branch.LocalMerge |
| 1741 | if not base: |
| 1742 | base = rev |
| 1743 | kept.append(ReviewableBranch(self, branch, base)) |
| 1744 | return kept |
| 1745 | |
| 1746 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1747 | # Submodule Management ## |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1748 | |
| 1749 | def GetRegisteredSubprojects(self): |
| 1750 | result = [] |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1751 | |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1752 | def rec(subprojects): |
| 1753 | if not subprojects: |
| 1754 | return |
| 1755 | result.extend(subprojects) |
| 1756 | for p in subprojects: |
| 1757 | rec(p.subprojects) |
| 1758 | rec(self.subprojects) |
| 1759 | return result |
| 1760 | |
| 1761 | def _GetSubmodules(self): |
| 1762 | # Unfortunately we cannot call `git submodule status --recursive` here |
| 1763 | # because the working tree might not exist yet, and it cannot be used |
| 1764 | # without a working tree in its current implementation. |
| 1765 | |
| 1766 | def get_submodules(gitdir, rev): |
| 1767 | # Parse .gitmodules for submodule sub_paths and sub_urls |
| 1768 | sub_paths, sub_urls = parse_gitmodules(gitdir, rev) |
| 1769 | if not sub_paths: |
| 1770 | return [] |
| 1771 | # Run `git ls-tree` to read SHAs of submodule object, which happen to be |
| 1772 | # revision of submodule repository |
| 1773 | sub_revs = git_ls_tree(gitdir, rev, sub_paths) |
| 1774 | submodules = [] |
| 1775 | for sub_path, sub_url in zip(sub_paths, sub_urls): |
| 1776 | try: |
| 1777 | sub_rev = sub_revs[sub_path] |
| 1778 | except KeyError: |
| 1779 | # Ignore non-exist submodules |
| 1780 | continue |
| 1781 | submodules.append((sub_rev, sub_path, sub_url)) |
| 1782 | return submodules |
| 1783 | |
| 1784 | re_path = re.compile(r'^submodule\.([^.]+)\.path=(.*)$') |
| 1785 | re_url = re.compile(r'^submodule\.([^.]+)\.url=(.*)$') |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1786 | |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1787 | def parse_gitmodules(gitdir, rev): |
| 1788 | cmd = ['cat-file', 'blob', '%s:.gitmodules' % rev] |
| 1789 | try: |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1790 | p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True, |
| 1791 | bare=True, gitdir=gitdir) |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1792 | except GitError: |
| 1793 | return [], [] |
| 1794 | if p.Wait() != 0: |
| 1795 | return [], [] |
| 1796 | |
| 1797 | gitmodules_lines = [] |
| 1798 | fd, temp_gitmodules_path = tempfile.mkstemp() |
| 1799 | try: |
| 1800 | os.write(fd, p.stdout) |
| 1801 | os.close(fd) |
| 1802 | cmd = ['config', '--file', temp_gitmodules_path, '--list'] |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1803 | p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True, |
| 1804 | bare=True, gitdir=gitdir) |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1805 | if p.Wait() != 0: |
| 1806 | return [], [] |
| 1807 | gitmodules_lines = p.stdout.split('\n') |
| 1808 | except GitError: |
| 1809 | return [], [] |
| 1810 | finally: |
| 1811 | os.remove(temp_gitmodules_path) |
| 1812 | |
| 1813 | names = set() |
| 1814 | paths = {} |
| 1815 | urls = {} |
| 1816 | for line in gitmodules_lines: |
| 1817 | if not line: |
| 1818 | continue |
| 1819 | m = re_path.match(line) |
| 1820 | if m: |
| 1821 | names.add(m.group(1)) |
| 1822 | paths[m.group(1)] = m.group(2) |
| 1823 | continue |
| 1824 | m = re_url.match(line) |
| 1825 | if m: |
| 1826 | names.add(m.group(1)) |
| 1827 | urls[m.group(1)] = m.group(2) |
| 1828 | continue |
| 1829 | names = sorted(names) |
| 1830 | return ([paths.get(name, '') for name in names], |
| 1831 | [urls.get(name, '') for name in names]) |
| 1832 | |
| 1833 | def git_ls_tree(gitdir, rev, paths): |
| 1834 | cmd = ['ls-tree', rev, '--'] |
| 1835 | cmd.extend(paths) |
| 1836 | try: |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1837 | p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True, |
| 1838 | bare=True, gitdir=gitdir) |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1839 | except GitError: |
| 1840 | return [] |
| 1841 | if p.Wait() != 0: |
| 1842 | return [] |
| 1843 | objects = {} |
| 1844 | for line in p.stdout.split('\n'): |
| 1845 | if not line.strip(): |
| 1846 | continue |
| 1847 | object_rev, object_path = line.split()[2:4] |
| 1848 | objects[object_path] = object_rev |
| 1849 | return objects |
| 1850 | |
| 1851 | try: |
| 1852 | rev = self.GetRevisionId() |
| 1853 | except GitError: |
| 1854 | return [] |
| 1855 | return get_submodules(self.gitdir, rev) |
| 1856 | |
| 1857 | def GetDerivedSubprojects(self): |
| 1858 | result = [] |
| 1859 | if not self.Exists: |
| 1860 | # If git repo does not exist yet, querying its submodules will |
| 1861 | # mess up its states; so return here. |
| 1862 | return result |
| 1863 | for rev, path, url in self._GetSubmodules(): |
| 1864 | name = self.manifest.GetSubprojectName(self, path) |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 1865 | relpath, worktree, gitdir, objdir = \ |
| 1866 | self.manifest.GetSubprojectPaths(self, name, path) |
| 1867 | project = self.manifest.paths.get(relpath) |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1868 | if project: |
| 1869 | result.extend(project.GetDerivedSubprojects()) |
| 1870 | continue |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 1871 | |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1872 | remote = RemoteSpec(self.remote.name, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1873 | url=url, |
Steve Rae | d648045 | 2016-08-10 15:00:00 -0700 | [diff] [blame] | 1874 | pushUrl=self.remote.pushUrl, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1875 | review=self.remote.review, |
| 1876 | revision=self.remote.revision) |
| 1877 | subproject = Project(manifest=self.manifest, |
| 1878 | name=name, |
| 1879 | remote=remote, |
| 1880 | gitdir=gitdir, |
| 1881 | objdir=objdir, |
| 1882 | worktree=worktree, |
| 1883 | relpath=relpath, |
Aymen Bouaziz | 2598ed0 | 2016-06-24 14:34:08 +0200 | [diff] [blame] | 1884 | revisionExpr=rev, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 1885 | revisionId=rev, |
| 1886 | rebase=self.rebase, |
| 1887 | groups=self.groups, |
| 1888 | sync_c=self.sync_c, |
| 1889 | sync_s=self.sync_s, |
| 1890 | parent=self, |
| 1891 | is_derived=True) |
Che-Liang Chiou | b2bd91c | 2012-01-11 11:28:42 +0800 | [diff] [blame] | 1892 | result.append(subproject) |
| 1893 | result.extend(subproject.GetDerivedSubprojects()) |
| 1894 | return result |
| 1895 | |
| 1896 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 1897 | # Direct Git Commands ## |
Zac Livingston | e433226 | 2017-06-16 08:56:09 -0600 | [diff] [blame^] | 1898 | def _CheckForImmutableRevision(self): |
Chris AtLee | 2fb6466 | 2014-01-16 21:32:33 -0500 | [diff] [blame] | 1899 | try: |
| 1900 | # if revision (sha or tag) is not present then following function |
| 1901 | # throws an error. |
| 1902 | self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr) |
| 1903 | return True |
| 1904 | except GitError: |
| 1905 | # There is no such persistent revision. We have to fetch it. |
| 1906 | return False |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1907 | |
Julien Campergue | 335f5ef | 2013-10-16 11:02:35 +0200 | [diff] [blame] | 1908 | def _FetchArchive(self, tarpath, cwd=None): |
| 1909 | cmd = ['archive', '-v', '-o', tarpath] |
| 1910 | cmd.append('--remote=%s' % self.remote.url) |
| 1911 | cmd.append('--prefix=%s/' % self.relpath) |
| 1912 | cmd.append(self.revisionExpr) |
| 1913 | |
| 1914 | command = GitCommand(self, cmd, cwd=cwd, |
| 1915 | capture_stdout=True, |
| 1916 | capture_stderr=True) |
| 1917 | |
| 1918 | if command.Wait() != 0: |
| 1919 | raise GitError('git archive %s: %s' % (self.name, command.stderr)) |
| 1920 | |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1921 | def _RemoteFetch(self, name=None, |
| 1922 | current_branch_only=False, |
Shawn O. Pearce | 16614f8 | 2010-10-29 12:05:43 -0700 | [diff] [blame] | 1923 | initial=False, |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1924 | quiet=False, |
Mitchel Humpherys | 597868b | 2012-10-29 10:18:34 -0700 | [diff] [blame] | 1925 | alt_dir=None, |
David Pursehouse | 74cfd27 | 2015-10-14 10:50:15 +0900 | [diff] [blame] | 1926 | no_tags=False, |
Aymen Bouaziz | 6c59446 | 2016-10-25 18:03:51 +0200 | [diff] [blame] | 1927 | prune=False, |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 1928 | depth=None, |
| 1929 | submodules=False): |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1930 | |
| 1931 | is_sha1 = False |
| 1932 | tag_name = None |
David Pursehouse | 9bc422f | 2014-04-15 10:28:56 +0900 | [diff] [blame] | 1933 | # The depth should not be used when fetching to a mirror because |
| 1934 | # it will result in a shallow repository that cannot be cloned or |
| 1935 | # fetched from. |
Aymen Bouaziz | 6c59446 | 2016-10-25 18:03:51 +0200 | [diff] [blame] | 1936 | # The repo project should also never be synced with partial depth. |
| 1937 | if self.manifest.IsMirror or self.relpath == '.repo/repo': |
| 1938 | depth = None |
David Pursehouse | 9bc422f | 2014-04-15 10:28:56 +0900 | [diff] [blame] | 1939 | |
Shawn Pearce | 69e04d8 | 2014-01-29 12:48:54 -0800 | [diff] [blame] | 1940 | if depth: |
| 1941 | current_branch_only = True |
| 1942 | |
Nasser Grainawi | 909d58b | 2014-09-19 12:13:04 -0600 | [diff] [blame] | 1943 | if ID_RE.match(self.revisionExpr) is not None: |
| 1944 | is_sha1 = True |
| 1945 | |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1946 | if current_branch_only: |
Nasser Grainawi | 909d58b | 2014-09-19 12:13:04 -0600 | [diff] [blame] | 1947 | if self.revisionExpr.startswith(R_TAGS): |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1948 | # this is a tag and its sha1 value should never change |
| 1949 | tag_name = self.revisionExpr[len(R_TAGS):] |
| 1950 | |
| 1951 | if is_sha1 or tag_name is not None: |
Zac Livingston | e433226 | 2017-06-16 08:56:09 -0600 | [diff] [blame^] | 1952 | if self._CheckForImmutableRevision(): |
| 1953 | print('Skipped fetching project %s (already have persistent ref)' |
| 1954 | % self.name) |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1955 | return True |
Bertrand SIMONNET | 3000cda | 2014-11-25 16:19:29 -0800 | [diff] [blame] | 1956 | if is_sha1 and not depth: |
| 1957 | # When syncing a specific commit and --depth is not set: |
| 1958 | # * if upstream is explicitly specified and is not a sha1, fetch only |
| 1959 | # upstream as users expect only upstream to be fetch. |
| 1960 | # Note: The commit might not be in upstream in which case the sync |
| 1961 | # will fail. |
| 1962 | # * otherwise, fetch all branches to make sure we end up with the |
| 1963 | # specific commit. |
Aymen Bouaziz | 037040f | 2016-06-28 12:27:23 +0200 | [diff] [blame] | 1964 | if self.upstream: |
| 1965 | current_branch_only = not ID_RE.match(self.upstream) |
| 1966 | else: |
| 1967 | current_branch_only = False |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1968 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1969 | if not name: |
| 1970 | name = self.remote.name |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 1971 | |
| 1972 | ssh_proxy = False |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1973 | remote = self.GetRemote(name) |
| 1974 | if remote.PreConnectFetch(): |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 1975 | ssh_proxy = True |
| 1976 | |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1977 | if initial: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1978 | if alt_dir and 'objects' == os.path.basename(alt_dir): |
| 1979 | ref_dir = os.path.dirname(alt_dir) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1980 | packed_refs = os.path.join(self.gitdir, 'packed-refs') |
| 1981 | remote = self.GetRemote(name) |
| 1982 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1983 | all_refs = self.bare_ref.all |
| 1984 | ids = set(all_refs.values()) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1985 | tmp = set() |
| 1986 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 1987 | for r, ref_id in GitRefs(ref_dir).all.items(): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1988 | if r not in all_refs: |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1989 | if r.startswith(R_TAGS) or remote.WritesTo(r): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1990 | all_refs[r] = ref_id |
| 1991 | ids.add(ref_id) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1992 | continue |
| 1993 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1994 | if ref_id in ids: |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1995 | continue |
| 1996 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 1997 | r = 'refs/_alt/%s' % ref_id |
| 1998 | all_refs[r] = ref_id |
| 1999 | ids.add(ref_id) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2000 | tmp.add(r) |
| 2001 | |
heping | 3d7bbc9 | 2017-04-12 19:51:47 +0800 | [diff] [blame] | 2002 | tmp_packed_lines = [] |
| 2003 | old_packed_lines = [] |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2004 | |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 2005 | for r in sorted(all_refs): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 2006 | line = '%s %s\n' % (all_refs[r], r) |
heping | 3d7bbc9 | 2017-04-12 19:51:47 +0800 | [diff] [blame] | 2007 | tmp_packed_lines.append(line) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2008 | if r not in tmp: |
heping | 3d7bbc9 | 2017-04-12 19:51:47 +0800 | [diff] [blame] | 2009 | old_packed_lines.append(line) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2010 | |
heping | 3d7bbc9 | 2017-04-12 19:51:47 +0800 | [diff] [blame] | 2011 | tmp_packed = ''.join(tmp_packed_lines) |
| 2012 | old_packed = ''.join(old_packed_lines) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2013 | _lwrite(packed_refs, tmp_packed) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2014 | else: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2015 | alt_dir = None |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2016 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 2017 | cmd = ['fetch'] |
Doug Anderson | 30d4529 | 2011-05-04 15:01:04 -0700 | [diff] [blame] | 2018 | |
Conley Owens | f97e838 | 2015-01-21 11:12:46 -0800 | [diff] [blame] | 2019 | if depth: |
Doug Anderson | 30d4529 | 2011-05-04 15:01:04 -0700 | [diff] [blame] | 2020 | cmd.append('--depth=%s' % depth) |
Dan Willemsen | eeab686 | 2015-08-03 13:11:53 -0700 | [diff] [blame] | 2021 | else: |
| 2022 | # If this repo has shallow objects, then we don't know which refs have |
| 2023 | # shallow objects or not. Tell git to unshallow all fetched refs. Don't |
| 2024 | # do this with projects that don't have shallow objects, since it is less |
| 2025 | # efficient. |
| 2026 | if os.path.exists(os.path.join(self.gitdir, 'shallow')): |
| 2027 | cmd.append('--depth=2147483647') |
Doug Anderson | 30d4529 | 2011-05-04 15:01:04 -0700 | [diff] [blame] | 2028 | |
Shawn O. Pearce | 16614f8 | 2010-10-29 12:05:43 -0700 | [diff] [blame] | 2029 | if quiet: |
| 2030 | cmd.append('--quiet') |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 2031 | if not self.worktree: |
| 2032 | cmd.append('--update-head-ok') |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2033 | cmd.append(name) |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 2034 | |
Mitchel Humpherys | 26c45a7 | 2014-03-10 14:21:59 -0700 | [diff] [blame] | 2035 | # If using depth then we should not get all the tags since they may |
| 2036 | # be outside of the depth. |
| 2037 | if no_tags or depth: |
| 2038 | cmd.append('--no-tags') |
| 2039 | else: |
| 2040 | cmd.append('--tags') |
| 2041 | |
David Pursehouse | 74cfd27 | 2015-10-14 10:50:15 +0900 | [diff] [blame] | 2042 | if prune: |
| 2043 | cmd.append('--prune') |
| 2044 | |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 2045 | if submodules: |
| 2046 | cmd.append('--recurse-submodules=on-demand') |
| 2047 | |
Conley Owens | 80b87fe | 2014-05-09 17:13:44 -0700 | [diff] [blame] | 2048 | spec = [] |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 2049 | if not current_branch_only: |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 2050 | # Fetch whole repo |
Conley Owens | 80b87fe | 2014-05-09 17:13:44 -0700 | [diff] [blame] | 2051 | spec.append(str((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*'))) |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 2052 | elif tag_name is not None: |
Conley Owens | 80b87fe | 2014-05-09 17:13:44 -0700 | [diff] [blame] | 2053 | spec.append('tag') |
| 2054 | spec.append(tag_name) |
Nasser Grainawi | 04e52d6 | 2014-09-30 13:34:52 -0600 | [diff] [blame] | 2055 | |
David Pursehouse | 403b64e | 2015-04-27 10:41:33 +0900 | [diff] [blame] | 2056 | if not self.manifest.IsMirror: |
| 2057 | branch = self.revisionExpr |
Kevin Degi | 679bac4 | 2015-06-22 15:31:26 -0600 | [diff] [blame] | 2058 | if is_sha1 and depth and git_require((1, 8, 3)): |
David Pursehouse | 403b64e | 2015-04-27 10:41:33 +0900 | [diff] [blame] | 2059 | # Shallow checkout of a specific commit, fetch from that commit and not |
| 2060 | # the heads only as the commit might be deeper in the history. |
| 2061 | spec.append(branch) |
| 2062 | else: |
| 2063 | if is_sha1: |
| 2064 | branch = self.upstream |
| 2065 | if branch is not None and branch.strip(): |
| 2066 | if not branch.startswith('refs/'): |
| 2067 | branch = R_HEADS + branch |
| 2068 | spec.append(str((u'+%s:' % branch) + remote.ToLocal(branch))) |
Conley Owens | 80b87fe | 2014-05-09 17:13:44 -0700 | [diff] [blame] | 2069 | cmd.extend(spec) |
| 2070 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2071 | ok = False |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 2072 | for _i in range(2): |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 2073 | gitcmd = GitCommand(self, cmd, bare=True, ssh_proxy=ssh_proxy) |
John L. Villalovos | 126e298 | 2015-01-29 21:58:12 -0800 | [diff] [blame] | 2074 | ret = gitcmd.Wait() |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 2075 | if ret == 0: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2076 | ok = True |
| 2077 | break |
John L. Villalovos | 126e298 | 2015-01-29 21:58:12 -0800 | [diff] [blame] | 2078 | # If needed, run the 'git remote prune' the first time through the loop |
| 2079 | elif (not _i and |
| 2080 | "error:" in gitcmd.stderr and |
| 2081 | "git remote prune" in gitcmd.stderr): |
| 2082 | prunecmd = GitCommand(self, ['remote', 'prune', name], bare=True, |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 2083 | ssh_proxy=ssh_proxy) |
John L. Villalovos | e30f46b | 2015-02-25 14:27:02 -0800 | [diff] [blame] | 2084 | ret = prunecmd.Wait() |
John L. Villalovos | e30f46b | 2015-02-25 14:27:02 -0800 | [diff] [blame] | 2085 | if ret: |
John L. Villalovos | 126e298 | 2015-01-29 21:58:12 -0800 | [diff] [blame] | 2086 | break |
| 2087 | continue |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 2088 | elif current_branch_only and is_sha1 and ret == 128: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2089 | # Exit code 128 means "couldn't find the ref you asked for"; if we're |
| 2090 | # in sha1 mode, we just tried sync'ing from the upstream field; it |
| 2091 | # doesn't exist, thus abort the optimization attempt and do a full sync. |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 2092 | break |
Colin Cross | c4b301f | 2015-05-13 00:10:02 -0700 | [diff] [blame] | 2093 | elif ret < 0: |
| 2094 | # Git died with a signal, exit immediately |
| 2095 | break |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2096 | time.sleep(random.randint(30, 45)) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2097 | |
| 2098 | if initial: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2099 | if alt_dir: |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2100 | if old_packed != '': |
| 2101 | _lwrite(packed_refs, old_packed) |
| 2102 | else: |
| 2103 | os.remove(packed_refs) |
| 2104 | self.bare_git.pack_refs('--all', '--prune') |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 2105 | |
Aymen Bouaziz | 6c59446 | 2016-10-25 18:03:51 +0200 | [diff] [blame] | 2106 | if is_sha1 and current_branch_only: |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 2107 | # We just synced the upstream given branch; verify we |
| 2108 | # got what we wanted, else trigger a second run of all |
| 2109 | # refs. |
Zac Livingston | e433226 | 2017-06-16 08:56:09 -0600 | [diff] [blame^] | 2110 | if not self._CheckForImmutableRevision(): |
Aymen Bouaziz | 6c59446 | 2016-10-25 18:03:51 +0200 | [diff] [blame] | 2111 | if current_branch_only and depth: |
| 2112 | # Sync the current branch only with depth set to None |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2113 | return self._RemoteFetch(name=name, |
| 2114 | current_branch_only=current_branch_only, |
Aymen Bouaziz | 6c59446 | 2016-10-25 18:03:51 +0200 | [diff] [blame] | 2115 | initial=False, quiet=quiet, alt_dir=alt_dir, |
| 2116 | depth=None) |
| 2117 | else: |
| 2118 | # Avoid infinite recursion: sync all branches with depth set to None |
| 2119 | return self._RemoteFetch(name=name, current_branch_only=False, |
| 2120 | initial=False, quiet=quiet, alt_dir=alt_dir, |
| 2121 | depth=None) |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 2122 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2123 | return ok |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2124 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2125 | def _ApplyCloneBundle(self, initial=False, quiet=False): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2126 | if initial and \ |
| 2127 | (self.manifest.manifestProject.config.GetString('repo.depth') or |
| 2128 | self.clone_depth): |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2129 | return False |
| 2130 | |
| 2131 | remote = self.GetRemote(self.remote.name) |
| 2132 | bundle_url = remote.url + '/clone.bundle' |
| 2133 | bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url) |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2134 | if GetSchemeFromUrl(bundle_url) not in ('http', 'https', |
| 2135 | 'persistent-http', |
| 2136 | 'persistent-https'): |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2137 | return False |
| 2138 | |
| 2139 | bundle_dst = os.path.join(self.gitdir, 'clone.bundle') |
| 2140 | bundle_tmp = os.path.join(self.gitdir, 'clone.bundle.tmp') |
| 2141 | |
| 2142 | exist_dst = os.path.exists(bundle_dst) |
| 2143 | exist_tmp = os.path.exists(bundle_tmp) |
| 2144 | |
| 2145 | if not initial and not exist_dst and not exist_tmp: |
| 2146 | return False |
| 2147 | |
| 2148 | if not exist_dst: |
| 2149 | exist_dst = self._FetchBundle(bundle_url, bundle_tmp, bundle_dst, quiet) |
| 2150 | if not exist_dst: |
| 2151 | return False |
| 2152 | |
| 2153 | cmd = ['fetch'] |
| 2154 | if quiet: |
| 2155 | cmd.append('--quiet') |
| 2156 | if not self.worktree: |
| 2157 | cmd.append('--update-head-ok') |
| 2158 | cmd.append(bundle_dst) |
| 2159 | for f in remote.fetch: |
| 2160 | cmd.append(str(f)) |
| 2161 | cmd.append('refs/tags/*:refs/tags/*') |
| 2162 | |
| 2163 | ok = GitCommand(self, cmd, bare=True).Wait() == 0 |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 2164 | if os.path.exists(bundle_dst): |
| 2165 | os.remove(bundle_dst) |
| 2166 | if os.path.exists(bundle_tmp): |
| 2167 | os.remove(bundle_tmp) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2168 | return ok |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2169 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 2170 | def _FetchBundle(self, srcUrl, tmpPath, dstPath, quiet): |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 2171 | if os.path.exists(dstPath): |
| 2172 | os.remove(dstPath) |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 2173 | |
Matt Gumbel | 2dc810c | 2012-08-30 09:39:36 -0700 | [diff] [blame] | 2174 | cmd = ['curl', '--fail', '--output', tmpPath, '--netrc', '--location'] |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 2175 | if quiet: |
| 2176 | cmd += ['--silent'] |
| 2177 | if os.path.exists(tmpPath): |
| 2178 | size = os.stat(tmpPath).st_size |
| 2179 | if size >= 1024: |
| 2180 | cmd += ['--continue-at', '%d' % (size,)] |
| 2181 | else: |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 2182 | os.remove(tmpPath) |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 2183 | if 'http_proxy' in os.environ and 'darwin' == sys.platform: |
| 2184 | cmd += ['--proxy', os.environ['http_proxy']] |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2185 | with GetUrlCookieFile(srcUrl, quiet) as (cookiefile, _proxy): |
Dave Borowitz | 137d013 | 2015-01-02 11:12:54 -0800 | [diff] [blame] | 2186 | if cookiefile: |
Dave Borowitz | 4abf8e6 | 2015-01-02 11:39:04 -0800 | [diff] [blame] | 2187 | cmd += ['--cookie', cookiefile, '--cookie-jar', cookiefile] |
Dave Borowitz | 137d013 | 2015-01-02 11:12:54 -0800 | [diff] [blame] | 2188 | if srcUrl.startswith('persistent-'): |
| 2189 | srcUrl = srcUrl[len('persistent-'):] |
| 2190 | cmd += [srcUrl] |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 2191 | |
Dave Borowitz | 137d013 | 2015-01-02 11:12:54 -0800 | [diff] [blame] | 2192 | if IsTrace(): |
| 2193 | Trace('%s', ' '.join(cmd)) |
| 2194 | try: |
| 2195 | proc = subprocess.Popen(cmd) |
| 2196 | except OSError: |
| 2197 | return False |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 2198 | |
Dave Borowitz | 137d013 | 2015-01-02 11:12:54 -0800 | [diff] [blame] | 2199 | curlret = proc.wait() |
Matt Gumbel | 2dc810c | 2012-08-30 09:39:36 -0700 | [diff] [blame] | 2200 | |
Dave Borowitz | 137d013 | 2015-01-02 11:12:54 -0800 | [diff] [blame] | 2201 | if curlret == 22: |
| 2202 | # From curl man page: |
| 2203 | # 22: HTTP page not retrieved. The requested url was not found or |
| 2204 | # returned another error with the HTTP error code being 400 or above. |
| 2205 | # This return code only appears if -f, --fail is used. |
| 2206 | if not quiet: |
| 2207 | print("Server does not provide clone.bundle; ignoring.", |
| 2208 | file=sys.stderr) |
| 2209 | return False |
Matt Gumbel | 2dc810c | 2012-08-30 09:39:36 -0700 | [diff] [blame] | 2210 | |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 2211 | if os.path.exists(tmpPath): |
Kris Giesing | c8d882a | 2014-12-23 13:02:32 -0800 | [diff] [blame] | 2212 | if curlret == 0 and self._IsValidBundle(tmpPath, quiet): |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 2213 | os.rename(tmpPath, dstPath) |
| 2214 | return True |
| 2215 | else: |
| 2216 | os.remove(tmpPath) |
| 2217 | return False |
| 2218 | else: |
| 2219 | return False |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 2220 | |
Kris Giesing | c8d882a | 2014-12-23 13:02:32 -0800 | [diff] [blame] | 2221 | def _IsValidBundle(self, path, quiet): |
Dave Borowitz | 91f3ba5 | 2013-06-03 12:15:23 -0700 | [diff] [blame] | 2222 | try: |
| 2223 | with open(path) as f: |
| 2224 | if f.read(16) == '# v2 git bundle\n': |
| 2225 | return True |
| 2226 | else: |
Kris Giesing | c8d882a | 2014-12-23 13:02:32 -0800 | [diff] [blame] | 2227 | if not quiet: |
| 2228 | print("Invalid clone.bundle file; ignoring.", file=sys.stderr) |
Dave Borowitz | 91f3ba5 | 2013-06-03 12:15:23 -0700 | [diff] [blame] | 2229 | return False |
| 2230 | except OSError: |
| 2231 | return False |
| 2232 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2233 | def _Checkout(self, rev, quiet=False): |
| 2234 | cmd = ['checkout'] |
| 2235 | if quiet: |
| 2236 | cmd.append('-q') |
| 2237 | cmd.append(rev) |
| 2238 | cmd.append('--') |
| 2239 | if GitCommand(self, cmd).Wait() != 0: |
| 2240 | if self._allrefs: |
| 2241 | raise GitError('%s checkout %s ' % (self.name, rev)) |
| 2242 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2243 | def _CherryPick(self, rev): |
Pierre Tardy | e5a2122 | 2011-03-24 16:28:18 +0100 | [diff] [blame] | 2244 | cmd = ['cherry-pick'] |
| 2245 | cmd.append(rev) |
| 2246 | cmd.append('--') |
| 2247 | if GitCommand(self, cmd).Wait() != 0: |
| 2248 | if self._allrefs: |
| 2249 | raise GitError('%s cherry-pick %s ' % (self.name, rev)) |
| 2250 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2251 | def _Revert(self, rev): |
Erwan Mahe | a94f162 | 2011-08-19 13:56:09 +0200 | [diff] [blame] | 2252 | cmd = ['revert'] |
| 2253 | cmd.append('--no-edit') |
| 2254 | cmd.append(rev) |
| 2255 | cmd.append('--') |
| 2256 | if GitCommand(self, cmd).Wait() != 0: |
| 2257 | if self._allrefs: |
| 2258 | raise GitError('%s revert %s ' % (self.name, rev)) |
| 2259 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2260 | def _ResetHard(self, rev, quiet=True): |
| 2261 | cmd = ['reset', '--hard'] |
| 2262 | if quiet: |
| 2263 | cmd.append('-q') |
| 2264 | cmd.append(rev) |
| 2265 | if GitCommand(self, cmd).Wait() != 0: |
| 2266 | raise GitError('%s reset --hard %s ' % (self.name, rev)) |
| 2267 | |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 2268 | def _SyncSubmodules(self, quiet=True): |
| 2269 | cmd = ['submodule', 'update', '--init', '--recursive'] |
| 2270 | if quiet: |
| 2271 | cmd.append('-q') |
| 2272 | if GitCommand(self, cmd).Wait() != 0: |
| 2273 | raise GitError('%s submodule update --init --recursive %s ' % self.name) |
| 2274 | |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2275 | def _Rebase(self, upstream, onto=None): |
Shawn O. Pearce | 19a83d8 | 2009-04-16 08:14:26 -0700 | [diff] [blame] | 2276 | cmd = ['rebase'] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2277 | if onto is not None: |
| 2278 | cmd.extend(['--onto', onto]) |
| 2279 | cmd.append(upstream) |
Shawn O. Pearce | 19a83d8 | 2009-04-16 08:14:26 -0700 | [diff] [blame] | 2280 | if GitCommand(self, cmd).Wait() != 0: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2281 | raise GitError('%s rebase %s ' % (self.name, upstream)) |
| 2282 | |
Pierre Tardy | 3d12594 | 2012-05-04 12:18:12 +0200 | [diff] [blame] | 2283 | def _FastForward(self, head, ffonly=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2284 | cmd = ['merge', head] |
Pierre Tardy | 3d12594 | 2012-05-04 12:18:12 +0200 | [diff] [blame] | 2285 | if ffonly: |
| 2286 | cmd.append("--ff-only") |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2287 | if GitCommand(self, cmd).Wait() != 0: |
| 2288 | raise GitError('%s merge %s ' % (self.name, head)) |
| 2289 | |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2290 | def _InitGitDir(self, mirror_git=None, force_sync=False): |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2291 | init_git_dir = not os.path.exists(self.gitdir) |
| 2292 | init_obj_dir = not os.path.exists(self.objdir) |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2293 | try: |
| 2294 | # Initialize the bare repository, which contains all of the objects. |
| 2295 | if init_obj_dir: |
| 2296 | os.makedirs(self.objdir) |
| 2297 | self.bare_objdir.init() |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2298 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2299 | # If we have a separate directory to hold refs, initialize it as well. |
| 2300 | if self.objdir != self.gitdir: |
| 2301 | if init_git_dir: |
| 2302 | os.makedirs(self.gitdir) |
| 2303 | |
| 2304 | if init_obj_dir or init_git_dir: |
| 2305 | self._ReferenceGitDir(self.objdir, self.gitdir, share_refs=False, |
| 2306 | copy_all=True) |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2307 | try: |
| 2308 | self._CheckDirReference(self.objdir, self.gitdir, share_refs=False) |
| 2309 | except GitError as e: |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2310 | if force_sync: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2311 | print("Retrying clone after deleting %s" % |
| 2312 | self.gitdir, file=sys.stderr) |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2313 | try: |
| 2314 | shutil.rmtree(os.path.realpath(self.gitdir)) |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2315 | if self.worktree and os.path.exists(os.path.realpath |
| 2316 | (self.worktree)): |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2317 | shutil.rmtree(os.path.realpath(self.worktree)) |
| 2318 | return self._InitGitDir(mirror_git=mirror_git, force_sync=False) |
| 2319 | except: |
| 2320 | raise e |
| 2321 | raise e |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2322 | |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2323 | if init_git_dir: |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2324 | mp = self.manifest.manifestProject |
| 2325 | ref_dir = mp.config.GetString('repo.reference') or '' |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2326 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2327 | if ref_dir or mirror_git: |
| 2328 | if not mirror_git: |
| 2329 | mirror_git = os.path.join(ref_dir, self.name + '.git') |
| 2330 | repo_git = os.path.join(ref_dir, '.repo', 'projects', |
| 2331 | self.relpath + '.git') |
Shawn O. Pearce | 2816d4f | 2009-03-03 17:53:18 -0800 | [diff] [blame] | 2332 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2333 | if os.path.exists(mirror_git): |
| 2334 | ref_dir = mirror_git |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2335 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2336 | elif os.path.exists(repo_git): |
| 2337 | ref_dir = repo_git |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2338 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2339 | else: |
| 2340 | ref_dir = None |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2341 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2342 | if ref_dir: |
| 2343 | _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'), |
| 2344 | os.path.join(ref_dir, 'objects') + '\n') |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2345 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2346 | self._UpdateHooks() |
| 2347 | |
| 2348 | m = self.manifest.manifestProject.config |
| 2349 | for key in ['user.name', 'user.email']: |
| 2350 | if m.Has(key, include_defaults=False): |
| 2351 | self.config.SetString(key, m.GetString(key)) |
David Pursehouse | 76a4a9d | 2016-08-16 12:11:12 +0900 | [diff] [blame] | 2352 | self.config.SetString('filter.lfs.smudge', 'git-lfs smudge --skip -- %f') |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2353 | if self.manifest.IsMirror: |
| 2354 | self.config.SetString('core.bare', 'true') |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 2355 | else: |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2356 | self.config.SetString('core.bare', None) |
| 2357 | except Exception: |
| 2358 | if init_obj_dir and os.path.exists(self.objdir): |
| 2359 | shutil.rmtree(self.objdir) |
| 2360 | if init_git_dir and os.path.exists(self.gitdir): |
| 2361 | shutil.rmtree(self.gitdir) |
| 2362 | raise |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2363 | |
Jimmie Wester | a044458 | 2012-10-24 13:44:42 +0200 | [diff] [blame] | 2364 | def _UpdateHooks(self): |
| 2365 | if os.path.exists(self.gitdir): |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 2366 | self._InitHooks() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2367 | |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 2368 | def _InitHooks(self): |
Jesse Hall | 672cc49 | 2013-11-27 11:17:13 -0800 | [diff] [blame] | 2369 | hooks = os.path.realpath(self._gitdir_path('hooks')) |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 2370 | if not os.path.exists(hooks): |
| 2371 | os.makedirs(hooks) |
Jonathan Nieder | 9371979 | 2015-03-17 11:29:58 -0700 | [diff] [blame] | 2372 | for stock_hook in _ProjectHooks(): |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 2373 | name = os.path.basename(stock_hook) |
| 2374 | |
Victor Boivie | 65e0f35 | 2011-04-18 11:23:29 +0200 | [diff] [blame] | 2375 | if name in ('commit-msg',) and not self.remote.review \ |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2376 | and self is not self.manifest.manifestProject: |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 2377 | # Don't install a Gerrit Code Review hook if this |
| 2378 | # project does not appear to use it for reviews. |
| 2379 | # |
Victor Boivie | 65e0f35 | 2011-04-18 11:23:29 +0200 | [diff] [blame] | 2380 | # Since the manifest project is one of those, but also |
| 2381 | # managed through gerrit, it's excluded |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 2382 | continue |
| 2383 | |
| 2384 | dst = os.path.join(hooks, name) |
| 2385 | if os.path.islink(dst): |
| 2386 | continue |
| 2387 | if os.path.exists(dst): |
| 2388 | if filecmp.cmp(stock_hook, dst, shallow=False): |
| 2389 | os.remove(dst) |
| 2390 | else: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2391 | _warn("%s: Not replacing locally modified %s hook", |
| 2392 | self.relpath, name) |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 2393 | continue |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 2394 | try: |
Mickaël Salaün | b9477bc | 2012-08-05 13:39:26 +0200 | [diff] [blame] | 2395 | os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst) |
Sarah Owens | a5be53f | 2012-09-09 15:37:57 -0700 | [diff] [blame] | 2396 | except OSError as e: |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 2397 | if e.errno == errno.EPERM: |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 2398 | raise GitError('filesystem must support symlinks') |
| 2399 | else: |
| 2400 | raise |
| 2401 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2402 | def _InitRemote(self): |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 2403 | if self.remote.url: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2404 | remote = self.GetRemote(self.remote.name) |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 2405 | remote.url = self.remote.url |
Steve Rae | d648045 | 2016-08-10 15:00:00 -0700 | [diff] [blame] | 2406 | remote.pushUrl = self.remote.pushUrl |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 2407 | remote.review = self.remote.review |
| 2408 | remote.projectname = self.name |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2409 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 2410 | if self.worktree: |
| 2411 | remote.ResetFetch(mirror=False) |
| 2412 | else: |
| 2413 | remote.ResetFetch(mirror=True) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2414 | remote.Save() |
| 2415 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2416 | def _InitMRef(self): |
| 2417 | if self.manifest.branch: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2418 | self._InitAnyMRef(R_M + self.manifest.branch) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2419 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 2420 | def _InitMirrorHead(self): |
Shawn O. Pearce | fe200ee | 2009-06-01 15:28:21 -0700 | [diff] [blame] | 2421 | self._InitAnyMRef(HEAD) |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2422 | |
| 2423 | def _InitAnyMRef(self, ref): |
| 2424 | cur = self.bare_ref.symref(ref) |
| 2425 | |
| 2426 | if self.revisionId: |
| 2427 | if cur != '' or self.bare_ref.get(ref) != self.revisionId: |
| 2428 | msg = 'manifest set to %s' % self.revisionId |
| 2429 | dst = self.revisionId + '^0' |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2430 | self.bare_git.UpdateRef(ref, dst, message=msg, detach=True) |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2431 | else: |
| 2432 | remote = self.GetRemote(self.remote.name) |
| 2433 | dst = remote.ToLocal(self.revisionExpr) |
| 2434 | if cur != dst: |
| 2435 | msg = 'manifest set to %s' % self.revisionExpr |
| 2436 | self.bare_git.symbolic_ref('-m', msg, ref, dst) |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 2437 | |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2438 | def _CheckDirReference(self, srcdir, destdir, share_refs): |
Dan Willemsen | bdb866e | 2016-04-05 17:22:02 -0700 | [diff] [blame] | 2439 | symlink_files = self.shareable_files[:] |
| 2440 | symlink_dirs = self.shareable_dirs[:] |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2441 | if share_refs: |
| 2442 | symlink_files += self.working_tree_files |
| 2443 | symlink_dirs += self.working_tree_dirs |
| 2444 | to_symlink = symlink_files + symlink_dirs |
| 2445 | for name in set(to_symlink): |
| 2446 | dst = os.path.realpath(os.path.join(destdir, name)) |
| 2447 | if os.path.lexists(dst): |
| 2448 | src = os.path.realpath(os.path.join(srcdir, name)) |
| 2449 | # Fail if the links are pointing to the wrong place |
| 2450 | if src != dst: |
Marc Herbert | ec28790 | 2016-10-27 12:58:26 -0700 | [diff] [blame] | 2451 | _error('%s is different in %s vs %s', name, destdir, srcdir) |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2452 | raise GitError('--force-sync not enabled; cannot overwrite a local ' |
Simon Ruggier | f9b7683 | 2015-07-31 17:18:34 -0400 | [diff] [blame] | 2453 | 'work tree. If you\'re comfortable with the ' |
| 2454 | 'possibility of losing the work tree\'s git metadata,' |
| 2455 | ' use `repo sync --force-sync {0}` to ' |
| 2456 | 'proceed.'.format(self.relpath)) |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2457 | |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2458 | def _ReferenceGitDir(self, gitdir, dotgit, share_refs, copy_all): |
| 2459 | """Update |dotgit| to reference |gitdir|, using symlinks where possible. |
| 2460 | |
| 2461 | Args: |
| 2462 | gitdir: The bare git repository. Must already be initialized. |
| 2463 | dotgit: The repository you would like to initialize. |
| 2464 | share_refs: If true, |dotgit| will store its refs under |gitdir|. |
| 2465 | Only one work tree can store refs under a given |gitdir|. |
| 2466 | copy_all: If true, copy all remaining files from |gitdir| -> |dotgit|. |
| 2467 | This saves you the effort of initializing |dotgit| yourself. |
| 2468 | """ |
Dan Willemsen | bdb866e | 2016-04-05 17:22:02 -0700 | [diff] [blame] | 2469 | symlink_files = self.shareable_files[:] |
| 2470 | symlink_dirs = self.shareable_dirs[:] |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2471 | if share_refs: |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2472 | symlink_files += self.working_tree_files |
| 2473 | symlink_dirs += self.working_tree_dirs |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2474 | to_symlink = symlink_files + symlink_dirs |
| 2475 | |
| 2476 | to_copy = [] |
| 2477 | if copy_all: |
| 2478 | to_copy = os.listdir(gitdir) |
| 2479 | |
Dan Willemsen | 2a3e152 | 2015-07-30 20:43:33 -0700 | [diff] [blame] | 2480 | dotgit = os.path.realpath(dotgit) |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2481 | for name in set(to_copy).union(to_symlink): |
| 2482 | try: |
| 2483 | src = os.path.realpath(os.path.join(gitdir, name)) |
Dan Willemsen | 2a3e152 | 2015-07-30 20:43:33 -0700 | [diff] [blame] | 2484 | dst = os.path.join(dotgit, name) |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2485 | |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2486 | if os.path.lexists(dst): |
| 2487 | continue |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2488 | |
| 2489 | # If the source dir doesn't exist, create an empty dir. |
| 2490 | if name in symlink_dirs and not os.path.lexists(src): |
| 2491 | os.makedirs(src) |
| 2492 | |
Cheuk Leung | 8ac0c96 | 2015-07-06 21:33:00 +0200 | [diff] [blame] | 2493 | if name in to_symlink: |
| 2494 | os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst) |
| 2495 | elif copy_all and not os.path.islink(dst): |
| 2496 | if os.path.isdir(src): |
| 2497 | shutil.copytree(src, dst) |
| 2498 | elif os.path.isfile(src): |
| 2499 | shutil.copy(src, dst) |
| 2500 | |
Conley Owens | 80b87fe | 2014-05-09 17:13:44 -0700 | [diff] [blame] | 2501 | # If the source file doesn't exist, ensure the destination |
| 2502 | # file doesn't either. |
| 2503 | if name in symlink_files and not os.path.lexists(src): |
| 2504 | try: |
| 2505 | os.remove(dst) |
| 2506 | except OSError: |
| 2507 | pass |
| 2508 | |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2509 | except OSError as e: |
| 2510 | if e.errno == errno.EPERM: |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2511 | raise DownloadError('filesystem must support symlinks') |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2512 | else: |
| 2513 | raise |
| 2514 | |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 2515 | def _InitWorkTree(self, force_sync=False, submodules=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2516 | dotgit = os.path.join(self.worktree, '.git') |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2517 | init_dotgit = not os.path.exists(dotgit) |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2518 | try: |
| 2519 | if init_dotgit: |
| 2520 | os.makedirs(dotgit) |
| 2521 | self._ReferenceGitDir(self.gitdir, dotgit, share_refs=True, |
| 2522 | copy_all=False) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2523 | |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2524 | try: |
| 2525 | self._CheckDirReference(self.gitdir, dotgit, share_refs=True) |
| 2526 | except GitError as e: |
| 2527 | if force_sync: |
| 2528 | try: |
| 2529 | shutil.rmtree(dotgit) |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 2530 | return self._InitWorkTree(force_sync=False, submodules=submodules) |
Kevin Degi | abaa7f3 | 2014-11-12 11:27:45 -0700 | [diff] [blame] | 2531 | except: |
| 2532 | raise e |
| 2533 | raise e |
Kevin Degi | 384b3c5 | 2014-10-16 16:02:58 -0600 | [diff] [blame] | 2534 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2535 | if init_dotgit: |
| 2536 | _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId()) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2537 | |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2538 | cmd = ['read-tree', '--reset', '-u'] |
| 2539 | cmd.append('-v') |
| 2540 | cmd.append(HEAD) |
| 2541 | if GitCommand(self, cmd).Wait() != 0: |
| 2542 | raise GitError("cannot initialize work tree") |
Victor Boivie | 0960b5b | 2010-11-26 13:42:13 +0100 | [diff] [blame] | 2543 | |
Martin Kelly | e4e94d2 | 2017-03-21 16:05:12 -0700 | [diff] [blame] | 2544 | if submodules: |
| 2545 | self._SyncSubmodules(quiet=True) |
Kevin Degi | b1a07b8 | 2015-07-27 13:33:43 -0600 | [diff] [blame] | 2546 | self._CopyAndLinkFiles() |
| 2547 | except Exception: |
| 2548 | if init_dotgit: |
| 2549 | shutil.rmtree(dotgit) |
| 2550 | raise |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2551 | |
| 2552 | def _gitdir_path(self, path): |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2553 | return os.path.realpath(os.path.join(self.gitdir, path)) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2554 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 2555 | def _revlist(self, *args, **kw): |
| 2556 | a = [] |
| 2557 | a.extend(args) |
| 2558 | a.append('--') |
| 2559 | return self.work_git.rev_list(*a, **kw) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2560 | |
| 2561 | @property |
| 2562 | def _allrefs(self): |
Shawn O. Pearce | d237b69 | 2009-04-17 18:49:50 -0700 | [diff] [blame] | 2563 | return self.bare_ref.all |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2564 | |
Sebastian Schuberth | 7ecccf6 | 2016-03-29 14:11:20 +0200 | [diff] [blame] | 2565 | def _getLogs(self, rev1, rev2, oneline=False, color=True, pretty_format=None): |
Julien Campergue | dd65422 | 2014-01-09 16:21:37 +0100 | [diff] [blame] | 2566 | """Get logs between two revisions of this project.""" |
| 2567 | comp = '..' |
| 2568 | if rev1: |
| 2569 | revs = [rev1] |
| 2570 | if rev2: |
| 2571 | revs.extend([comp, rev2]) |
| 2572 | cmd = ['log', ''.join(revs)] |
| 2573 | out = DiffColoring(self.config) |
| 2574 | if out.is_on and color: |
| 2575 | cmd.append('--color') |
Sebastian Schuberth | 7ecccf6 | 2016-03-29 14:11:20 +0200 | [diff] [blame] | 2576 | if pretty_format is not None: |
| 2577 | cmd.append('--pretty=format:%s' % pretty_format) |
Julien Campergue | dd65422 | 2014-01-09 16:21:37 +0100 | [diff] [blame] | 2578 | if oneline: |
| 2579 | cmd.append('--oneline') |
| 2580 | |
| 2581 | try: |
| 2582 | log = GitCommand(self, cmd, capture_stdout=True, capture_stderr=True) |
| 2583 | if log.Wait() == 0: |
| 2584 | return log.stdout |
| 2585 | except GitError: |
| 2586 | # worktree may not exist if groups changed for example. In that case, |
| 2587 | # try in gitdir instead. |
| 2588 | if not os.path.exists(self.worktree): |
| 2589 | return self.bare_git.log(*cmd[1:]) |
| 2590 | else: |
| 2591 | raise |
| 2592 | return None |
| 2593 | |
Sebastian Schuberth | 7ecccf6 | 2016-03-29 14:11:20 +0200 | [diff] [blame] | 2594 | def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True, |
| 2595 | pretty_format=None): |
Julien Campergue | dd65422 | 2014-01-09 16:21:37 +0100 | [diff] [blame] | 2596 | """Get the list of logs from this revision to given revisionId""" |
| 2597 | logs = {} |
| 2598 | selfId = self.GetRevisionId(self._allrefs) |
| 2599 | toId = toProject.GetRevisionId(toProject._allrefs) |
| 2600 | |
Sebastian Schuberth | 7ecccf6 | 2016-03-29 14:11:20 +0200 | [diff] [blame] | 2601 | logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color, |
| 2602 | pretty_format=pretty_format) |
| 2603 | logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color, |
| 2604 | pretty_format=pretty_format) |
Julien Campergue | dd65422 | 2014-01-09 16:21:37 +0100 | [diff] [blame] | 2605 | return logs |
| 2606 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2607 | class _GitGetByExec(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2608 | |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2609 | def __init__(self, project, bare, gitdir): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2610 | self._project = project |
| 2611 | self._bare = bare |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2612 | self._gitdir = gitdir |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2613 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2614 | def LsOthers(self): |
| 2615 | p = GitCommand(self._project, |
| 2616 | ['ls-files', |
| 2617 | '-z', |
| 2618 | '--others', |
| 2619 | '--exclude-standard'], |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2620 | bare=False, |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2621 | gitdir=self._gitdir, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2622 | capture_stdout=True, |
| 2623 | capture_stderr=True) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2624 | if p.Wait() == 0: |
| 2625 | out = p.stdout |
| 2626 | if out: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2627 | # Backslash is not anomalous |
David Pursehouse | 1d947b3 | 2012-10-25 12:23:11 +0900 | [diff] [blame] | 2628 | return out[:-1].split('\0') # pylint: disable=W1401 |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2629 | return [] |
| 2630 | |
| 2631 | def DiffZ(self, name, *args): |
| 2632 | cmd = [name] |
| 2633 | cmd.append('-z') |
| 2634 | cmd.extend(args) |
| 2635 | p = GitCommand(self._project, |
| 2636 | cmd, |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2637 | gitdir=self._gitdir, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2638 | bare=False, |
| 2639 | capture_stdout=True, |
| 2640 | capture_stderr=True) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2641 | try: |
| 2642 | out = p.process.stdout.read() |
| 2643 | r = {} |
| 2644 | if out: |
David Pursehouse | 1d947b3 | 2012-10-25 12:23:11 +0900 | [diff] [blame] | 2645 | out = iter(out[:-1].split('\0')) # pylint: disable=W1401 |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2646 | while out: |
Shawn O. Pearce | 02dbb6d | 2008-10-21 13:59:08 -0700 | [diff] [blame] | 2647 | try: |
Anthony King | 2cd1f04 | 2014-05-05 21:24:05 +0100 | [diff] [blame] | 2648 | info = next(out) |
| 2649 | path = next(out) |
Shawn O. Pearce | 02dbb6d | 2008-10-21 13:59:08 -0700 | [diff] [blame] | 2650 | except StopIteration: |
| 2651 | break |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2652 | |
| 2653 | class _Info(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2654 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2655 | def __init__(self, path, omode, nmode, oid, nid, state): |
| 2656 | self.path = path |
| 2657 | self.src_path = None |
| 2658 | self.old_mode = omode |
| 2659 | self.new_mode = nmode |
| 2660 | self.old_id = oid |
| 2661 | self.new_id = nid |
| 2662 | |
| 2663 | if len(state) == 1: |
| 2664 | self.status = state |
| 2665 | self.level = None |
| 2666 | else: |
| 2667 | self.status = state[:1] |
| 2668 | self.level = state[1:] |
| 2669 | while self.level.startswith('0'): |
| 2670 | self.level = self.level[1:] |
| 2671 | |
| 2672 | info = info[1:].split(' ') |
David Pursehouse | 8f62fb7 | 2012-11-14 12:09:38 +0900 | [diff] [blame] | 2673 | info = _Info(path, *info) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2674 | if info.status in ('R', 'C'): |
| 2675 | info.src_path = info.path |
Anthony King | 2cd1f04 | 2014-05-05 21:24:05 +0100 | [diff] [blame] | 2676 | info.path = next(out) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2677 | r[info.path] = info |
| 2678 | return r |
| 2679 | finally: |
| 2680 | p.Wait() |
| 2681 | |
| 2682 | def GetHead(self): |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 2683 | if self._bare: |
| 2684 | path = os.path.join(self._project.gitdir, HEAD) |
| 2685 | else: |
| 2686 | path = os.path.join(self._project.worktree, '.git', HEAD) |
Conley Owens | 75ee057 | 2012-11-15 17:33:11 -0800 | [diff] [blame] | 2687 | try: |
| 2688 | fd = open(path, 'rb') |
Dan Sandler | 53e902a | 2014-03-09 13:20:02 -0400 | [diff] [blame] | 2689 | except IOError as e: |
| 2690 | raise NoManifestException(path, str(e)) |
Shawn O. Pearce | 76ca9f8 | 2009-04-18 14:48:03 -0700 | [diff] [blame] | 2691 | try: |
| 2692 | line = fd.read() |
| 2693 | finally: |
| 2694 | fd.close() |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 2695 | try: |
| 2696 | line = line.decode() |
| 2697 | except AttributeError: |
| 2698 | pass |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 2699 | if line.startswith('ref: '): |
| 2700 | return line[5:-1] |
| 2701 | return line[:-1] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2702 | |
| 2703 | def SetHead(self, ref, message=None): |
| 2704 | cmdv = [] |
| 2705 | if message is not None: |
| 2706 | cmdv.extend(['-m', message]) |
| 2707 | cmdv.append(HEAD) |
| 2708 | cmdv.append(ref) |
| 2709 | self.symbolic_ref(*cmdv) |
| 2710 | |
| 2711 | def DetachHead(self, new, message=None): |
| 2712 | cmdv = ['--no-deref'] |
| 2713 | if message is not None: |
| 2714 | cmdv.extend(['-m', message]) |
| 2715 | cmdv.append(HEAD) |
| 2716 | cmdv.append(new) |
| 2717 | self.update_ref(*cmdv) |
| 2718 | |
| 2719 | def UpdateRef(self, name, new, old=None, |
| 2720 | message=None, |
| 2721 | detach=False): |
| 2722 | cmdv = [] |
| 2723 | if message is not None: |
| 2724 | cmdv.extend(['-m', message]) |
| 2725 | if detach: |
| 2726 | cmdv.append('--no-deref') |
| 2727 | cmdv.append(name) |
| 2728 | cmdv.append(new) |
| 2729 | if old is not None: |
| 2730 | cmdv.append(old) |
| 2731 | self.update_ref(*cmdv) |
| 2732 | |
| 2733 | def DeleteRef(self, name, old=None): |
| 2734 | if not old: |
| 2735 | old = self.rev_parse(name) |
| 2736 | self.update_ref('-d', name, old) |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 2737 | self._project.bare_ref.deleted(name) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2738 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 2739 | def rev_list(self, *args, **kw): |
| 2740 | if 'format' in kw: |
| 2741 | cmdv = ['log', '--pretty=format:%s' % kw['format']] |
| 2742 | else: |
| 2743 | cmdv = ['rev-list'] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2744 | cmdv.extend(args) |
| 2745 | p = GitCommand(self._project, |
| 2746 | cmdv, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2747 | bare=self._bare, |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2748 | gitdir=self._gitdir, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2749 | capture_stdout=True, |
| 2750 | capture_stderr=True) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2751 | r = [] |
| 2752 | for line in p.process.stdout: |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 2753 | if line[-1] == '\n': |
| 2754 | line = line[:-1] |
| 2755 | r.append(line) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2756 | if p.Wait() != 0: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2757 | raise GitError('%s rev-list %s: %s' % |
| 2758 | (self._project.name, str(args), p.stderr)) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2759 | return r |
| 2760 | |
| 2761 | def __getattr__(self, name): |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 2762 | """Allow arbitrary git commands using pythonic syntax. |
| 2763 | |
| 2764 | This allows you to do things like: |
| 2765 | git_obj.rev_parse('HEAD') |
| 2766 | |
| 2767 | Since we don't have a 'rev_parse' method defined, the __getattr__ will |
| 2768 | run. We'll replace the '_' with a '-' and try to run a git command. |
Dave Borowitz | 091f893 | 2012-10-23 17:01:04 -0700 | [diff] [blame] | 2769 | Any other positional arguments will be passed to the git command, and the |
| 2770 | following keyword arguments are supported: |
| 2771 | config: An optional dict of git config options to be passed with '-c'. |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 2772 | |
| 2773 | Args: |
| 2774 | name: The name of the git command to call. Any '_' characters will |
| 2775 | be replaced with '-'. |
| 2776 | |
| 2777 | Returns: |
| 2778 | A callable object that will try to call git with the named command. |
| 2779 | """ |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2780 | name = name.replace('_', '-') |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2781 | |
Dave Borowitz | 091f893 | 2012-10-23 17:01:04 -0700 | [diff] [blame] | 2782 | def runner(*args, **kwargs): |
| 2783 | cmdv = [] |
| 2784 | config = kwargs.pop('config', None) |
| 2785 | for k in kwargs: |
| 2786 | raise TypeError('%s() got an unexpected keyword argument %r' |
| 2787 | % (name, k)) |
| 2788 | if config is not None: |
Dave Borowitz | b42b474 | 2012-10-31 12:27:27 -0700 | [diff] [blame] | 2789 | if not git_require((1, 7, 2)): |
| 2790 | raise ValueError('cannot set config on command line for %s()' |
| 2791 | % name) |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 2792 | for k, v in config.items(): |
Dave Borowitz | 091f893 | 2012-10-23 17:01:04 -0700 | [diff] [blame] | 2793 | cmdv.append('-c') |
| 2794 | cmdv.append('%s=%s' % (k, v)) |
| 2795 | cmdv.append(name) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2796 | cmdv.extend(args) |
| 2797 | p = GitCommand(self._project, |
| 2798 | cmdv, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2799 | bare=self._bare, |
David James | 8d20116 | 2013-10-11 17:03:19 -0700 | [diff] [blame] | 2800 | gitdir=self._gitdir, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2801 | capture_stdout=True, |
| 2802 | capture_stderr=True) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2803 | if p.Wait() != 0: |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2804 | raise GitError('%s %s: %s' % |
| 2805 | (self._project.name, name, p.stderr)) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2806 | r = p.stdout |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 2807 | try: |
Conley Owens | edd0151 | 2013-09-26 12:59:58 -0700 | [diff] [blame] | 2808 | r = r.decode('utf-8') |
Chirayu Desai | 217ea7d | 2013-03-01 19:14:38 +0530 | [diff] [blame] | 2809 | except AttributeError: |
| 2810 | pass |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2811 | if r.endswith('\n') and r.index('\n') == len(r) - 1: |
| 2812 | return r[:-1] |
| 2813 | return r |
| 2814 | return runner |
| 2815 | |
| 2816 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2817 | class _PriorSyncFailedError(Exception): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2818 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2819 | def __str__(self): |
| 2820 | return 'prior sync failed; rebase still in progress' |
| 2821 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2822 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2823 | class _DirtyError(Exception): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2824 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2825 | def __str__(self): |
| 2826 | return 'contains uncommitted changes' |
| 2827 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2828 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2829 | class _InfoMessage(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2830 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2831 | def __init__(self, project, text): |
| 2832 | self.project = project |
| 2833 | self.text = text |
| 2834 | |
| 2835 | def Print(self, syncbuf): |
| 2836 | syncbuf.out.info('%s/: %s', self.project.relpath, self.text) |
| 2837 | syncbuf.out.nl() |
| 2838 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2839 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2840 | class _Failure(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2841 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2842 | def __init__(self, project, why): |
| 2843 | self.project = project |
| 2844 | self.why = why |
| 2845 | |
| 2846 | def Print(self, syncbuf): |
| 2847 | syncbuf.out.fail('error: %s/: %s', |
| 2848 | self.project.relpath, |
| 2849 | str(self.why)) |
| 2850 | syncbuf.out.nl() |
| 2851 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2852 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2853 | class _Later(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2854 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2855 | def __init__(self, project, action): |
| 2856 | self.project = project |
| 2857 | self.action = action |
| 2858 | |
| 2859 | def Run(self, syncbuf): |
| 2860 | out = syncbuf.out |
| 2861 | out.project('project %s/', self.project.relpath) |
| 2862 | out.nl() |
| 2863 | try: |
| 2864 | self.action() |
| 2865 | out.nl() |
| 2866 | return True |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 2867 | except GitError: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2868 | out.nl() |
| 2869 | return False |
| 2870 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2871 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2872 | class _SyncColoring(Coloring): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2873 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2874 | def __init__(self, config): |
| 2875 | Coloring.__init__(self, config, 'reposync') |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2876 | self.project = self.printer('header', attr='bold') |
| 2877 | self.info = self.printer('info') |
| 2878 | self.fail = self.printer('fail', fg='red') |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2879 | |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2880 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2881 | class SyncBuffer(object): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2882 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2883 | def __init__(self, config, detach_head=False): |
| 2884 | self._messages = [] |
| 2885 | self._failures = [] |
| 2886 | self._later_queue1 = [] |
| 2887 | self._later_queue2 = [] |
| 2888 | |
| 2889 | self.out = _SyncColoring(config) |
| 2890 | self.out.redirect(sys.stderr) |
| 2891 | |
| 2892 | self.detach_head = detach_head |
| 2893 | self.clean = True |
David Riley | e0684ad | 2017-04-05 00:02:59 -0700 | [diff] [blame] | 2894 | self.recent_clean = True |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2895 | |
| 2896 | def info(self, project, fmt, *args): |
| 2897 | self._messages.append(_InfoMessage(project, fmt % args)) |
| 2898 | |
| 2899 | def fail(self, project, err=None): |
| 2900 | self._failures.append(_Failure(project, err)) |
David Riley | e0684ad | 2017-04-05 00:02:59 -0700 | [diff] [blame] | 2901 | self._MarkUnclean() |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2902 | |
| 2903 | def later1(self, project, what): |
| 2904 | self._later_queue1.append(_Later(project, what)) |
| 2905 | |
| 2906 | def later2(self, project, what): |
| 2907 | self._later_queue2.append(_Later(project, what)) |
| 2908 | |
| 2909 | def Finish(self): |
| 2910 | self._PrintMessages() |
| 2911 | self._RunLater() |
| 2912 | self._PrintMessages() |
| 2913 | return self.clean |
| 2914 | |
David Riley | e0684ad | 2017-04-05 00:02:59 -0700 | [diff] [blame] | 2915 | def Recently(self): |
| 2916 | recent_clean = self.recent_clean |
| 2917 | self.recent_clean = True |
| 2918 | return recent_clean |
| 2919 | |
| 2920 | def _MarkUnclean(self): |
| 2921 | self.clean = False |
| 2922 | self.recent_clean = False |
| 2923 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2924 | def _RunLater(self): |
| 2925 | for q in ['_later_queue1', '_later_queue2']: |
| 2926 | if not self._RunQueue(q): |
| 2927 | return |
| 2928 | |
| 2929 | def _RunQueue(self, queue): |
| 2930 | for m in getattr(self, queue): |
| 2931 | if not m.Run(self): |
David Riley | e0684ad | 2017-04-05 00:02:59 -0700 | [diff] [blame] | 2932 | self._MarkUnclean() |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2933 | return False |
| 2934 | setattr(self, queue, []) |
| 2935 | return True |
| 2936 | |
| 2937 | def _PrintMessages(self): |
| 2938 | for m in self._messages: |
| 2939 | m.Print(self) |
| 2940 | for m in self._failures: |
| 2941 | m.Print(self) |
| 2942 | |
| 2943 | self._messages = [] |
| 2944 | self._failures = [] |
| 2945 | |
| 2946 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2947 | class MetaProject(Project): |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2948 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2949 | """A special project housed under .repo. |
| 2950 | """ |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2951 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2952 | def __init__(self, manifest, name, gitdir, worktree): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2953 | Project.__init__(self, |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2954 | manifest=manifest, |
| 2955 | name=name, |
| 2956 | gitdir=gitdir, |
| 2957 | objdir=gitdir, |
| 2958 | worktree=worktree, |
| 2959 | remote=RemoteSpec('origin'), |
| 2960 | relpath='.repo/%s' % name, |
| 2961 | revisionExpr='refs/heads/master', |
| 2962 | revisionId=None, |
| 2963 | groups=None) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2964 | |
| 2965 | def PreSync(self): |
| 2966 | if self.Exists: |
| 2967 | cb = self.CurrentBranch |
| 2968 | if cb: |
| 2969 | base = self.GetBranch(cb).merge |
| 2970 | if base: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2971 | self.revisionExpr = base |
| 2972 | self.revisionId = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2973 | |
Martin Kelly | 224a31a | 2017-07-10 14:46:25 -0700 | [diff] [blame] | 2974 | def MetaBranchSwitch(self, submodules=False): |
Florian Vallee | 5d01650 | 2012-06-07 17:19:26 +0200 | [diff] [blame] | 2975 | """ Prepare MetaProject for manifest branch switch |
| 2976 | """ |
| 2977 | |
| 2978 | # detach and delete manifest branch, allowing a new |
| 2979 | # branch to take over |
Anthony King | 7bdac71 | 2014-07-16 12:56:40 +0100 | [diff] [blame] | 2980 | syncbuf = SyncBuffer(self.config, detach_head=True) |
Martin Kelly | 224a31a | 2017-07-10 14:46:25 -0700 | [diff] [blame] | 2981 | self.Sync_LocalHalf(syncbuf, submodules=submodules) |
Florian Vallee | 5d01650 | 2012-06-07 17:19:26 +0200 | [diff] [blame] | 2982 | syncbuf.Finish() |
| 2983 | |
| 2984 | return GitCommand(self, |
Mark E. Hamilton | 30b0f4e | 2016-02-10 10:44:30 -0700 | [diff] [blame] | 2985 | ['update-ref', '-d', 'refs/heads/default'], |
| 2986 | capture_stdout=True, |
| 2987 | capture_stderr=True).Wait() == 0 |
Florian Vallee | 5d01650 | 2012-06-07 17:19:26 +0200 | [diff] [blame] | 2988 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2989 | @property |
Shawn O. Pearce | f690687 | 2009-04-18 10:49:00 -0700 | [diff] [blame] | 2990 | def LastFetch(self): |
| 2991 | try: |
| 2992 | fh = os.path.join(self.gitdir, 'FETCH_HEAD') |
| 2993 | return os.path.getmtime(fh) |
| 2994 | except OSError: |
| 2995 | return 0 |
| 2996 | |
| 2997 | @property |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2998 | def HasChanges(self): |
| 2999 | """Has the remote received new commits not yet checked out? |
| 3000 | """ |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 3001 | if not self.remote or not self.revisionExpr: |
Shawn O. Pearce | 336f7bd | 2009-04-18 10:39:28 -0700 | [diff] [blame] | 3002 | return False |
| 3003 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 3004 | all_refs = self.bare_ref.all |
| 3005 | revid = self.GetRevisionId(all_refs) |
Shawn O. Pearce | 336f7bd | 2009-04-18 10:39:28 -0700 | [diff] [blame] | 3006 | head = self.work_git.GetHead() |
| 3007 | if head.startswith(R_HEADS): |
| 3008 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame] | 3009 | head = all_refs[head] |
Shawn O. Pearce | 336f7bd | 2009-04-18 10:39:28 -0700 | [diff] [blame] | 3010 | except KeyError: |
| 3011 | head = None |
| 3012 | |
| 3013 | if revid == head: |
| 3014 | return False |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 3015 | elif self._revlist(not_rev(HEAD), revid): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 3016 | return True |
| 3017 | return False |