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 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 15 | import traceback |
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 |
| 18 | import os |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 19 | import random |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 20 | import re |
| 21 | import shutil |
| 22 | import stat |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 23 | import subprocess |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 24 | import sys |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 25 | import time |
Shawn O. Pearce | df5ee52 | 2011-10-11 14:05:21 -0700 | [diff] [blame] | 26 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 27 | from color import Coloring |
| 28 | from git_command import GitCommand |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 29 | from git_config import GitConfig, IsId, GetSchemeFromUrl, ID_RE |
David Pursehouse | e15c65a | 2012-08-22 10:46:11 +0900 | [diff] [blame] | 30 | from error import GitError, HookError, UploadError |
Shawn O. Pearce | 559b846 | 2009-03-02 12:56:08 -0800 | [diff] [blame] | 31 | from error import ManifestInvalidRevisionError |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 32 | from trace import IsTrace, Trace |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 33 | |
Shawn O. Pearce | d237b69 | 2009-04-17 18:49:50 -0700 | [diff] [blame] | 34 | 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] | 35 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 36 | def _lwrite(path, content): |
| 37 | lock = '%s.lock' % path |
| 38 | |
| 39 | fd = open(lock, 'wb') |
| 40 | try: |
| 41 | fd.write(content) |
| 42 | finally: |
| 43 | fd.close() |
| 44 | |
| 45 | try: |
| 46 | os.rename(lock, path) |
| 47 | except OSError: |
| 48 | os.remove(lock) |
| 49 | raise |
| 50 | |
Shawn O. Pearce | 4824478 | 2009-04-16 08:25:57 -0700 | [diff] [blame] | 51 | def _error(fmt, *args): |
| 52 | msg = fmt % args |
| 53 | print >>sys.stderr, 'error: %s' % msg |
| 54 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 55 | def not_rev(r): |
| 56 | return '^' + r |
| 57 | |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 58 | def sq(r): |
| 59 | return "'" + r.replace("'", "'\''") + "'" |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 60 | |
Doug Anderson | 8ced864 | 2011-01-10 14:16:30 -0800 | [diff] [blame] | 61 | _project_hook_list = None |
| 62 | def _ProjectHooks(): |
| 63 | """List the hooks present in the 'hooks' directory. |
| 64 | |
| 65 | These hooks are project hooks and are copied to the '.git/hooks' directory |
| 66 | of all subprojects. |
| 67 | |
| 68 | This function caches the list of hooks (based on the contents of the |
| 69 | 'repo/hooks' directory) on the first call. |
| 70 | |
| 71 | Returns: |
| 72 | A list of absolute paths to all of the files in the hooks directory. |
| 73 | """ |
| 74 | global _project_hook_list |
| 75 | if _project_hook_list is None: |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 76 | d = os.path.abspath(os.path.dirname(__file__)) |
| 77 | d = os.path.join(d , 'hooks') |
Doug Anderson | 8ced864 | 2011-01-10 14:16:30 -0800 | [diff] [blame] | 78 | _project_hook_list = map(lambda x: os.path.join(d, x), os.listdir(d)) |
| 79 | return _project_hook_list |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 80 | |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 81 | |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 82 | class DownloadedChange(object): |
| 83 | _commit_cache = None |
| 84 | |
| 85 | def __init__(self, project, base, change_id, ps_id, commit): |
| 86 | self.project = project |
| 87 | self.base = base |
| 88 | self.change_id = change_id |
| 89 | self.ps_id = ps_id |
| 90 | self.commit = commit |
| 91 | |
| 92 | @property |
| 93 | def commits(self): |
| 94 | if self._commit_cache is None: |
| 95 | self._commit_cache = self.project.bare_git.rev_list( |
| 96 | '--abbrev=8', |
| 97 | '--abbrev-commit', |
| 98 | '--pretty=oneline', |
| 99 | '--reverse', |
| 100 | '--date-order', |
| 101 | not_rev(self.base), |
| 102 | self.commit, |
| 103 | '--') |
| 104 | return self._commit_cache |
| 105 | |
| 106 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 107 | class ReviewableBranch(object): |
| 108 | _commit_cache = None |
| 109 | |
| 110 | def __init__(self, project, branch, base): |
| 111 | self.project = project |
| 112 | self.branch = branch |
| 113 | self.base = base |
| 114 | |
| 115 | @property |
| 116 | def name(self): |
| 117 | return self.branch.name |
| 118 | |
| 119 | @property |
| 120 | def commits(self): |
| 121 | if self._commit_cache is None: |
| 122 | self._commit_cache = self.project.bare_git.rev_list( |
| 123 | '--abbrev=8', |
| 124 | '--abbrev-commit', |
| 125 | '--pretty=oneline', |
| 126 | '--reverse', |
| 127 | '--date-order', |
| 128 | not_rev(self.base), |
| 129 | R_HEADS + self.name, |
| 130 | '--') |
| 131 | return self._commit_cache |
| 132 | |
| 133 | @property |
Shawn O. Pearce | c99883f | 2008-11-11 17:12:43 -0800 | [diff] [blame] | 134 | def unabbrev_commits(self): |
| 135 | r = dict() |
| 136 | for commit in self.project.bare_git.rev_list( |
| 137 | not_rev(self.base), |
| 138 | R_HEADS + self.name, |
| 139 | '--'): |
| 140 | r[commit[0:8]] = commit |
| 141 | return r |
| 142 | |
| 143 | @property |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 144 | def date(self): |
| 145 | return self.project.bare_git.log( |
| 146 | '--pretty=format:%cd', |
| 147 | '-n', '1', |
| 148 | R_HEADS + self.name, |
| 149 | '--') |
| 150 | |
Brian Harring | 435370c | 2012-07-28 15:37:04 -0700 | [diff] [blame] | 151 | def UploadForReview(self, people, auto_topic=False, draft=False): |
Shawn O. Pearce | c99883f | 2008-11-11 17:12:43 -0800 | [diff] [blame] | 152 | self.project.UploadForReview(self.name, |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 153 | people, |
Brian Harring | 435370c | 2012-07-28 15:37:04 -0700 | [diff] [blame] | 154 | auto_topic=auto_topic, |
| 155 | draft=draft) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 156 | |
Ficus Kirkpatrick | bc7ef67 | 2009-05-04 12:45:11 -0700 | [diff] [blame] | 157 | def GetPublishedRefs(self): |
| 158 | refs = {} |
| 159 | output = self.project.bare_git.ls_remote( |
| 160 | self.branch.remote.SshReviewUrl(self.project.UserEmail), |
| 161 | 'refs/changes/*') |
| 162 | for line in output.split('\n'): |
| 163 | try: |
| 164 | (sha, ref) = line.split() |
| 165 | refs[sha] = ref |
| 166 | except ValueError: |
| 167 | pass |
| 168 | |
| 169 | return refs |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 170 | |
| 171 | class StatusColoring(Coloring): |
| 172 | def __init__(self, config): |
| 173 | Coloring.__init__(self, config, 'status') |
| 174 | self.project = self.printer('header', attr = 'bold') |
| 175 | self.branch = self.printer('header', attr = 'bold') |
| 176 | self.nobranch = self.printer('nobranch', fg = 'red') |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 177 | self.important = self.printer('important', fg = 'red') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 178 | |
| 179 | self.added = self.printer('added', fg = 'green') |
| 180 | self.changed = self.printer('changed', fg = 'red') |
| 181 | self.untracked = self.printer('untracked', fg = 'red') |
| 182 | |
| 183 | |
| 184 | class DiffColoring(Coloring): |
| 185 | def __init__(self, config): |
| 186 | Coloring.__init__(self, config, 'diff') |
| 187 | self.project = self.printer('header', attr = 'bold') |
| 188 | |
James W. Mills | 24c1308 | 2012-04-12 15:04:13 -0500 | [diff] [blame] | 189 | class _Annotation: |
| 190 | def __init__(self, name, value, keep): |
| 191 | self.name = name |
| 192 | self.value = value |
| 193 | self.keep = keep |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 194 | |
| 195 | class _CopyFile: |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 196 | def __init__(self, src, dest, abssrc, absdest): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 197 | self.src = src |
| 198 | self.dest = dest |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 199 | self.abs_src = abssrc |
| 200 | self.abs_dest = absdest |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 201 | |
| 202 | def _Copy(self): |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 203 | src = self.abs_src |
| 204 | dest = self.abs_dest |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 205 | # copy file if it does not exist or is out of date |
| 206 | if not os.path.exists(dest) or not filecmp.cmp(src, dest): |
| 207 | try: |
| 208 | # remove existing file first, since it might be read-only |
| 209 | if os.path.exists(dest): |
| 210 | os.remove(dest) |
Matthew Buckett | 2daf667 | 2009-07-11 09:43:47 -0400 | [diff] [blame] | 211 | else: |
| 212 | dir = os.path.dirname(dest) |
| 213 | if not os.path.isdir(dir): |
| 214 | os.makedirs(dir) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 215 | shutil.copy(src, dest) |
| 216 | # make the file read-only |
| 217 | mode = os.stat(dest)[stat.ST_MODE] |
| 218 | mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH) |
| 219 | os.chmod(dest, mode) |
| 220 | except IOError: |
Shawn O. Pearce | 4824478 | 2009-04-16 08:25:57 -0700 | [diff] [blame] | 221 | _error('Cannot copy file %s to %s', src, dest) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 222 | |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 223 | class RemoteSpec(object): |
| 224 | def __init__(self, |
| 225 | name, |
| 226 | url = None, |
| 227 | review = None): |
| 228 | self.name = name |
| 229 | self.url = url |
| 230 | self.review = review |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 231 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 232 | class RepoHook(object): |
| 233 | """A RepoHook contains information about a script to run as a hook. |
| 234 | |
| 235 | Hooks are used to run a python script before running an upload (for instance, |
| 236 | to run presubmit checks). Eventually, we may have hooks for other actions. |
| 237 | |
| 238 | This shouldn't be confused with files in the 'repo/hooks' directory. Those |
| 239 | files are copied into each '.git/hooks' folder for each project. Repo-level |
| 240 | hooks are associated instead with repo actions. |
| 241 | |
| 242 | Hooks are always python. When a hook is run, we will load the hook into the |
| 243 | interpreter and execute its main() function. |
| 244 | """ |
| 245 | def __init__(self, |
| 246 | hook_type, |
| 247 | hooks_project, |
| 248 | topdir, |
| 249 | abort_if_user_denies=False): |
| 250 | """RepoHook constructor. |
| 251 | |
| 252 | Params: |
| 253 | hook_type: A string representing the type of hook. This is also used |
| 254 | to figure out the name of the file containing the hook. For |
| 255 | example: 'pre-upload'. |
| 256 | hooks_project: The project containing the repo hooks. If you have a |
| 257 | manifest, this is manifest.repo_hooks_project. OK if this is None, |
| 258 | which will make the hook a no-op. |
| 259 | topdir: Repo's top directory (the one containing the .repo directory). |
| 260 | Scripts will run with CWD as this directory. If you have a manifest, |
| 261 | this is manifest.topdir |
| 262 | abort_if_user_denies: If True, we'll throw a HookError() if the user |
| 263 | doesn't allow us to run the hook. |
| 264 | """ |
| 265 | self._hook_type = hook_type |
| 266 | self._hooks_project = hooks_project |
| 267 | self._topdir = topdir |
| 268 | self._abort_if_user_denies = abort_if_user_denies |
| 269 | |
| 270 | # Store the full path to the script for convenience. |
| 271 | if self._hooks_project: |
| 272 | self._script_fullpath = os.path.join(self._hooks_project.worktree, |
| 273 | self._hook_type + '.py') |
| 274 | else: |
| 275 | self._script_fullpath = None |
| 276 | |
| 277 | def _GetHash(self): |
| 278 | """Return a hash of the contents of the hooks directory. |
| 279 | |
| 280 | We'll just use git to do this. This hash has the property that if anything |
| 281 | changes in the directory we will return a different has. |
| 282 | |
| 283 | SECURITY CONSIDERATION: |
| 284 | This hash only represents the contents of files in the hook directory, not |
| 285 | any other files imported or called by hooks. Changes to imported files |
| 286 | can change the script behavior without affecting the hash. |
| 287 | |
| 288 | Returns: |
| 289 | A string representing the hash. This will always be ASCII so that it can |
| 290 | be printed to the user easily. |
| 291 | """ |
| 292 | assert self._hooks_project, "Must have hooks to calculate their hash." |
| 293 | |
| 294 | # We will use the work_git object rather than just calling GetRevisionId(). |
| 295 | # That gives us a hash of the latest checked in version of the files that |
| 296 | # the user will actually be executing. Specifically, GetRevisionId() |
| 297 | # doesn't appear to change even if a user checks out a different version |
| 298 | # of the hooks repo (via git checkout) nor if a user commits their own revs. |
| 299 | # |
| 300 | # NOTE: Local (non-committed) changes will not be factored into this hash. |
| 301 | # I think this is OK, since we're really only worried about warning the user |
| 302 | # about upstream changes. |
| 303 | return self._hooks_project.work_git.rev_parse('HEAD') |
| 304 | |
| 305 | def _GetMustVerb(self): |
| 306 | """Return 'must' if the hook is required; 'should' if not.""" |
| 307 | if self._abort_if_user_denies: |
| 308 | return 'must' |
| 309 | else: |
| 310 | return 'should' |
| 311 | |
| 312 | def _CheckForHookApproval(self): |
| 313 | """Check to see whether this hook has been approved. |
| 314 | |
| 315 | We'll look at the hash of all of the hooks. If this matches the hash that |
| 316 | the user last approved, we're done. If it doesn't, we'll ask the user |
| 317 | about approval. |
| 318 | |
| 319 | Note that we ask permission for each individual hook even though we use |
| 320 | the hash of all hooks when detecting changes. We'd like the user to be |
| 321 | able to approve / deny each hook individually. We only use the hash of all |
| 322 | hooks because there is no other easy way to detect changes to local imports. |
| 323 | |
| 324 | Returns: |
| 325 | True if this hook is approved to run; False otherwise. |
| 326 | |
| 327 | Raises: |
| 328 | HookError: Raised if the user doesn't approve and abort_if_user_denies |
| 329 | was passed to the consturctor. |
| 330 | """ |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 331 | hooks_config = self._hooks_project.config |
| 332 | git_approval_key = 'repo.hooks.%s.approvedhash' % self._hook_type |
| 333 | |
| 334 | # Get the last hash that the user approved for this hook; may be None. |
| 335 | old_hash = hooks_config.GetString(git_approval_key) |
| 336 | |
| 337 | # Get the current hash so we can tell if scripts changed since approval. |
| 338 | new_hash = self._GetHash() |
| 339 | |
| 340 | if old_hash is not None: |
| 341 | # User previously approved hook and asked not to be prompted again. |
| 342 | if new_hash == old_hash: |
| 343 | # Approval matched. We're done. |
| 344 | return True |
| 345 | else: |
| 346 | # Give the user a reason why we're prompting, since they last told |
| 347 | # us to "never ask again". |
| 348 | prompt = 'WARNING: Scripts have changed since %s was allowed.\n\n' % ( |
| 349 | self._hook_type) |
| 350 | else: |
| 351 | prompt = '' |
| 352 | |
| 353 | # Prompt the user if we're not on a tty; on a tty we'll assume "no". |
| 354 | if sys.stdout.isatty(): |
| 355 | prompt += ('Repo %s run the script:\n' |
| 356 | ' %s\n' |
| 357 | '\n' |
| 358 | 'Do you want to allow this script to run ' |
| 359 | '(yes/yes-never-ask-again/NO)? ') % ( |
| 360 | self._GetMustVerb(), self._script_fullpath) |
| 361 | response = raw_input(prompt).lower() |
| 362 | print |
| 363 | |
| 364 | # User is doing a one-time approval. |
| 365 | if response in ('y', 'yes'): |
| 366 | return True |
| 367 | elif response == 'yes-never-ask-again': |
| 368 | hooks_config.SetString(git_approval_key, new_hash) |
| 369 | return True |
| 370 | |
| 371 | # For anything else, we'll assume no approval. |
| 372 | if self._abort_if_user_denies: |
| 373 | raise HookError('You must allow the %s hook or use --no-verify.' % |
| 374 | self._hook_type) |
| 375 | |
| 376 | return False |
| 377 | |
| 378 | def _ExecuteHook(self, **kwargs): |
| 379 | """Actually execute the given hook. |
| 380 | |
| 381 | This will run the hook's 'main' function in our python interpreter. |
| 382 | |
| 383 | Args: |
| 384 | kwargs: Keyword arguments to pass to the hook. These are often specific |
| 385 | to the hook type. For instance, pre-upload hooks will contain |
| 386 | a project_list. |
| 387 | """ |
| 388 | # Keep sys.path and CWD stashed away so that we can always restore them |
| 389 | # upon function exit. |
| 390 | orig_path = os.getcwd() |
| 391 | orig_syspath = sys.path |
| 392 | |
| 393 | try: |
| 394 | # Always run hooks with CWD as topdir. |
| 395 | os.chdir(self._topdir) |
| 396 | |
| 397 | # Put the hook dir as the first item of sys.path so hooks can do |
| 398 | # relative imports. We want to replace the repo dir as [0] so |
| 399 | # hooks can't import repo files. |
| 400 | sys.path = [os.path.dirname(self._script_fullpath)] + sys.path[1:] |
| 401 | |
| 402 | # Exec, storing global context in the context dict. We catch exceptions |
| 403 | # and convert to a HookError w/ just the failing traceback. |
| 404 | context = {} |
| 405 | try: |
| 406 | execfile(self._script_fullpath, context) |
| 407 | except Exception: |
| 408 | raise HookError('%s\nFailed to import %s hook; see traceback above.' % ( |
| 409 | traceback.format_exc(), self._hook_type)) |
| 410 | |
| 411 | # Running the script should have defined a main() function. |
| 412 | if 'main' not in context: |
| 413 | raise HookError('Missing main() in: "%s"' % self._script_fullpath) |
| 414 | |
| 415 | |
| 416 | # Add 'hook_should_take_kwargs' to the arguments to be passed to main. |
| 417 | # We don't actually want hooks to define their main with this argument-- |
| 418 | # it's there to remind them that their hook should always take **kwargs. |
| 419 | # For instance, a pre-upload hook should be defined like: |
| 420 | # def main(project_list, **kwargs): |
| 421 | # |
| 422 | # This allows us to later expand the API without breaking old hooks. |
| 423 | kwargs = kwargs.copy() |
| 424 | kwargs['hook_should_take_kwargs'] = True |
| 425 | |
| 426 | # Call the main function in the hook. If the hook should cause the |
| 427 | # build to fail, it will raise an Exception. We'll catch that convert |
| 428 | # to a HookError w/ just the failing traceback. |
| 429 | try: |
| 430 | context['main'](**kwargs) |
| 431 | except Exception: |
| 432 | raise HookError('%s\nFailed to run main() for %s hook; see traceback ' |
| 433 | 'above.' % ( |
| 434 | traceback.format_exc(), self._hook_type)) |
| 435 | finally: |
| 436 | # Restore sys.path and CWD. |
| 437 | sys.path = orig_syspath |
| 438 | os.chdir(orig_path) |
| 439 | |
| 440 | def Run(self, user_allows_all_hooks, **kwargs): |
| 441 | """Run the hook. |
| 442 | |
| 443 | If the hook doesn't exist (because there is no hooks project or because |
| 444 | this particular hook is not enabled), this is a no-op. |
| 445 | |
| 446 | Args: |
| 447 | user_allows_all_hooks: If True, we will never prompt about running the |
| 448 | hook--we'll just assume it's OK to run it. |
| 449 | kwargs: Keyword arguments to pass to the hook. These are often specific |
| 450 | to the hook type. For instance, pre-upload hooks will contain |
| 451 | a project_list. |
| 452 | |
| 453 | Raises: |
| 454 | HookError: If there was a problem finding the hook or the user declined |
| 455 | to run a required hook (from _CheckForHookApproval). |
| 456 | """ |
| 457 | # No-op if there is no hooks project or if hook is disabled. |
| 458 | if ((not self._hooks_project) or |
| 459 | (self._hook_type not in self._hooks_project.enabled_repo_hooks)): |
| 460 | return |
| 461 | |
| 462 | # Bail with a nice error if we can't find the hook. |
| 463 | if not os.path.isfile(self._script_fullpath): |
| 464 | raise HookError('Couldn\'t find repo hook: "%s"' % self._script_fullpath) |
| 465 | |
| 466 | # Make sure the user is OK with running the hook. |
| 467 | if (not user_allows_all_hooks) and (not self._CheckForHookApproval()): |
| 468 | return |
| 469 | |
| 470 | # Run the hook with the same version of python we're using. |
| 471 | self._ExecuteHook(**kwargs) |
| 472 | |
| 473 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 474 | class Project(object): |
| 475 | def __init__(self, |
| 476 | manifest, |
| 477 | name, |
| 478 | remote, |
| 479 | gitdir, |
| 480 | worktree, |
| 481 | relpath, |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 482 | revisionExpr, |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 483 | revisionId, |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 484 | rebase = True, |
Anatol Pomazau | 79770d2 | 2012-04-20 14:41:59 -0700 | [diff] [blame] | 485 | groups = None, |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 486 | sync_c = False, |
| 487 | upstream = None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 488 | self.manifest = manifest |
| 489 | self.name = name |
| 490 | self.remote = remote |
Anthony Newnam | df14a70 | 2011-01-09 17:31:57 -0800 | [diff] [blame] | 491 | self.gitdir = gitdir.replace('\\', '/') |
Shawn O. Pearce | 0ce6ca9 | 2011-01-10 13:26:01 -0800 | [diff] [blame] | 492 | if worktree: |
| 493 | self.worktree = worktree.replace('\\', '/') |
| 494 | else: |
| 495 | self.worktree = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 496 | self.relpath = relpath |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 497 | self.revisionExpr = revisionExpr |
| 498 | |
| 499 | if revisionId is None \ |
| 500 | and revisionExpr \ |
| 501 | and IsId(revisionExpr): |
| 502 | self.revisionId = revisionExpr |
| 503 | else: |
| 504 | self.revisionId = revisionId |
| 505 | |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 506 | self.rebase = rebase |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 507 | self.groups = groups |
Anatol Pomazau | 79770d2 | 2012-04-20 14:41:59 -0700 | [diff] [blame] | 508 | self.sync_c = sync_c |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 509 | self.upstream = upstream |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 510 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 511 | self.snapshots = {} |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 512 | self.copyfiles = [] |
James W. Mills | 24c1308 | 2012-04-12 15:04:13 -0500 | [diff] [blame] | 513 | self.annotations = [] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 514 | self.config = GitConfig.ForRepository( |
| 515 | gitdir = self.gitdir, |
| 516 | defaults = self.manifest.globalConfig) |
| 517 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 518 | if self.worktree: |
| 519 | self.work_git = self._GitGetByExec(self, bare=False) |
| 520 | else: |
| 521 | self.work_git = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 522 | self.bare_git = self._GitGetByExec(self, bare=True) |
Shawn O. Pearce | d237b69 | 2009-04-17 18:49:50 -0700 | [diff] [blame] | 523 | self.bare_ref = GitRefs(gitdir) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 524 | |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 525 | # This will be filled in if a project is later identified to be the |
| 526 | # project containing repo hooks. |
| 527 | self.enabled_repo_hooks = [] |
| 528 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 529 | @property |
| 530 | def Exists(self): |
| 531 | return os.path.isdir(self.gitdir) |
| 532 | |
| 533 | @property |
| 534 | def CurrentBranch(self): |
| 535 | """Obtain the name of the currently checked out branch. |
| 536 | The branch name omits the 'refs/heads/' prefix. |
| 537 | None is returned if the project is on a detached HEAD. |
| 538 | """ |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 539 | b = self.work_git.GetHead() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 540 | if b.startswith(R_HEADS): |
| 541 | return b[len(R_HEADS):] |
| 542 | return None |
| 543 | |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 544 | def IsRebaseInProgress(self): |
| 545 | w = self.worktree |
| 546 | g = os.path.join(w, '.git') |
| 547 | return os.path.exists(os.path.join(g, 'rebase-apply')) \ |
| 548 | or os.path.exists(os.path.join(g, 'rebase-merge')) \ |
| 549 | or os.path.exists(os.path.join(w, '.dotest')) |
Julius Gustavsson | 0cb1b3f | 2010-06-17 17:55:02 +0200 | [diff] [blame] | 550 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 551 | def IsDirty(self, consider_untracked=True): |
| 552 | """Is the working directory modified in some way? |
| 553 | """ |
| 554 | self.work_git.update_index('-q', |
| 555 | '--unmerged', |
| 556 | '--ignore-missing', |
| 557 | '--refresh') |
| 558 | if self.work_git.DiffZ('diff-index','-M','--cached',HEAD): |
| 559 | return True |
| 560 | if self.work_git.DiffZ('diff-files'): |
| 561 | return True |
| 562 | if consider_untracked and self.work_git.LsOthers(): |
| 563 | return True |
| 564 | return False |
| 565 | |
| 566 | _userident_name = None |
| 567 | _userident_email = None |
| 568 | |
| 569 | @property |
| 570 | def UserName(self): |
| 571 | """Obtain the user's personal name. |
| 572 | """ |
| 573 | if self._userident_name is None: |
| 574 | self._LoadUserIdentity() |
| 575 | return self._userident_name |
| 576 | |
| 577 | @property |
| 578 | def UserEmail(self): |
| 579 | """Obtain the user's email address. This is very likely |
| 580 | to be their Gerrit login. |
| 581 | """ |
| 582 | if self._userident_email is None: |
| 583 | self._LoadUserIdentity() |
| 584 | return self._userident_email |
| 585 | |
| 586 | def _LoadUserIdentity(self): |
| 587 | u = self.bare_git.var('GIT_COMMITTER_IDENT') |
| 588 | m = re.compile("^(.*) <([^>]*)> ").match(u) |
| 589 | if m: |
| 590 | self._userident_name = m.group(1) |
| 591 | self._userident_email = m.group(2) |
| 592 | else: |
| 593 | self._userident_name = '' |
| 594 | self._userident_email = '' |
| 595 | |
| 596 | def GetRemote(self, name): |
| 597 | """Get the configuration for a single remote. |
| 598 | """ |
| 599 | return self.config.GetRemote(name) |
| 600 | |
| 601 | def GetBranch(self, name): |
| 602 | """Get the configuration for a single branch. |
| 603 | """ |
| 604 | return self.config.GetBranch(name) |
| 605 | |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 606 | def GetBranches(self): |
| 607 | """Get all existing local branches. |
| 608 | """ |
| 609 | current = self.CurrentBranch |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 610 | all_refs = self._allrefs |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 611 | heads = {} |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 612 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 613 | for name, ref_id in all_refs.iteritems(): |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 614 | if name.startswith(R_HEADS): |
| 615 | name = name[len(R_HEADS):] |
| 616 | b = self.GetBranch(name) |
| 617 | b.current = name == current |
| 618 | b.published = None |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 619 | b.revision = ref_id |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 620 | heads[name] = b |
| 621 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 622 | for name, ref_id in all_refs.iteritems(): |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 623 | if name.startswith(R_PUB): |
| 624 | name = name[len(R_PUB):] |
| 625 | b = heads.get(name) |
| 626 | if b: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 627 | b.published = ref_id |
Shawn O. Pearce | 27b0732 | 2009-04-10 16:02:48 -0700 | [diff] [blame] | 628 | |
| 629 | return heads |
| 630 | |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 631 | def MatchesGroups(self, manifest_groups): |
| 632 | """Returns true if the manifest groups specified at init should cause |
| 633 | this project to be synced. |
| 634 | Prefixing a manifest group with "-" inverts the meaning of a group. |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 635 | All projects are implicitly labelled with "all". |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 636 | |
| 637 | labels are resolved in order. In the example case of |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 638 | project_groups: "all,group1,group2" |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 639 | manifest_groups: "-group1,group2" |
| 640 | the project will be matched. |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 641 | """ |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 642 | expanded_manifest_groups = manifest_groups or ['all', '-notdefault'] |
| 643 | expanded_project_groups = ['all'] + (self.groups or []) |
| 644 | |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 645 | matched = False |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 646 | for group in expanded_manifest_groups: |
| 647 | if group.startswith('-') and group[1:] in expanded_project_groups: |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 648 | matched = False |
Conley Owens | bb1b5f5 | 2012-08-13 13:11:18 -0700 | [diff] [blame] | 649 | elif group in expanded_project_groups: |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 650 | matched = True |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 651 | |
Conley Owens | 971de8e | 2012-04-16 10:36:08 -0700 | [diff] [blame] | 652 | return matched |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 653 | |
| 654 | ## Status Display ## |
| 655 | |
Anthony Newnam | cc50bac | 2010-04-08 10:28:59 -0500 | [diff] [blame] | 656 | def HasChanges(self): |
| 657 | """Returns true if there are uncommitted changes. |
| 658 | """ |
| 659 | self.work_git.update_index('-q', |
| 660 | '--unmerged', |
| 661 | '--ignore-missing', |
| 662 | '--refresh') |
| 663 | if self.IsRebaseInProgress(): |
| 664 | return True |
| 665 | |
| 666 | if self.work_git.DiffZ('diff-index', '--cached', HEAD): |
| 667 | return True |
| 668 | |
| 669 | if self.work_git.DiffZ('diff-files'): |
| 670 | return True |
| 671 | |
| 672 | if self.work_git.LsOthers(): |
| 673 | return True |
| 674 | |
| 675 | return False |
| 676 | |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 677 | def PrintWorkTreeStatus(self, output_redir=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 678 | """Prints the status of the repository to stdout. |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 679 | |
| 680 | Args: |
| 681 | output: If specified, redirect the output to this object. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 682 | """ |
| 683 | if not os.path.isdir(self.worktree): |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 684 | if output_redir == None: |
| 685 | output_redir = sys.stdout |
| 686 | print >>output_redir, '' |
| 687 | print >>output_redir, 'project %s/' % self.relpath |
| 688 | print >>output_redir, ' missing (run "repo sync")' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 689 | return |
| 690 | |
| 691 | self.work_git.update_index('-q', |
| 692 | '--unmerged', |
| 693 | '--ignore-missing', |
| 694 | '--refresh') |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 695 | rb = self.IsRebaseInProgress() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 696 | di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD) |
| 697 | df = self.work_git.DiffZ('diff-files') |
| 698 | do = self.work_git.LsOthers() |
Ali Utku Selen | 76abcc1 | 2012-01-25 10:51:12 +0100 | [diff] [blame] | 699 | 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] | 700 | return 'CLEAN' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 701 | |
| 702 | out = StatusColoring(self.config) |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 703 | if not output_redir == None: |
| 704 | out.redirect(output_redir) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 705 | out.project('project %-40s', self.relpath + '/') |
| 706 | |
| 707 | branch = self.CurrentBranch |
| 708 | if branch is None: |
| 709 | out.nobranch('(*** NO BRANCH ***)') |
| 710 | else: |
| 711 | out.branch('branch %s', branch) |
| 712 | out.nl() |
| 713 | |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 714 | if rb: |
| 715 | out.important('prior sync failed; rebase still in progress') |
| 716 | out.nl() |
| 717 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 718 | paths = list() |
| 719 | paths.extend(di.keys()) |
| 720 | paths.extend(df.keys()) |
| 721 | paths.extend(do) |
| 722 | |
| 723 | paths = list(set(paths)) |
| 724 | paths.sort() |
| 725 | |
| 726 | for p in paths: |
| 727 | try: i = di[p] |
| 728 | except KeyError: i = None |
| 729 | |
| 730 | try: f = df[p] |
| 731 | except KeyError: f = None |
Julius Gustavsson | 0cb1b3f | 2010-06-17 17:55:02 +0200 | [diff] [blame] | 732 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 733 | if i: i_status = i.status.upper() |
| 734 | else: i_status = '-' |
| 735 | |
| 736 | if f: f_status = f.status.lower() |
| 737 | else: f_status = '-' |
| 738 | |
| 739 | if i and i.src_path: |
Shawn O. Pearce | fe08675 | 2009-03-03 13:49:48 -0800 | [diff] [blame] | 740 | line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status, |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 741 | i.src_path, p, i.level) |
| 742 | else: |
| 743 | line = ' %s%s\t%s' % (i_status, f_status, p) |
| 744 | |
| 745 | if i and not f: |
| 746 | out.added('%s', line) |
| 747 | elif (i and f) or (not i and f): |
| 748 | out.changed('%s', line) |
| 749 | elif not i and not f: |
| 750 | out.untracked('%s', line) |
| 751 | else: |
| 752 | out.write('%s', line) |
| 753 | out.nl() |
Terence Haddock | 4655e81 | 2011-03-31 12:33:34 +0200 | [diff] [blame] | 754 | |
Shawn O. Pearce | 161f445 | 2009-04-10 17:41:44 -0700 | [diff] [blame] | 755 | return 'DIRTY' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 756 | |
pelya | d67872d | 2012-03-28 14:49:58 +0300 | [diff] [blame] | 757 | def PrintWorkTreeDiff(self, absolute_paths=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 758 | """Prints the status of the repository to stdout. |
| 759 | """ |
| 760 | out = DiffColoring(self.config) |
| 761 | cmd = ['diff'] |
| 762 | if out.is_on: |
| 763 | cmd.append('--color') |
| 764 | cmd.append(HEAD) |
pelya | d67872d | 2012-03-28 14:49:58 +0300 | [diff] [blame] | 765 | if absolute_paths: |
| 766 | cmd.append('--src-prefix=a/%s/' % self.relpath) |
| 767 | cmd.append('--dst-prefix=b/%s/' % self.relpath) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 768 | cmd.append('--') |
| 769 | p = GitCommand(self, |
| 770 | cmd, |
| 771 | capture_stdout = True, |
| 772 | capture_stderr = True) |
| 773 | has_diff = False |
| 774 | for line in p.process.stdout: |
| 775 | if not has_diff: |
| 776 | out.nl() |
| 777 | out.project('project %s/' % self.relpath) |
| 778 | out.nl() |
| 779 | has_diff = True |
| 780 | print line[:-1] |
| 781 | p.Wait() |
| 782 | |
| 783 | |
| 784 | ## Publish / Upload ## |
| 785 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 786 | def WasPublished(self, branch, all_refs=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 787 | """Was the branch published (uploaded) for code review? |
| 788 | If so, returns the SHA-1 hash of the last published |
| 789 | state for the branch. |
| 790 | """ |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 791 | key = R_PUB + branch |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 792 | if all_refs is None: |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 793 | try: |
| 794 | return self.bare_git.rev_parse(key) |
| 795 | except GitError: |
| 796 | return None |
| 797 | else: |
| 798 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 799 | return all_refs[key] |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 800 | except KeyError: |
| 801 | return None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 802 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 803 | def CleanPublishedCache(self, all_refs=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 804 | """Prunes any stale published refs. |
| 805 | """ |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 806 | if all_refs is None: |
| 807 | all_refs = self._allrefs |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 808 | heads = set() |
| 809 | canrm = {} |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 810 | for name, ref_id in all_refs.iteritems(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 811 | if name.startswith(R_HEADS): |
| 812 | heads.add(name) |
| 813 | elif name.startswith(R_PUB): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 814 | canrm[name] = ref_id |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 815 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 816 | for name, ref_id in canrm.iteritems(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 817 | n = name[len(R_PUB):] |
| 818 | if R_HEADS + n not in heads: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 819 | self.bare_git.DeleteRef(name, ref_id) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 820 | |
Mandeep Singh Baines | d6c93a2 | 2011-05-26 10:34:11 -0700 | [diff] [blame] | 821 | def GetUploadableBranches(self, selected_branch=None): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 822 | """List any branches which can be uploaded for review. |
| 823 | """ |
| 824 | heads = {} |
| 825 | pubed = {} |
| 826 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 827 | for name, ref_id in self._allrefs.iteritems(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 828 | if name.startswith(R_HEADS): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 829 | heads[name[len(R_HEADS):]] = ref_id |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 830 | elif name.startswith(R_PUB): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 831 | pubed[name[len(R_PUB):]] = ref_id |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 832 | |
| 833 | ready = [] |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 834 | for branch, ref_id in heads.iteritems(): |
| 835 | if branch in pubed and pubed[branch] == ref_id: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 836 | continue |
Mandeep Singh Baines | d6c93a2 | 2011-05-26 10:34:11 -0700 | [diff] [blame] | 837 | if selected_branch and branch != selected_branch: |
| 838 | continue |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 839 | |
Shawn O. Pearce | 35f2596 | 2008-11-11 17:03:13 -0800 | [diff] [blame] | 840 | rb = self.GetUploadableBranch(branch) |
| 841 | if rb: |
| 842 | ready.append(rb) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 843 | return ready |
| 844 | |
Shawn O. Pearce | 35f2596 | 2008-11-11 17:03:13 -0800 | [diff] [blame] | 845 | def GetUploadableBranch(self, branch_name): |
| 846 | """Get a single uploadable branch, or None. |
| 847 | """ |
| 848 | branch = self.GetBranch(branch_name) |
| 849 | base = branch.LocalMerge |
| 850 | if branch.LocalMerge: |
| 851 | rb = ReviewableBranch(self, branch, base) |
| 852 | if rb.commits: |
| 853 | return rb |
| 854 | return None |
| 855 | |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 856 | def UploadForReview(self, branch=None, |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 857 | people=([],[]), |
Brian Harring | 435370c | 2012-07-28 15:37:04 -0700 | [diff] [blame] | 858 | auto_topic=False, |
| 859 | draft=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 860 | """Uploads the named branch for code review. |
| 861 | """ |
| 862 | if branch is None: |
| 863 | branch = self.CurrentBranch |
| 864 | if branch is None: |
| 865 | raise GitError('not currently on a branch') |
| 866 | |
| 867 | branch = self.GetBranch(branch) |
| 868 | if not branch.LocalMerge: |
| 869 | raise GitError('branch %s does not track a remote' % branch.name) |
| 870 | if not branch.remote.review: |
| 871 | raise GitError('remote %s has no review url' % branch.remote.name) |
| 872 | |
| 873 | dest_branch = branch.merge |
| 874 | if not dest_branch.startswith(R_HEADS): |
| 875 | dest_branch = R_HEADS + dest_branch |
| 876 | |
Shawn O. Pearce | 339ba9f | 2008-11-06 09:52:51 -0800 | [diff] [blame] | 877 | if not branch.remote.projectname: |
| 878 | branch.remote.projectname = self.name |
| 879 | branch.remote.Save() |
| 880 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 881 | url = branch.remote.ReviewUrl(self.UserEmail) |
| 882 | if url is None: |
| 883 | raise UploadError('review not configured') |
| 884 | cmd = ['push'] |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 885 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 886 | if url.startswith('ssh://'): |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 887 | rp = ['gerrit receive-pack'] |
| 888 | for e in people[0]: |
| 889 | rp.append('--reviewer=%s' % sq(e)) |
| 890 | for e in people[1]: |
| 891 | rp.append('--cc=%s' % sq(e)) |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 892 | cmd.append('--receive-pack=%s' % " ".join(rp)) |
Shawn O. Pearce | a5ece0e | 2010-07-15 16:52:42 -0700 | [diff] [blame] | 893 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 894 | cmd.append(url) |
Shawn O. Pearce | b54a392 | 2009-01-05 16:18:58 -0800 | [diff] [blame] | 895 | |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 896 | if dest_branch.startswith(R_HEADS): |
| 897 | dest_branch = dest_branch[len(R_HEADS):] |
Brian Harring | 435370c | 2012-07-28 15:37:04 -0700 | [diff] [blame] | 898 | |
| 899 | upload_type = 'for' |
| 900 | if draft: |
| 901 | upload_type = 'drafts' |
| 902 | |
| 903 | ref_spec = '%s:refs/%s/%s' % (R_HEADS + branch.name, upload_type, |
| 904 | dest_branch) |
Shawn O. Pearce | c957142 | 2012-01-11 14:58:54 -0800 | [diff] [blame] | 905 | if auto_topic: |
| 906 | ref_spec = ref_spec + '/' + branch.name |
| 907 | cmd.append(ref_spec) |
| 908 | |
| 909 | if GitCommand(self, cmd, bare = True).Wait() != 0: |
| 910 | raise UploadError('Upload failed') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 911 | |
| 912 | msg = "posted to %s for %s" % (branch.remote.review, dest_branch) |
| 913 | self.bare_git.UpdateRef(R_PUB + branch.name, |
| 914 | R_HEADS + branch.name, |
| 915 | message = msg) |
| 916 | |
| 917 | |
| 918 | ## Sync ## |
| 919 | |
Shawn O. Pearce | e02ac0a | 2012-03-14 15:36:59 -0700 | [diff] [blame] | 920 | def Sync_NetworkHalf(self, |
| 921 | quiet=False, |
| 922 | is_new=None, |
| 923 | current_branch_only=False, |
| 924 | clone_bundle=True): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 925 | """Perform only the network IO portion of the sync process. |
| 926 | Local working directory/branch state is not affected. |
| 927 | """ |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 928 | if is_new is None: |
| 929 | is_new = not self.Exists |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 930 | if is_new: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 931 | self._InitGitDir() |
| 932 | self._InitRemote() |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 933 | |
| 934 | if is_new: |
| 935 | alt = os.path.join(self.gitdir, 'objects/info/alternates') |
| 936 | try: |
| 937 | fd = open(alt, 'rb') |
| 938 | try: |
| 939 | alt_dir = fd.readline().rstrip() |
| 940 | finally: |
| 941 | fd.close() |
| 942 | except IOError: |
| 943 | alt_dir = None |
| 944 | else: |
| 945 | alt_dir = None |
| 946 | |
Shawn O. Pearce | e02ac0a | 2012-03-14 15:36:59 -0700 | [diff] [blame] | 947 | if clone_bundle \ |
| 948 | and alt_dir is None \ |
| 949 | and self._ApplyCloneBundle(initial=is_new, quiet=quiet): |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 950 | is_new = False |
| 951 | |
Shawn O. Pearce | 6ba6ba0 | 2012-05-24 09:46:50 -0700 | [diff] [blame] | 952 | if not current_branch_only: |
| 953 | if self.sync_c: |
| 954 | current_branch_only = True |
| 955 | elif not self.manifest._loaded: |
| 956 | # Manifest cannot check defaults until it syncs. |
| 957 | current_branch_only = False |
| 958 | elif self.manifest.default.sync_c: |
| 959 | current_branch_only = True |
| 960 | |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 961 | if not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir, |
| 962 | current_branch_only=current_branch_only): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 963 | return False |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 964 | |
| 965 | if self.worktree: |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 966 | self._InitMRef() |
| 967 | else: |
| 968 | self._InitMirrorHead() |
| 969 | try: |
| 970 | os.remove(os.path.join(self.gitdir, 'FETCH_HEAD')) |
| 971 | except OSError: |
| 972 | pass |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 973 | return True |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 974 | |
| 975 | def PostRepoUpgrade(self): |
| 976 | self._InitHooks() |
| 977 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 978 | def _CopyFiles(self): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 979 | for copyfile in self.copyfiles: |
| 980 | copyfile._Copy() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 981 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 982 | def GetRevisionId(self, all_refs=None): |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 983 | if self.revisionId: |
| 984 | return self.revisionId |
| 985 | |
| 986 | rem = self.GetRemote(self.remote.name) |
| 987 | rev = rem.ToLocal(self.revisionExpr) |
| 988 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 989 | if all_refs is not None and rev in all_refs: |
| 990 | return all_refs[rev] |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 991 | |
| 992 | try: |
| 993 | return self.bare_git.rev_parse('--verify', '%s^0' % rev) |
| 994 | except GitError: |
| 995 | raise ManifestInvalidRevisionError( |
| 996 | 'revision %s in %s not found' % (self.revisionExpr, |
| 997 | self.name)) |
| 998 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 999 | def Sync_LocalHalf(self, syncbuf): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1000 | """Perform only the local IO portion of the sync process. |
| 1001 | Network access is not required. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1002 | """ |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1003 | all_refs = self.bare_ref.all |
| 1004 | self.CleanPublishedCache(all_refs) |
| 1005 | revid = self.GetRevisionId(all_refs) |
Skyler Kaufman | 835cd68 | 2011-03-08 12:14:41 -0800 | [diff] [blame] | 1006 | |
| 1007 | self._InitWorkTree() |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1008 | head = self.work_git.GetHead() |
| 1009 | if head.startswith(R_HEADS): |
| 1010 | branch = head[len(R_HEADS):] |
| 1011 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1012 | head = all_refs[head] |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1013 | except KeyError: |
| 1014 | head = None |
| 1015 | else: |
| 1016 | branch = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1017 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1018 | if branch is None or syncbuf.detach_head: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1019 | # Currently on a detached HEAD. The user is assumed to |
| 1020 | # not have any local modifications worth worrying about. |
| 1021 | # |
Shawn O. Pearce | 3d2cdd0 | 2009-04-18 15:26:10 -0700 | [diff] [blame] | 1022 | if self.IsRebaseInProgress(): |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1023 | syncbuf.fail(self, _PriorSyncFailedError()) |
| 1024 | return |
| 1025 | |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1026 | if head == revid: |
| 1027 | # No changes; don't do anything further. |
Florian Vallee | 7cf1b36 | 2012-06-07 17:11:42 +0200 | [diff] [blame] | 1028 | # Except if the head needs to be detached |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1029 | # |
Florian Vallee | 7cf1b36 | 2012-06-07 17:11:42 +0200 | [diff] [blame] | 1030 | if not syncbuf.detach_head: |
| 1031 | return |
| 1032 | else: |
| 1033 | lost = self._revlist(not_rev(revid), HEAD) |
| 1034 | if lost: |
| 1035 | syncbuf.info(self, "discarding %d commits", len(lost)) |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1036 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1037 | try: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1038 | self._Checkout(revid, quiet=True) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1039 | except GitError, e: |
| 1040 | syncbuf.fail(self, e) |
| 1041 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1042 | self._CopyFiles() |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1043 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1044 | |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1045 | if head == revid: |
| 1046 | # No changes; don't do anything further. |
| 1047 | # |
| 1048 | return |
| 1049 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1050 | branch = self.GetBranch(branch) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1051 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1052 | if not branch.LocalMerge: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1053 | # The current branch has no tracking configuration. |
Anatol Pomazau | 2a32f6a | 2011-08-30 10:52:33 -0700 | [diff] [blame] | 1054 | # Jump off it to a detached HEAD. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1055 | # |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1056 | syncbuf.info(self, |
| 1057 | "leaving %s; does not track upstream", |
| 1058 | branch.name) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1059 | try: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1060 | self._Checkout(revid, quiet=True) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1061 | except GitError, e: |
| 1062 | syncbuf.fail(self, e) |
| 1063 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1064 | self._CopyFiles() |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1065 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1066 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1067 | upstream_gain = self._revlist(not_rev(HEAD), revid) |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1068 | pub = self.WasPublished(branch.name, all_refs) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1069 | if pub: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1070 | not_merged = self._revlist(not_rev(revid), pub) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1071 | if not_merged: |
| 1072 | if upstream_gain: |
| 1073 | # The user has published this branch and some of those |
| 1074 | # commits are not yet merged upstream. We do not want |
| 1075 | # to rewrite the published commits so we punt. |
| 1076 | # |
Daniel Sandler | 4c50dee | 2010-03-02 15:38:03 -0500 | [diff] [blame] | 1077 | syncbuf.fail(self, |
| 1078 | "branch %s is published (but not merged) and is now %d commits behind" |
| 1079 | % (branch.name, len(upstream_gain))) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1080 | return |
Shawn O. Pearce | 05f66b6 | 2009-04-21 08:26:32 -0700 | [diff] [blame] | 1081 | elif pub == head: |
| 1082 | # All published commits are merged, and thus we are a |
| 1083 | # strict subset. We can fast-forward safely. |
Shawn O. Pearce | a54c527 | 2008-10-30 11:03:00 -0700 | [diff] [blame] | 1084 | # |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1085 | def _doff(): |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1086 | self._FastForward(revid) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1087 | self._CopyFiles() |
| 1088 | syncbuf.later1(self, _doff) |
| 1089 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1090 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1091 | # Examine the local commits not in the remote. Find the |
| 1092 | # last one attributed to this user, if any. |
| 1093 | # |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1094 | local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce') |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1095 | last_mine = None |
| 1096 | cnt_mine = 0 |
| 1097 | for commit in local_changes: |
Shawn O. Pearce | aa4982e | 2009-12-30 18:38:27 -0800 | [diff] [blame] | 1098 | commit_id, committer_email = commit.split(' ', 1) |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1099 | if committer_email == self.UserEmail: |
| 1100 | last_mine = commit_id |
| 1101 | cnt_mine += 1 |
| 1102 | |
Shawn O. Pearce | da88ff4 | 2009-06-03 11:09:12 -0700 | [diff] [blame] | 1103 | if not upstream_gain and cnt_mine == len(local_changes): |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1104 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1105 | |
| 1106 | if self.IsDirty(consider_untracked=False): |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1107 | syncbuf.fail(self, _DirtyError()) |
| 1108 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1109 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1110 | # If the upstream switched on us, warn the user. |
| 1111 | # |
| 1112 | if branch.merge != self.revisionExpr: |
| 1113 | if branch.merge and self.revisionExpr: |
| 1114 | syncbuf.info(self, |
| 1115 | 'manifest switched %s...%s', |
| 1116 | branch.merge, |
| 1117 | self.revisionExpr) |
| 1118 | elif branch.merge: |
| 1119 | syncbuf.info(self, |
| 1120 | 'manifest no longer tracks %s', |
| 1121 | branch.merge) |
| 1122 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1123 | if cnt_mine < len(local_changes): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1124 | # Upstream rebased. Not everything in HEAD |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1125 | # was created by this user. |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1126 | # |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1127 | syncbuf.info(self, |
| 1128 | "discarding %d commits removed from upstream", |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1129 | len(local_changes) - cnt_mine) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1130 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1131 | branch.remote = self.GetRemote(self.remote.name) |
Anatol Pomazau | cd7c5de | 2012-03-20 13:45:00 -0700 | [diff] [blame] | 1132 | if not ID_RE.match(self.revisionExpr): |
| 1133 | # in case of manifest sync the revisionExpr might be a SHA1 |
| 1134 | branch.merge = self.revisionExpr |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1135 | branch.Save() |
| 1136 | |
Mike Pontillo | d315382 | 2012-02-28 11:53:24 -0800 | [diff] [blame] | 1137 | if cnt_mine > 0 and self.rebase: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1138 | def _dorebase(): |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1139 | self._Rebase(upstream = '%s^1' % last_mine, onto = revid) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1140 | self._CopyFiles() |
| 1141 | syncbuf.later2(self, _dorebase) |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1142 | elif local_changes: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1143 | try: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1144 | self._ResetHard(revid) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1145 | self._CopyFiles() |
| 1146 | except GitError, e: |
| 1147 | syncbuf.fail(self, e) |
| 1148 | return |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1149 | else: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1150 | def _doff(): |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1151 | self._FastForward(revid) |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1152 | self._CopyFiles() |
| 1153 | syncbuf.later1(self, _doff) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1154 | |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 1155 | def AddCopyFile(self, src, dest, absdest): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1156 | # dest should already be an absolute path, but src is project relative |
| 1157 | # make src an absolute path |
Shawn O. Pearce | c7a4eef | 2009-03-05 10:32:38 -0800 | [diff] [blame] | 1158 | abssrc = os.path.join(self.worktree, src) |
| 1159 | self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest)) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1160 | |
James W. Mills | 24c1308 | 2012-04-12 15:04:13 -0500 | [diff] [blame] | 1161 | def AddAnnotation(self, name, value, keep): |
| 1162 | self.annotations.append(_Annotation(name, value, keep)) |
| 1163 | |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 1164 | def DownloadPatchSet(self, change_id, patch_id): |
| 1165 | """Download a single patch set of a single change to FETCH_HEAD. |
| 1166 | """ |
| 1167 | remote = self.GetRemote(self.remote.name) |
| 1168 | |
| 1169 | cmd = ['fetch', remote.name] |
| 1170 | cmd.append('refs/changes/%2.2d/%d/%d' \ |
| 1171 | % (change_id % 100, change_id, patch_id)) |
| 1172 | cmd.extend(map(lambda x: str(x), remote.fetch)) |
| 1173 | if GitCommand(self, cmd, bare=True).Wait() != 0: |
| 1174 | return None |
| 1175 | return DownloadedChange(self, |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1176 | self.GetRevisionId(), |
Shawn O. Pearce | 632768b | 2008-10-23 11:58:52 -0700 | [diff] [blame] | 1177 | change_id, |
| 1178 | patch_id, |
| 1179 | self.bare_git.rev_parse('FETCH_HEAD')) |
| 1180 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1181 | |
| 1182 | ## Branch Management ## |
| 1183 | |
| 1184 | def StartBranch(self, name): |
| 1185 | """Create a new branch off the manifest's revision. |
| 1186 | """ |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1187 | head = self.work_git.GetHead() |
| 1188 | if head == (R_HEADS + name): |
| 1189 | return True |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1190 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1191 | all_refs = self.bare_ref.all |
| 1192 | if (R_HEADS + name) in all_refs: |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1193 | return GitCommand(self, |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1194 | ['checkout', name, '--'], |
Shawn O. Pearce | 0f0dfa3 | 2009-04-18 14:53:39 -0700 | [diff] [blame] | 1195 | capture_stdout = True, |
| 1196 | capture_stderr = True).Wait() == 0 |
Shawn O. Pearce | 0a389e9 | 2009-04-10 16:21:18 -0700 | [diff] [blame] | 1197 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1198 | branch = self.GetBranch(name) |
| 1199 | branch.remote = self.GetRemote(self.remote.name) |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1200 | branch.merge = self.revisionExpr |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1201 | revid = self.GetRevisionId(all_refs) |
Shawn O. Pearce | 0a389e9 | 2009-04-10 16:21:18 -0700 | [diff] [blame] | 1202 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1203 | if head.startswith(R_HEADS): |
| 1204 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1205 | head = all_refs[head] |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1206 | except KeyError: |
| 1207 | head = None |
| 1208 | |
| 1209 | if revid and head and revid == head: |
| 1210 | ref = os.path.join(self.gitdir, R_HEADS + name) |
| 1211 | try: |
| 1212 | os.makedirs(os.path.dirname(ref)) |
| 1213 | except OSError: |
| 1214 | pass |
| 1215 | _lwrite(ref, '%s\n' % revid) |
| 1216 | _lwrite(os.path.join(self.worktree, '.git', HEAD), |
| 1217 | 'ref: %s%s\n' % (R_HEADS, name)) |
| 1218 | branch.Save() |
| 1219 | return True |
| 1220 | |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1221 | if GitCommand(self, |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1222 | ['checkout', '-b', branch.name, revid], |
Shawn O. Pearce | 0f0dfa3 | 2009-04-18 14:53:39 -0700 | [diff] [blame] | 1223 | capture_stdout = True, |
| 1224 | capture_stderr = True).Wait() == 0: |
Shawn O. Pearce | accc56d | 2009-04-18 14:45:51 -0700 | [diff] [blame] | 1225 | branch.Save() |
| 1226 | return True |
| 1227 | return False |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1228 | |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1229 | def CheckoutBranch(self, name): |
| 1230 | """Checkout a local topic branch. |
Doug Anderson | 3ba5f95 | 2011-04-07 12:51:04 -0700 | [diff] [blame] | 1231 | |
| 1232 | Args: |
| 1233 | name: The name of the branch to checkout. |
| 1234 | |
| 1235 | Returns: |
| 1236 | True if the checkout succeeded; False if it didn't; None if the branch |
| 1237 | didn't exist. |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1238 | """ |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1239 | rev = R_HEADS + name |
| 1240 | head = self.work_git.GetHead() |
| 1241 | if head == rev: |
| 1242 | # Already on the branch |
| 1243 | # |
| 1244 | return True |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1245 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1246 | all_refs = self.bare_ref.all |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1247 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1248 | revid = all_refs[rev] |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1249 | except KeyError: |
| 1250 | # Branch does not exist in this project |
| 1251 | # |
Doug Anderson | 3ba5f95 | 2011-04-07 12:51:04 -0700 | [diff] [blame] | 1252 | return None |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1253 | |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1254 | if head.startswith(R_HEADS): |
| 1255 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1256 | head = all_refs[head] |
Shawn O. Pearce | 89e717d | 2009-04-18 15:04:41 -0700 | [diff] [blame] | 1257 | except KeyError: |
| 1258 | head = None |
| 1259 | |
| 1260 | if head == revid: |
| 1261 | # Same revision; just update HEAD to point to the new |
| 1262 | # target branch, but otherwise take no other action. |
| 1263 | # |
| 1264 | _lwrite(os.path.join(self.worktree, '.git', HEAD), |
| 1265 | 'ref: %s%s\n' % (R_HEADS, name)) |
| 1266 | return True |
| 1267 | |
| 1268 | return GitCommand(self, |
| 1269 | ['checkout', name, '--'], |
| 1270 | capture_stdout = True, |
| 1271 | capture_stderr = True).Wait() == 0 |
Wink Saville | 02d7945 | 2009-04-10 13:01:24 -0700 | [diff] [blame] | 1272 | |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1273 | def AbandonBranch(self, name): |
| 1274 | """Destroy a local topic branch. |
Doug Anderson | dafb1d6 | 2011-04-07 11:46:59 -0700 | [diff] [blame] | 1275 | |
| 1276 | Args: |
| 1277 | name: The name of the branch to abandon. |
| 1278 | |
| 1279 | Returns: |
| 1280 | True if the abandon succeeded; False if it didn't; None if the branch |
| 1281 | didn't exist. |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1282 | """ |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1283 | rev = R_HEADS + name |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1284 | all_refs = self.bare_ref.all |
| 1285 | if rev not in all_refs: |
Doug Anderson | dafb1d6 | 2011-04-07 11:46:59 -0700 | [diff] [blame] | 1286 | # Doesn't exist |
| 1287 | return None |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1288 | |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1289 | head = self.work_git.GetHead() |
| 1290 | if head == rev: |
| 1291 | # We can't destroy the branch while we are sitting |
| 1292 | # on it. Switch to a detached HEAD. |
| 1293 | # |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1294 | head = all_refs[head] |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1295 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1296 | revid = self.GetRevisionId(all_refs) |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1297 | if head == revid: |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1298 | _lwrite(os.path.join(self.worktree, '.git', HEAD), |
| 1299 | '%s\n' % revid) |
| 1300 | else: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1301 | self._Checkout(revid, quiet=True) |
Shawn O. Pearce | 552ac89 | 2009-04-18 15:15:24 -0700 | [diff] [blame] | 1302 | |
| 1303 | return GitCommand(self, |
| 1304 | ['branch', '-D', name], |
| 1305 | capture_stdout = True, |
| 1306 | capture_stderr = True).Wait() == 0 |
Shawn O. Pearce | 9fa44db | 2008-11-03 11:24:59 -0800 | [diff] [blame] | 1307 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1308 | def PruneHeads(self): |
| 1309 | """Prune any topic branches already merged into upstream. |
| 1310 | """ |
| 1311 | cb = self.CurrentBranch |
| 1312 | kill = [] |
Shawn O. Pearce | 3778f9d | 2009-03-02 12:30:50 -0800 | [diff] [blame] | 1313 | left = self._allrefs |
| 1314 | for name in left.keys(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1315 | if name.startswith(R_HEADS): |
| 1316 | name = name[len(R_HEADS):] |
| 1317 | if cb is None or name != cb: |
| 1318 | kill.append(name) |
| 1319 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1320 | rev = self.GetRevisionId(left) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1321 | if cb is not None \ |
| 1322 | and not self._revlist(HEAD + '...' + rev) \ |
| 1323 | and not self.IsDirty(consider_untracked = False): |
| 1324 | self.work_git.DetachHead(HEAD) |
| 1325 | kill.append(cb) |
| 1326 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1327 | if kill: |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 1328 | old = self.bare_git.GetHead() |
| 1329 | if old is None: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1330 | old = 'refs/heads/please_never_use_this_as_a_branch_name' |
| 1331 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1332 | try: |
| 1333 | self.bare_git.DetachHead(rev) |
| 1334 | |
| 1335 | b = ['branch', '-d'] |
| 1336 | b.extend(kill) |
| 1337 | b = GitCommand(self, b, bare=True, |
| 1338 | capture_stdout=True, |
| 1339 | capture_stderr=True) |
| 1340 | b.Wait() |
| 1341 | finally: |
| 1342 | self.bare_git.SetHead(old) |
Shawn O. Pearce | 3778f9d | 2009-03-02 12:30:50 -0800 | [diff] [blame] | 1343 | left = self._allrefs |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1344 | |
Shawn O. Pearce | 3778f9d | 2009-03-02 12:30:50 -0800 | [diff] [blame] | 1345 | for branch in kill: |
| 1346 | if (R_HEADS + branch) not in left: |
| 1347 | self.CleanPublishedCache() |
| 1348 | break |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1349 | |
| 1350 | if cb and cb not in kill: |
| 1351 | kill.append(cb) |
Shawn O. Pearce | 7c6c64d | 2009-03-02 12:38:13 -0800 | [diff] [blame] | 1352 | kill.sort() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1353 | |
| 1354 | kept = [] |
| 1355 | for branch in kill: |
Shawn O. Pearce | 3778f9d | 2009-03-02 12:30:50 -0800 | [diff] [blame] | 1356 | if (R_HEADS + branch) in left: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1357 | branch = self.GetBranch(branch) |
| 1358 | base = branch.LocalMerge |
| 1359 | if not base: |
| 1360 | base = rev |
| 1361 | kept.append(ReviewableBranch(self, branch, base)) |
| 1362 | return kept |
| 1363 | |
| 1364 | |
| 1365 | ## Direct Git Commands ## |
| 1366 | |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1367 | def _RemoteFetch(self, name=None, |
| 1368 | current_branch_only=False, |
Shawn O. Pearce | 16614f8 | 2010-10-29 12:05:43 -0700 | [diff] [blame] | 1369 | initial=False, |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1370 | quiet=False, |
| 1371 | alt_dir=None): |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1372 | |
| 1373 | is_sha1 = False |
| 1374 | tag_name = None |
| 1375 | |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1376 | def CheckForSha1(): |
| 1377 | try: |
| 1378 | # if revision (sha or tag) is not present then following function |
| 1379 | # throws an error. |
| 1380 | self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr) |
| 1381 | return True |
| 1382 | except GitError: |
| 1383 | # There is no such persistent revision. We have to fetch it. |
| 1384 | return False |
| 1385 | |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1386 | if current_branch_only: |
| 1387 | if ID_RE.match(self.revisionExpr) is not None: |
| 1388 | is_sha1 = True |
| 1389 | elif self.revisionExpr.startswith(R_TAGS): |
| 1390 | # this is a tag and its sha1 value should never change |
| 1391 | tag_name = self.revisionExpr[len(R_TAGS):] |
| 1392 | |
| 1393 | if is_sha1 or tag_name is not None: |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1394 | if CheckForSha1(): |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1395 | return True |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1396 | if is_sha1 and (not self.upstream or ID_RE.match(self.upstream)): |
| 1397 | current_branch_only = False |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1398 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1399 | if not name: |
| 1400 | name = self.remote.name |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 1401 | |
| 1402 | ssh_proxy = False |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1403 | remote = self.GetRemote(name) |
| 1404 | if remote.PreConnectFetch(): |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 1405 | ssh_proxy = True |
| 1406 | |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1407 | if initial: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1408 | if alt_dir and 'objects' == os.path.basename(alt_dir): |
| 1409 | ref_dir = os.path.dirname(alt_dir) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1410 | packed_refs = os.path.join(self.gitdir, 'packed-refs') |
| 1411 | remote = self.GetRemote(name) |
| 1412 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1413 | all_refs = self.bare_ref.all |
| 1414 | ids = set(all_refs.values()) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1415 | tmp = set() |
| 1416 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1417 | for r, ref_id in GitRefs(ref_dir).all.iteritems(): |
| 1418 | if r not in all_refs: |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1419 | if r.startswith(R_TAGS) or remote.WritesTo(r): |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1420 | all_refs[r] = ref_id |
| 1421 | ids.add(ref_id) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1422 | continue |
| 1423 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1424 | if ref_id in ids: |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1425 | continue |
| 1426 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1427 | r = 'refs/_alt/%s' % ref_id |
| 1428 | all_refs[r] = ref_id |
| 1429 | ids.add(ref_id) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1430 | tmp.add(r) |
| 1431 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1432 | ref_names = list(all_refs.keys()) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1433 | ref_names.sort() |
| 1434 | |
| 1435 | tmp_packed = '' |
| 1436 | old_packed = '' |
| 1437 | |
| 1438 | for r in ref_names: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1439 | line = '%s %s\n' % (all_refs[r], r) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1440 | tmp_packed += line |
| 1441 | if r not in tmp: |
| 1442 | old_packed += line |
| 1443 | |
| 1444 | _lwrite(packed_refs, tmp_packed) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1445 | else: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1446 | alt_dir = None |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1447 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 1448 | cmd = ['fetch'] |
Doug Anderson | 30d4529 | 2011-05-04 15:01:04 -0700 | [diff] [blame] | 1449 | |
| 1450 | # The --depth option only affects the initial fetch; after that we'll do |
| 1451 | # full fetches of changes. |
| 1452 | depth = self.manifest.manifestProject.config.GetString('repo.depth') |
| 1453 | if depth and initial: |
| 1454 | cmd.append('--depth=%s' % depth) |
| 1455 | |
Shawn O. Pearce | 16614f8 | 2010-10-29 12:05:43 -0700 | [diff] [blame] | 1456 | if quiet: |
| 1457 | cmd.append('--quiet') |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 1458 | if not self.worktree: |
| 1459 | cmd.append('--update-head-ok') |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1460 | cmd.append(name) |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1461 | |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1462 | if not current_branch_only: |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1463 | # Fetch whole repo |
| 1464 | cmd.append('--tags') |
| 1465 | cmd.append((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*')) |
| 1466 | elif tag_name is not None: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1467 | cmd.append('tag') |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1468 | cmd.append(tag_name) |
| 1469 | else: |
| 1470 | branch = self.revisionExpr |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1471 | if is_sha1: |
| 1472 | branch = self.upstream |
Anatol Pomazau | 53d6f4d | 2011-08-25 17:21:47 -0700 | [diff] [blame] | 1473 | if branch.startswith(R_HEADS): |
| 1474 | branch = branch[len(R_HEADS):] |
| 1475 | cmd.append((u'+refs/heads/%s:' % branch) + remote.ToLocal('refs/heads/%s' % branch)) |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1476 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1477 | ok = False |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 1478 | for _i in range(2): |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1479 | ret = GitCommand(self, cmd, bare=True, ssh_proxy=ssh_proxy).Wait() |
| 1480 | if ret == 0: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1481 | ok = True |
| 1482 | break |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1483 | elif current_branch_only and is_sha1 and ret == 128: |
| 1484 | # Exit code 128 means "couldn't find the ref you asked for"; if we're in sha1 |
| 1485 | # mode, we just tried sync'ing from the upstream field; it doesn't exist, thus |
| 1486 | # abort the optimization attempt and do a full sync. |
| 1487 | break |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1488 | time.sleep(random.randint(30, 45)) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1489 | |
| 1490 | if initial: |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1491 | if alt_dir: |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1492 | if old_packed != '': |
| 1493 | _lwrite(packed_refs, old_packed) |
| 1494 | else: |
| 1495 | os.remove(packed_refs) |
| 1496 | self.bare_git.pack_refs('--all', '--prune') |
Brian Harring | 14a6674 | 2012-09-28 20:21:57 -0700 | [diff] [blame] | 1497 | |
| 1498 | if is_sha1 and current_branch_only and self.upstream: |
| 1499 | # We just synced the upstream given branch; verify we |
| 1500 | # got what we wanted, else trigger a second run of all |
| 1501 | # refs. |
| 1502 | if not CheckForSha1(): |
| 1503 | return self._RemoteFetch(name=name, current_branch_only=False, |
| 1504 | initial=False, quiet=quiet, alt_dir=alt_dir) |
| 1505 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1506 | return ok |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1507 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1508 | def _ApplyCloneBundle(self, initial=False, quiet=False): |
| 1509 | if initial and self.manifest.manifestProject.config.GetString('repo.depth'): |
| 1510 | return False |
| 1511 | |
| 1512 | remote = self.GetRemote(self.remote.name) |
| 1513 | bundle_url = remote.url + '/clone.bundle' |
| 1514 | bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url) |
Shawn O. Pearce | 898e12a | 2012-03-14 15:22:28 -0700 | [diff] [blame] | 1515 | if GetSchemeFromUrl(bundle_url) in ('persistent-http', 'persistent-https'): |
| 1516 | bundle_url = bundle_url[len('persistent-'):] |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1517 | if GetSchemeFromUrl(bundle_url) not in ('http', 'https'): |
| 1518 | return False |
| 1519 | |
| 1520 | bundle_dst = os.path.join(self.gitdir, 'clone.bundle') |
| 1521 | bundle_tmp = os.path.join(self.gitdir, 'clone.bundle.tmp') |
| 1522 | |
| 1523 | exist_dst = os.path.exists(bundle_dst) |
| 1524 | exist_tmp = os.path.exists(bundle_tmp) |
| 1525 | |
| 1526 | if not initial and not exist_dst and not exist_tmp: |
| 1527 | return False |
| 1528 | |
| 1529 | if not exist_dst: |
| 1530 | exist_dst = self._FetchBundle(bundle_url, bundle_tmp, bundle_dst, quiet) |
| 1531 | if not exist_dst: |
| 1532 | return False |
| 1533 | |
| 1534 | cmd = ['fetch'] |
| 1535 | if quiet: |
| 1536 | cmd.append('--quiet') |
| 1537 | if not self.worktree: |
| 1538 | cmd.append('--update-head-ok') |
| 1539 | cmd.append(bundle_dst) |
| 1540 | for f in remote.fetch: |
| 1541 | cmd.append(str(f)) |
| 1542 | cmd.append('refs/tags/*:refs/tags/*') |
| 1543 | |
| 1544 | ok = GitCommand(self, cmd, bare=True).Wait() == 0 |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1545 | if os.path.exists(bundle_dst): |
| 1546 | os.remove(bundle_dst) |
| 1547 | if os.path.exists(bundle_tmp): |
| 1548 | os.remove(bundle_tmp) |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1549 | return ok |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1550 | |
Shawn O. Pearce | c325dc3 | 2011-10-03 08:30:24 -0700 | [diff] [blame] | 1551 | def _FetchBundle(self, srcUrl, tmpPath, dstPath, quiet): |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 1552 | if os.path.exists(dstPath): |
| 1553 | os.remove(dstPath) |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1554 | |
Matt Gumbel | 2dc810c | 2012-08-30 09:39:36 -0700 | [diff] [blame] | 1555 | cmd = ['curl', '--fail', '--output', tmpPath, '--netrc', '--location'] |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 1556 | if quiet: |
| 1557 | cmd += ['--silent'] |
| 1558 | if os.path.exists(tmpPath): |
| 1559 | size = os.stat(tmpPath).st_size |
| 1560 | if size >= 1024: |
| 1561 | cmd += ['--continue-at', '%d' % (size,)] |
| 1562 | else: |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1563 | os.remove(tmpPath) |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 1564 | if 'http_proxy' in os.environ and 'darwin' == sys.platform: |
| 1565 | cmd += ['--proxy', os.environ['http_proxy']] |
| 1566 | cmd += [srcUrl] |
| 1567 | |
| 1568 | if IsTrace(): |
| 1569 | Trace('%s', ' '.join(cmd)) |
| 1570 | try: |
| 1571 | proc = subprocess.Popen(cmd) |
| 1572 | except OSError: |
| 1573 | return False |
| 1574 | |
Matt Gumbel | 2dc810c | 2012-08-30 09:39:36 -0700 | [diff] [blame] | 1575 | curlret = proc.wait() |
| 1576 | |
| 1577 | if curlret == 22: |
| 1578 | # From curl man page: |
| 1579 | # 22: HTTP page not retrieved. The requested url was not found or |
| 1580 | # returned another error with the HTTP error code being 400 or above. |
| 1581 | # This return code only appears if -f, --fail is used. |
| 1582 | if not quiet: |
| 1583 | print >> sys.stderr, "Server does not provide clone.bundle; ignoring." |
| 1584 | return False |
| 1585 | |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 1586 | if os.path.exists(tmpPath): |
Matt Gumbel | 2dc810c | 2012-08-30 09:39:36 -0700 | [diff] [blame] | 1587 | if curlret == 0 and os.stat(tmpPath).st_size > 16: |
Shawn O. Pearce | 5e7127d | 2012-08-02 14:57:37 -0700 | [diff] [blame] | 1588 | os.rename(tmpPath, dstPath) |
| 1589 | return True |
| 1590 | else: |
| 1591 | os.remove(tmpPath) |
| 1592 | return False |
| 1593 | else: |
| 1594 | return False |
Shawn O. Pearce | f322b9a | 2011-09-19 14:50:58 -0700 | [diff] [blame] | 1595 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1596 | def _Checkout(self, rev, quiet=False): |
| 1597 | cmd = ['checkout'] |
| 1598 | if quiet: |
| 1599 | cmd.append('-q') |
| 1600 | cmd.append(rev) |
| 1601 | cmd.append('--') |
| 1602 | if GitCommand(self, cmd).Wait() != 0: |
| 1603 | if self._allrefs: |
| 1604 | raise GitError('%s checkout %s ' % (self.name, rev)) |
| 1605 | |
Pierre Tardy | e5a2122 | 2011-03-24 16:28:18 +0100 | [diff] [blame] | 1606 | def _CherryPick(self, rev, quiet=False): |
| 1607 | cmd = ['cherry-pick'] |
| 1608 | cmd.append(rev) |
| 1609 | cmd.append('--') |
| 1610 | if GitCommand(self, cmd).Wait() != 0: |
| 1611 | if self._allrefs: |
| 1612 | raise GitError('%s cherry-pick %s ' % (self.name, rev)) |
| 1613 | |
Erwan Mahe | a94f162 | 2011-08-19 13:56:09 +0200 | [diff] [blame] | 1614 | def _Revert(self, rev, quiet=False): |
| 1615 | cmd = ['revert'] |
| 1616 | cmd.append('--no-edit') |
| 1617 | cmd.append(rev) |
| 1618 | cmd.append('--') |
| 1619 | if GitCommand(self, cmd).Wait() != 0: |
| 1620 | if self._allrefs: |
| 1621 | raise GitError('%s revert %s ' % (self.name, rev)) |
| 1622 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1623 | def _ResetHard(self, rev, quiet=True): |
| 1624 | cmd = ['reset', '--hard'] |
| 1625 | if quiet: |
| 1626 | cmd.append('-q') |
| 1627 | cmd.append(rev) |
| 1628 | if GitCommand(self, cmd).Wait() != 0: |
| 1629 | raise GitError('%s reset --hard %s ' % (self.name, rev)) |
| 1630 | |
| 1631 | def _Rebase(self, upstream, onto = None): |
Shawn O. Pearce | 19a83d8 | 2009-04-16 08:14:26 -0700 | [diff] [blame] | 1632 | cmd = ['rebase'] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1633 | if onto is not None: |
| 1634 | cmd.extend(['--onto', onto]) |
| 1635 | cmd.append(upstream) |
Shawn O. Pearce | 19a83d8 | 2009-04-16 08:14:26 -0700 | [diff] [blame] | 1636 | if GitCommand(self, cmd).Wait() != 0: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1637 | raise GitError('%s rebase %s ' % (self.name, upstream)) |
| 1638 | |
Pierre Tardy | 3d12594 | 2012-05-04 12:18:12 +0200 | [diff] [blame] | 1639 | def _FastForward(self, head, ffonly=False): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1640 | cmd = ['merge', head] |
Pierre Tardy | 3d12594 | 2012-05-04 12:18:12 +0200 | [diff] [blame] | 1641 | if ffonly: |
| 1642 | cmd.append("--ff-only") |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1643 | if GitCommand(self, cmd).Wait() != 0: |
| 1644 | raise GitError('%s merge %s ' % (self.name, head)) |
| 1645 | |
| 1646 | def _InitGitDir(self): |
| 1647 | if not os.path.exists(self.gitdir): |
| 1648 | os.makedirs(self.gitdir) |
| 1649 | self.bare_git.init() |
Shawn O. Pearce | 2816d4f | 2009-03-03 17:53:18 -0800 | [diff] [blame] | 1650 | |
Shawn O. Pearce | 8844338 | 2010-10-08 10:02:09 +0200 | [diff] [blame] | 1651 | mp = self.manifest.manifestProject |
| 1652 | ref_dir = mp.config.GetString('repo.reference') |
| 1653 | |
| 1654 | if ref_dir: |
| 1655 | mirror_git = os.path.join(ref_dir, self.name + '.git') |
| 1656 | repo_git = os.path.join(ref_dir, '.repo', 'projects', |
| 1657 | self.relpath + '.git') |
| 1658 | |
| 1659 | if os.path.exists(mirror_git): |
| 1660 | ref_dir = mirror_git |
| 1661 | |
| 1662 | elif os.path.exists(repo_git): |
| 1663 | ref_dir = repo_git |
| 1664 | |
| 1665 | else: |
| 1666 | ref_dir = None |
| 1667 | |
| 1668 | if ref_dir: |
| 1669 | _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'), |
| 1670 | os.path.join(ref_dir, 'objects') + '\n') |
| 1671 | |
Shawn O. Pearce | 2816d4f | 2009-03-03 17:53:18 -0800 | [diff] [blame] | 1672 | if self.manifest.IsMirror: |
| 1673 | self.config.SetString('core.bare', 'true') |
| 1674 | else: |
| 1675 | self.config.SetString('core.bare', None) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1676 | |
| 1677 | hooks = self._gitdir_path('hooks') |
Shawn O. Pearce | de64681 | 2008-10-29 14:38:12 -0700 | [diff] [blame] | 1678 | try: |
| 1679 | to_rm = os.listdir(hooks) |
| 1680 | except OSError: |
| 1681 | to_rm = [] |
| 1682 | for old_hook in to_rm: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1683 | os.remove(os.path.join(hooks, old_hook)) |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 1684 | self._InitHooks() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1685 | |
| 1686 | m = self.manifest.manifestProject.config |
| 1687 | for key in ['user.name', 'user.email']: |
| 1688 | if m.Has(key, include_defaults = False): |
| 1689 | self.config.SetString(key, m.GetString(key)) |
| 1690 | |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 1691 | def _InitHooks(self): |
| 1692 | hooks = self._gitdir_path('hooks') |
| 1693 | if not os.path.exists(hooks): |
| 1694 | os.makedirs(hooks) |
Doug Anderson | 8ced864 | 2011-01-10 14:16:30 -0800 | [diff] [blame] | 1695 | for stock_hook in _ProjectHooks(): |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 1696 | name = os.path.basename(stock_hook) |
| 1697 | |
Victor Boivie | 65e0f35 | 2011-04-18 11:23:29 +0200 | [diff] [blame] | 1698 | if name in ('commit-msg',) and not self.remote.review \ |
| 1699 | and not self is self.manifest.manifestProject: |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 1700 | # Don't install a Gerrit Code Review hook if this |
| 1701 | # project does not appear to use it for reviews. |
| 1702 | # |
Victor Boivie | 65e0f35 | 2011-04-18 11:23:29 +0200 | [diff] [blame] | 1703 | # Since the manifest project is one of those, but also |
| 1704 | # managed through gerrit, it's excluded |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 1705 | continue |
| 1706 | |
| 1707 | dst = os.path.join(hooks, name) |
| 1708 | if os.path.islink(dst): |
| 1709 | continue |
| 1710 | if os.path.exists(dst): |
| 1711 | if filecmp.cmp(stock_hook, dst, shallow=False): |
| 1712 | os.remove(dst) |
| 1713 | else: |
| 1714 | _error("%s: Not replacing %s hook", self.relpath, name) |
| 1715 | continue |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 1716 | try: |
Mickaël Salaün | b9477bc | 2012-08-05 13:39:26 +0200 | [diff] [blame] | 1717 | os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst) |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 1718 | except OSError, e: |
Shawn O. Pearce | 9452e4e | 2009-08-22 18:17:46 -0700 | [diff] [blame] | 1719 | if e.errno == errno.EPERM: |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 1720 | raise GitError('filesystem must support symlinks') |
| 1721 | else: |
| 1722 | raise |
| 1723 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1724 | def _InitRemote(self): |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 1725 | if self.remote.url: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1726 | remote = self.GetRemote(self.remote.name) |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 1727 | remote.url = self.remote.url |
| 1728 | remote.review = self.remote.review |
| 1729 | remote.projectname = self.name |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1730 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 1731 | if self.worktree: |
| 1732 | remote.ResetFetch(mirror=False) |
| 1733 | else: |
| 1734 | remote.ResetFetch(mirror=True) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1735 | remote.Save() |
| 1736 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1737 | def _InitMRef(self): |
| 1738 | if self.manifest.branch: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1739 | self._InitAnyMRef(R_M + self.manifest.branch) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1740 | |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 1741 | def _InitMirrorHead(self): |
Shawn O. Pearce | fe200ee | 2009-06-01 15:28:21 -0700 | [diff] [blame] | 1742 | self._InitAnyMRef(HEAD) |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1743 | |
| 1744 | def _InitAnyMRef(self, ref): |
| 1745 | cur = self.bare_ref.symref(ref) |
| 1746 | |
| 1747 | if self.revisionId: |
| 1748 | if cur != '' or self.bare_ref.get(ref) != self.revisionId: |
| 1749 | msg = 'manifest set to %s' % self.revisionId |
| 1750 | dst = self.revisionId + '^0' |
| 1751 | self.bare_git.UpdateRef(ref, dst, message = msg, detach = True) |
| 1752 | else: |
| 1753 | remote = self.GetRemote(self.remote.name) |
| 1754 | dst = remote.ToLocal(self.revisionExpr) |
| 1755 | if cur != dst: |
| 1756 | msg = 'manifest set to %s' % self.revisionExpr |
| 1757 | self.bare_git.symbolic_ref('-m', msg, ref, dst) |
Shawn O. Pearce | e284ad1 | 2008-11-04 07:37:10 -0800 | [diff] [blame] | 1758 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1759 | def _InitWorkTree(self): |
| 1760 | dotgit = os.path.join(self.worktree, '.git') |
| 1761 | if not os.path.exists(dotgit): |
| 1762 | os.makedirs(dotgit) |
| 1763 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1764 | for name in ['config', |
| 1765 | 'description', |
| 1766 | 'hooks', |
| 1767 | 'info', |
| 1768 | 'logs', |
| 1769 | 'objects', |
| 1770 | 'packed-refs', |
| 1771 | 'refs', |
| 1772 | 'rr-cache', |
| 1773 | 'svn']: |
Shawn O. Pearce | 438ee1c | 2008-11-03 09:59:36 -0800 | [diff] [blame] | 1774 | try: |
Shawn O. Pearce | c9ef744 | 2008-11-03 10:32:09 -0800 | [diff] [blame] | 1775 | src = os.path.join(self.gitdir, name) |
| 1776 | dst = os.path.join(dotgit, name) |
Nico Sallembien | d63060f | 2010-01-20 10:27:50 -0800 | [diff] [blame] | 1777 | if os.path.islink(dst) or not os.path.exists(dst): |
Mickaël Salaün | b9477bc | 2012-08-05 13:39:26 +0200 | [diff] [blame] | 1778 | os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst) |
Nico Sallembien | d63060f | 2010-01-20 10:27:50 -0800 | [diff] [blame] | 1779 | else: |
| 1780 | raise GitError('cannot overwrite a local work tree') |
Shawn O. Pearce | 438ee1c | 2008-11-03 09:59:36 -0800 | [diff] [blame] | 1781 | except OSError, e: |
| 1782 | if e.errno == errno.EPERM: |
| 1783 | raise GitError('filesystem must support symlinks') |
| 1784 | else: |
| 1785 | raise |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1786 | |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1787 | _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] | 1788 | |
| 1789 | cmd = ['read-tree', '--reset', '-u'] |
| 1790 | cmd.append('-v') |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 1791 | cmd.append(HEAD) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1792 | if GitCommand(self, cmd).Wait() != 0: |
| 1793 | raise GitError("cannot initialize work tree") |
Victor Boivie | 0960b5b | 2010-11-26 13:42:13 +0100 | [diff] [blame] | 1794 | |
| 1795 | rr_cache = os.path.join(self.gitdir, 'rr-cache') |
| 1796 | if not os.path.exists(rr_cache): |
| 1797 | os.makedirs(rr_cache) |
| 1798 | |
Shawn O. Pearce | 9360966 | 2009-04-21 10:50:33 -0700 | [diff] [blame] | 1799 | self._CopyFiles() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1800 | |
| 1801 | def _gitdir_path(self, path): |
| 1802 | return os.path.join(self.gitdir, path) |
| 1803 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1804 | def _revlist(self, *args, **kw): |
| 1805 | a = [] |
| 1806 | a.extend(args) |
| 1807 | a.append('--') |
| 1808 | return self.work_git.rev_list(*a, **kw) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1809 | |
| 1810 | @property |
| 1811 | def _allrefs(self): |
Shawn O. Pearce | d237b69 | 2009-04-17 18:49:50 -0700 | [diff] [blame] | 1812 | return self.bare_ref.all |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1813 | |
| 1814 | class _GitGetByExec(object): |
| 1815 | def __init__(self, project, bare): |
| 1816 | self._project = project |
| 1817 | self._bare = bare |
| 1818 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1819 | def LsOthers(self): |
| 1820 | p = GitCommand(self._project, |
| 1821 | ['ls-files', |
| 1822 | '-z', |
| 1823 | '--others', |
| 1824 | '--exclude-standard'], |
| 1825 | bare = False, |
| 1826 | capture_stdout = True, |
| 1827 | capture_stderr = True) |
| 1828 | if p.Wait() == 0: |
| 1829 | out = p.stdout |
| 1830 | if out: |
| 1831 | return out[:-1].split("\0") |
| 1832 | return [] |
| 1833 | |
| 1834 | def DiffZ(self, name, *args): |
| 1835 | cmd = [name] |
| 1836 | cmd.append('-z') |
| 1837 | cmd.extend(args) |
| 1838 | p = GitCommand(self._project, |
| 1839 | cmd, |
| 1840 | bare = False, |
| 1841 | capture_stdout = True, |
| 1842 | capture_stderr = True) |
| 1843 | try: |
| 1844 | out = p.process.stdout.read() |
| 1845 | r = {} |
| 1846 | if out: |
| 1847 | out = iter(out[:-1].split('\0')) |
| 1848 | while out: |
Shawn O. Pearce | 02dbb6d | 2008-10-21 13:59:08 -0700 | [diff] [blame] | 1849 | try: |
| 1850 | info = out.next() |
| 1851 | path = out.next() |
| 1852 | except StopIteration: |
| 1853 | break |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1854 | |
| 1855 | class _Info(object): |
| 1856 | def __init__(self, path, omode, nmode, oid, nid, state): |
| 1857 | self.path = path |
| 1858 | self.src_path = None |
| 1859 | self.old_mode = omode |
| 1860 | self.new_mode = nmode |
| 1861 | self.old_id = oid |
| 1862 | self.new_id = nid |
| 1863 | |
| 1864 | if len(state) == 1: |
| 1865 | self.status = state |
| 1866 | self.level = None |
| 1867 | else: |
| 1868 | self.status = state[:1] |
| 1869 | self.level = state[1:] |
| 1870 | while self.level.startswith('0'): |
| 1871 | self.level = self.level[1:] |
| 1872 | |
| 1873 | info = info[1:].split(' ') |
| 1874 | info =_Info(path, *info) |
| 1875 | if info.status in ('R', 'C'): |
| 1876 | info.src_path = info.path |
| 1877 | info.path = out.next() |
| 1878 | r[info.path] = info |
| 1879 | return r |
| 1880 | finally: |
| 1881 | p.Wait() |
| 1882 | |
| 1883 | def GetHead(self): |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 1884 | if self._bare: |
| 1885 | path = os.path.join(self._project.gitdir, HEAD) |
| 1886 | else: |
| 1887 | path = os.path.join(self._project.worktree, '.git', HEAD) |
Shawn O. Pearce | 76ca9f8 | 2009-04-18 14:48:03 -0700 | [diff] [blame] | 1888 | fd = open(path, 'rb') |
| 1889 | try: |
| 1890 | line = fd.read() |
| 1891 | finally: |
| 1892 | fd.close() |
Shawn O. Pearce | 5b23f24 | 2009-04-17 18:43:33 -0700 | [diff] [blame] | 1893 | if line.startswith('ref: '): |
| 1894 | return line[5:-1] |
| 1895 | return line[:-1] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1896 | |
| 1897 | def SetHead(self, ref, message=None): |
| 1898 | cmdv = [] |
| 1899 | if message is not None: |
| 1900 | cmdv.extend(['-m', message]) |
| 1901 | cmdv.append(HEAD) |
| 1902 | cmdv.append(ref) |
| 1903 | self.symbolic_ref(*cmdv) |
| 1904 | |
| 1905 | def DetachHead(self, new, message=None): |
| 1906 | cmdv = ['--no-deref'] |
| 1907 | if message is not None: |
| 1908 | cmdv.extend(['-m', message]) |
| 1909 | cmdv.append(HEAD) |
| 1910 | cmdv.append(new) |
| 1911 | self.update_ref(*cmdv) |
| 1912 | |
| 1913 | def UpdateRef(self, name, new, old=None, |
| 1914 | message=None, |
| 1915 | detach=False): |
| 1916 | cmdv = [] |
| 1917 | if message is not None: |
| 1918 | cmdv.extend(['-m', message]) |
| 1919 | if detach: |
| 1920 | cmdv.append('--no-deref') |
| 1921 | cmdv.append(name) |
| 1922 | cmdv.append(new) |
| 1923 | if old is not None: |
| 1924 | cmdv.append(old) |
| 1925 | self.update_ref(*cmdv) |
| 1926 | |
| 1927 | def DeleteRef(self, name, old=None): |
| 1928 | if not old: |
| 1929 | old = self.rev_parse(name) |
| 1930 | self.update_ref('-d', name, old) |
Shawn O. Pearce | fbcde47 | 2009-04-17 20:58:02 -0700 | [diff] [blame] | 1931 | self._project.bare_ref.deleted(name) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1932 | |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1933 | def rev_list(self, *args, **kw): |
| 1934 | if 'format' in kw: |
| 1935 | cmdv = ['log', '--pretty=format:%s' % kw['format']] |
| 1936 | else: |
| 1937 | cmdv = ['rev-list'] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1938 | cmdv.extend(args) |
| 1939 | p = GitCommand(self._project, |
| 1940 | cmdv, |
| 1941 | bare = self._bare, |
| 1942 | capture_stdout = True, |
| 1943 | capture_stderr = True) |
| 1944 | r = [] |
| 1945 | for line in p.process.stdout: |
Shawn O. Pearce | 8ad8a0e | 2009-05-29 18:28:25 -0700 | [diff] [blame] | 1946 | if line[-1] == '\n': |
| 1947 | line = line[:-1] |
| 1948 | r.append(line) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1949 | if p.Wait() != 0: |
| 1950 | raise GitError('%s rev-list %s: %s' % ( |
| 1951 | self._project.name, |
| 1952 | str(args), |
| 1953 | p.stderr)) |
| 1954 | return r |
| 1955 | |
| 1956 | def __getattr__(self, name): |
Doug Anderson | 37282b4 | 2011-03-04 11:54:18 -0800 | [diff] [blame] | 1957 | """Allow arbitrary git commands using pythonic syntax. |
| 1958 | |
| 1959 | This allows you to do things like: |
| 1960 | git_obj.rev_parse('HEAD') |
| 1961 | |
| 1962 | Since we don't have a 'rev_parse' method defined, the __getattr__ will |
| 1963 | run. We'll replace the '_' with a '-' and try to run a git command. |
| 1964 | Any other arguments will be passed to the git command. |
| 1965 | |
| 1966 | Args: |
| 1967 | name: The name of the git command to call. Any '_' characters will |
| 1968 | be replaced with '-'. |
| 1969 | |
| 1970 | Returns: |
| 1971 | A callable object that will try to call git with the named command. |
| 1972 | """ |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 1973 | name = name.replace('_', '-') |
| 1974 | def runner(*args): |
| 1975 | cmdv = [name] |
| 1976 | cmdv.extend(args) |
| 1977 | p = GitCommand(self._project, |
| 1978 | cmdv, |
| 1979 | bare = self._bare, |
| 1980 | capture_stdout = True, |
| 1981 | capture_stderr = True) |
| 1982 | if p.Wait() != 0: |
| 1983 | raise GitError('%s %s: %s' % ( |
| 1984 | self._project.name, |
| 1985 | name, |
| 1986 | p.stderr)) |
| 1987 | r = p.stdout |
| 1988 | if r.endswith('\n') and r.index('\n') == len(r) - 1: |
| 1989 | return r[:-1] |
| 1990 | return r |
| 1991 | return runner |
| 1992 | |
| 1993 | |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 1994 | class _PriorSyncFailedError(Exception): |
| 1995 | def __str__(self): |
| 1996 | return 'prior sync failed; rebase still in progress' |
| 1997 | |
| 1998 | class _DirtyError(Exception): |
| 1999 | def __str__(self): |
| 2000 | return 'contains uncommitted changes' |
| 2001 | |
| 2002 | class _InfoMessage(object): |
| 2003 | def __init__(self, project, text): |
| 2004 | self.project = project |
| 2005 | self.text = text |
| 2006 | |
| 2007 | def Print(self, syncbuf): |
| 2008 | syncbuf.out.info('%s/: %s', self.project.relpath, self.text) |
| 2009 | syncbuf.out.nl() |
| 2010 | |
| 2011 | class _Failure(object): |
| 2012 | def __init__(self, project, why): |
| 2013 | self.project = project |
| 2014 | self.why = why |
| 2015 | |
| 2016 | def Print(self, syncbuf): |
| 2017 | syncbuf.out.fail('error: %s/: %s', |
| 2018 | self.project.relpath, |
| 2019 | str(self.why)) |
| 2020 | syncbuf.out.nl() |
| 2021 | |
| 2022 | class _Later(object): |
| 2023 | def __init__(self, project, action): |
| 2024 | self.project = project |
| 2025 | self.action = action |
| 2026 | |
| 2027 | def Run(self, syncbuf): |
| 2028 | out = syncbuf.out |
| 2029 | out.project('project %s/', self.project.relpath) |
| 2030 | out.nl() |
| 2031 | try: |
| 2032 | self.action() |
| 2033 | out.nl() |
| 2034 | return True |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 2035 | except GitError: |
Shawn O. Pearce | 350cde4 | 2009-04-16 11:21:18 -0700 | [diff] [blame] | 2036 | out.nl() |
| 2037 | return False |
| 2038 | |
| 2039 | class _SyncColoring(Coloring): |
| 2040 | def __init__(self, config): |
| 2041 | Coloring.__init__(self, config, 'reposync') |
| 2042 | self.project = self.printer('header', attr = 'bold') |
| 2043 | self.info = self.printer('info') |
| 2044 | self.fail = self.printer('fail', fg='red') |
| 2045 | |
| 2046 | class SyncBuffer(object): |
| 2047 | def __init__(self, config, detach_head=False): |
| 2048 | self._messages = [] |
| 2049 | self._failures = [] |
| 2050 | self._later_queue1 = [] |
| 2051 | self._later_queue2 = [] |
| 2052 | |
| 2053 | self.out = _SyncColoring(config) |
| 2054 | self.out.redirect(sys.stderr) |
| 2055 | |
| 2056 | self.detach_head = detach_head |
| 2057 | self.clean = True |
| 2058 | |
| 2059 | def info(self, project, fmt, *args): |
| 2060 | self._messages.append(_InfoMessage(project, fmt % args)) |
| 2061 | |
| 2062 | def fail(self, project, err=None): |
| 2063 | self._failures.append(_Failure(project, err)) |
| 2064 | self.clean = False |
| 2065 | |
| 2066 | def later1(self, project, what): |
| 2067 | self._later_queue1.append(_Later(project, what)) |
| 2068 | |
| 2069 | def later2(self, project, what): |
| 2070 | self._later_queue2.append(_Later(project, what)) |
| 2071 | |
| 2072 | def Finish(self): |
| 2073 | self._PrintMessages() |
| 2074 | self._RunLater() |
| 2075 | self._PrintMessages() |
| 2076 | return self.clean |
| 2077 | |
| 2078 | def _RunLater(self): |
| 2079 | for q in ['_later_queue1', '_later_queue2']: |
| 2080 | if not self._RunQueue(q): |
| 2081 | return |
| 2082 | |
| 2083 | def _RunQueue(self, queue): |
| 2084 | for m in getattr(self, queue): |
| 2085 | if not m.Run(self): |
| 2086 | self.clean = False |
| 2087 | return False |
| 2088 | setattr(self, queue, []) |
| 2089 | return True |
| 2090 | |
| 2091 | def _PrintMessages(self): |
| 2092 | for m in self._messages: |
| 2093 | m.Print(self) |
| 2094 | for m in self._failures: |
| 2095 | m.Print(self) |
| 2096 | |
| 2097 | self._messages = [] |
| 2098 | self._failures = [] |
| 2099 | |
| 2100 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2101 | class MetaProject(Project): |
| 2102 | """A special project housed under .repo. |
| 2103 | """ |
| 2104 | def __init__(self, manifest, name, gitdir, worktree): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2105 | Project.__init__(self, |
| 2106 | manifest = manifest, |
| 2107 | name = name, |
| 2108 | gitdir = gitdir, |
| 2109 | worktree = worktree, |
Shawn O. Pearce | d1f70d9 | 2009-05-19 14:58:02 -0700 | [diff] [blame] | 2110 | remote = RemoteSpec('origin'), |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2111 | relpath = '.repo/%s' % name, |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2112 | revisionExpr = 'refs/heads/master', |
Colin Cross | 5acde75 | 2012-03-28 20:15:45 -0700 | [diff] [blame] | 2113 | revisionId = None, |
| 2114 | groups = None) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2115 | |
| 2116 | def PreSync(self): |
| 2117 | if self.Exists: |
| 2118 | cb = self.CurrentBranch |
| 2119 | if cb: |
| 2120 | base = self.GetBranch(cb).merge |
| 2121 | if base: |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2122 | self.revisionExpr = base |
| 2123 | self.revisionId = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2124 | |
Florian Vallee | 5d01650 | 2012-06-07 17:19:26 +0200 | [diff] [blame] | 2125 | def MetaBranchSwitch(self, target): |
| 2126 | """ Prepare MetaProject for manifest branch switch |
| 2127 | """ |
| 2128 | |
| 2129 | # detach and delete manifest branch, allowing a new |
| 2130 | # branch to take over |
| 2131 | syncbuf = SyncBuffer(self.config, detach_head = True) |
| 2132 | self.Sync_LocalHalf(syncbuf) |
| 2133 | syncbuf.Finish() |
| 2134 | |
| 2135 | return GitCommand(self, |
Torne (Richard Coles) | e8f75fa | 2012-07-20 15:32:19 +0100 | [diff] [blame] | 2136 | ['update-ref', '-d', 'refs/heads/default'], |
Florian Vallee | 5d01650 | 2012-06-07 17:19:26 +0200 | [diff] [blame] | 2137 | capture_stdout = True, |
| 2138 | capture_stderr = True).Wait() == 0 |
| 2139 | |
| 2140 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2141 | @property |
Shawn O. Pearce | f690687 | 2009-04-18 10:49:00 -0700 | [diff] [blame] | 2142 | def LastFetch(self): |
| 2143 | try: |
| 2144 | fh = os.path.join(self.gitdir, 'FETCH_HEAD') |
| 2145 | return os.path.getmtime(fh) |
| 2146 | except OSError: |
| 2147 | return 0 |
| 2148 | |
| 2149 | @property |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2150 | def HasChanges(self): |
| 2151 | """Has the remote received new commits not yet checked out? |
| 2152 | """ |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2153 | if not self.remote or not self.revisionExpr: |
Shawn O. Pearce | 336f7bd | 2009-04-18 10:39:28 -0700 | [diff] [blame] | 2154 | return False |
| 2155 | |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 2156 | all_refs = self.bare_ref.all |
| 2157 | revid = self.GetRevisionId(all_refs) |
Shawn O. Pearce | 336f7bd | 2009-04-18 10:39:28 -0700 | [diff] [blame] | 2158 | head = self.work_git.GetHead() |
| 2159 | if head.startswith(R_HEADS): |
| 2160 | try: |
David Pursehouse | 8a68ff9 | 2012-09-24 12:15:13 +0900 | [diff] [blame^] | 2161 | head = all_refs[head] |
Shawn O. Pearce | 336f7bd | 2009-04-18 10:39:28 -0700 | [diff] [blame] | 2162 | except KeyError: |
| 2163 | head = None |
| 2164 | |
| 2165 | if revid == head: |
| 2166 | return False |
Shawn O. Pearce | 3c8dea1 | 2009-05-29 18:38:17 -0700 | [diff] [blame] | 2167 | elif self._revlist(not_rev(HEAD), revid): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2168 | return True |
| 2169 | return False |