blob: 633ae0738da046c70c9b83feb3bd3088ddc3a691 [file] [log] [blame]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001# Copyright (C) 2008 The Android Open Source Project
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
Sarah Owenscecd1d82012-11-01 22:59:27 -070015from __future__ import print_function
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -080016import errno
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070017import filecmp
Wink Saville4c426ef2015-06-03 08:05:17 -070018import glob
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070019import os
Shawn O. Pearcec325dc32011-10-03 08:30:24 -070020import random
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070021import re
22import shutil
23import stat
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -070024import subprocess
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070025import sys
Julien Campergue335f5ef2013-10-16 11:02:35 +020026import tarfile
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +080027import tempfile
Shawn O. Pearcec325dc32011-10-03 08:30:24 -070028import time
Dave Borowitz137d0132015-01-02 11:12:54 -080029import traceback
Shawn O. Pearcedf5ee522011-10-11 14:05:21 -070030
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070031from color import Coloring
Dave Borowitzb42b4742012-10-31 12:27:27 -070032from git_command import GitCommand, git_require
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -070033from git_config import GitConfig, IsId, GetSchemeFromUrl, GetUrlCookieFile, \
34 ID_RE
Kevin Degiabaa7f32014-11-12 11:27:45 -070035from error import GitError, HookError, UploadError, DownloadError
Shawn O. Pearce559b8462009-03-02 12:56:08 -080036from error import ManifestInvalidRevisionError
Conley Owens75ee0572012-11-15 17:33:11 -080037from error import NoManifestException
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -070038from trace import IsTrace, Trace
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070039
Shawn O. Pearced237b692009-04-17 18:49:50 -070040from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070041
David Pursehouse59bbb582013-05-17 10:49:33 +090042from pyversion import is_python3
Mike Frysinger40252c22016-08-15 21:23:44 -040043if is_python3():
44 import urllib.parse
45else:
46 import imp
47 import urlparse
48 urllib = imp.new_module('urllib')
49 urllib.parse = urlparse
David Pursehouse59bbb582013-05-17 10:49:33 +090050 # pylint:disable=W0622
Chirayu Desai217ea7d2013-03-01 19:14:38 +053051 input = raw_input
David Pursehouse59bbb582013-05-17 10:49:33 +090052 # pylint:enable=W0622
Chirayu Desai217ea7d2013-03-01 19:14:38 +053053
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -070054
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -070055def _lwrite(path, content):
56 lock = '%s.lock' % path
57
Chirayu Desai303a82f2014-08-19 22:57:17 +053058 fd = open(lock, 'w')
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -070059 try:
60 fd.write(content)
61 finally:
62 fd.close()
63
64 try:
65 os.rename(lock, path)
66 except OSError:
67 os.remove(lock)
68 raise
69
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -070070
Shawn O. Pearce48244782009-04-16 08:25:57 -070071def _error(fmt, *args):
72 msg = fmt % args
Sarah Owenscecd1d82012-11-01 22:59:27 -070073 print('error: %s' % msg, file=sys.stderr)
Shawn O. Pearce48244782009-04-16 08:25:57 -070074
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -070075
David Pursehousef33929d2015-08-24 14:39:14 +090076def _warn(fmt, *args):
77 msg = fmt % args
78 print('warn: %s' % msg, file=sys.stderr)
79
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -070080
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070081def not_rev(r):
82 return '^' + r
83
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -070084
Shawn O. Pearceb54a3922009-01-05 16:18:58 -080085def sq(r):
86 return "'" + r.replace("'", "'\''") + "'"
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -080087
Jonathan Nieder93719792015-03-17 11:29:58 -070088_project_hook_list = None
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -070089
90
Jonathan Nieder93719792015-03-17 11:29:58 -070091def _ProjectHooks():
92 """List the hooks present in the 'hooks' directory.
93
94 These hooks are project hooks and are copied to the '.git/hooks' directory
95 of all subprojects.
96
97 This function caches the list of hooks (based on the contents of the
98 'repo/hooks' directory) on the first call.
99
100 Returns:
101 A list of absolute paths to all of the files in the hooks directory.
102 """
103 global _project_hook_list
104 if _project_hook_list is None:
105 d = os.path.realpath(os.path.abspath(os.path.dirname(__file__)))
106 d = os.path.join(d, 'hooks')
107 _project_hook_list = [os.path.join(d, x) for x in os.listdir(d)]
108 return _project_hook_list
109
110
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700111class DownloadedChange(object):
112 _commit_cache = None
113
114 def __init__(self, project, base, change_id, ps_id, commit):
115 self.project = project
116 self.base = base
117 self.change_id = change_id
118 self.ps_id = ps_id
119 self.commit = commit
120
121 @property
122 def commits(self):
123 if self._commit_cache is None:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700124 self._commit_cache = self.project.bare_git.rev_list('--abbrev=8',
125 '--abbrev-commit',
126 '--pretty=oneline',
127 '--reverse',
128 '--date-order',
129 not_rev(self.base),
130 self.commit,
131 '--')
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700132 return self._commit_cache
133
134
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700135class ReviewableBranch(object):
136 _commit_cache = None
137
138 def __init__(self, project, branch, base):
139 self.project = project
140 self.branch = branch
141 self.base = base
142
143 @property
144 def name(self):
145 return self.branch.name
146
147 @property
148 def commits(self):
149 if self._commit_cache is None:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700150 self._commit_cache = self.project.bare_git.rev_list('--abbrev=8',
151 '--abbrev-commit',
152 '--pretty=oneline',
153 '--reverse',
154 '--date-order',
155 not_rev(self.base),
156 R_HEADS + self.name,
157 '--')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700158 return self._commit_cache
159
160 @property
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800161 def unabbrev_commits(self):
162 r = dict()
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700163 for commit in self.project.bare_git.rev_list(not_rev(self.base),
164 R_HEADS + self.name,
165 '--'):
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800166 r[commit[0:8]] = commit
167 return r
168
169 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700170 def date(self):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700171 return self.project.bare_git.log('--pretty=format:%cd',
172 '-n', '1',
173 R_HEADS + self.name,
174 '--')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700175
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700176 def UploadForReview(self, people,
177 auto_topic=False,
178 draft=False,
179 dest_branch=None):
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800180 self.project.UploadForReview(self.name,
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700181 people,
Brian Harring435370c2012-07-28 15:37:04 -0700182 auto_topic=auto_topic,
Bryan Jacobsf609f912013-05-06 13:36:24 -0400183 draft=draft,
184 dest_branch=dest_branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700185
Ficus Kirkpatrickbc7ef672009-05-04 12:45:11 -0700186 def GetPublishedRefs(self):
187 refs = {}
188 output = self.project.bare_git.ls_remote(
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700189 self.branch.remote.SshReviewUrl(self.project.UserEmail),
190 'refs/changes/*')
Ficus Kirkpatrickbc7ef672009-05-04 12:45:11 -0700191 for line in output.split('\n'):
192 try:
193 (sha, ref) = line.split()
194 refs[sha] = ref
195 except ValueError:
196 pass
197
198 return refs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700199
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700200
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700201class StatusColoring(Coloring):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700202
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700203 def __init__(self, config):
204 Coloring.__init__(self, config, 'status')
Anthony King7bdac712014-07-16 12:56:40 +0100205 self.project = self.printer('header', attr='bold')
206 self.branch = self.printer('header', attr='bold')
207 self.nobranch = self.printer('nobranch', fg='red')
208 self.important = self.printer('important', fg='red')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700209
Anthony King7bdac712014-07-16 12:56:40 +0100210 self.added = self.printer('added', fg='green')
211 self.changed = self.printer('changed', fg='red')
212 self.untracked = self.printer('untracked', fg='red')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700213
214
215class DiffColoring(Coloring):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700216
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700217 def __init__(self, config):
218 Coloring.__init__(self, config, 'diff')
Anthony King7bdac712014-07-16 12:56:40 +0100219 self.project = self.printer('header', attr='bold')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700220
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700221
Anthony King7bdac712014-07-16 12:56:40 +0100222class _Annotation(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700223
James W. Mills24c13082012-04-12 15:04:13 -0500224 def __init__(self, name, value, keep):
225 self.name = name
226 self.value = value
227 self.keep = keep
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700228
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700229
Anthony King7bdac712014-07-16 12:56:40 +0100230class _CopyFile(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700231
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800232 def __init__(self, src, dest, abssrc, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700233 self.src = src
234 self.dest = dest
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800235 self.abs_src = abssrc
236 self.abs_dest = absdest
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700237
238 def _Copy(self):
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800239 src = self.abs_src
240 dest = self.abs_dest
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700241 # copy file if it does not exist or is out of date
242 if not os.path.exists(dest) or not filecmp.cmp(src, dest):
243 try:
244 # remove existing file first, since it might be read-only
245 if os.path.exists(dest):
246 os.remove(dest)
Matthew Buckett2daf6672009-07-11 09:43:47 -0400247 else:
Mickaël Salaün2f6ab7f2012-09-30 00:37:55 +0200248 dest_dir = os.path.dirname(dest)
249 if not os.path.isdir(dest_dir):
250 os.makedirs(dest_dir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700251 shutil.copy(src, dest)
252 # make the file read-only
253 mode = os.stat(dest)[stat.ST_MODE]
254 mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
255 os.chmod(dest, mode)
256 except IOError:
Shawn O. Pearce48244782009-04-16 08:25:57 -0700257 _error('Cannot copy file %s to %s', src, dest)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700258
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700259
Anthony King7bdac712014-07-16 12:56:40 +0100260class _LinkFile(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700261
Wink Saville4c426ef2015-06-03 08:05:17 -0700262 def __init__(self, git_worktree, src, dest, relsrc, absdest):
263 self.git_worktree = git_worktree
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500264 self.src = src
265 self.dest = dest
Colin Cross0184dcc2015-05-05 00:24:54 -0700266 self.src_rel_to_dest = relsrc
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500267 self.abs_dest = absdest
268
Wink Saville4c426ef2015-06-03 08:05:17 -0700269 def __linkIt(self, relSrc, absDest):
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500270 # link file if it does not exist or is out of date
Wink Saville4c426ef2015-06-03 08:05:17 -0700271 if not os.path.islink(absDest) or (os.readlink(absDest) != relSrc):
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500272 try:
273 # remove existing file first, since it might be read-only
Dan Willemsene1e0bd12015-11-18 16:49:38 -0800274 if os.path.lexists(absDest):
Wink Saville4c426ef2015-06-03 08:05:17 -0700275 os.remove(absDest)
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500276 else:
Wink Saville4c426ef2015-06-03 08:05:17 -0700277 dest_dir = os.path.dirname(absDest)
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500278 if not os.path.isdir(dest_dir):
279 os.makedirs(dest_dir)
Wink Saville4c426ef2015-06-03 08:05:17 -0700280 os.symlink(relSrc, absDest)
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500281 except IOError:
Wink Saville4c426ef2015-06-03 08:05:17 -0700282 _error('Cannot link file %s to %s', relSrc, absDest)
283
284 def _Link(self):
285 """Link the self.rel_src_to_dest and self.abs_dest. Handles wild cards
286 on the src linking all of the files in the source in to the destination
287 directory.
288 """
289 # We use the absSrc to handle the situation where the current directory
290 # is not the root of the repo
291 absSrc = os.path.join(self.git_worktree, self.src)
292 if os.path.exists(absSrc):
293 # Entity exists so just a simple one to one link operation
294 self.__linkIt(self.src_rel_to_dest, self.abs_dest)
295 else:
296 # Entity doesn't exist assume there is a wild card
297 absDestDir = self.abs_dest
298 if os.path.exists(absDestDir) and not os.path.isdir(absDestDir):
299 _error('Link error: src with wildcard, %s must be a directory',
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700300 absDestDir)
Wink Saville4c426ef2015-06-03 08:05:17 -0700301 else:
302 absSrcFiles = glob.glob(absSrc)
303 for absSrcFile in absSrcFiles:
304 # Create a releative path from source dir to destination dir
305 absSrcDir = os.path.dirname(absSrcFile)
306 relSrcDir = os.path.relpath(absSrcDir, absDestDir)
307
308 # Get the source file name
309 srcFile = os.path.basename(absSrcFile)
310
311 # Now form the final full paths to srcFile. They will be
312 # absolute for the desintaiton and relative for the srouce.
313 absDest = os.path.join(absDestDir, srcFile)
314 relSrc = os.path.join(relSrcDir, srcFile)
315 self.__linkIt(relSrc, absDest)
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500316
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700317
Shawn O. Pearced1f70d92009-05-19 14:58:02 -0700318class RemoteSpec(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700319
Shawn O. Pearced1f70d92009-05-19 14:58:02 -0700320 def __init__(self,
321 name,
Anthony King7bdac712014-07-16 12:56:40 +0100322 url=None,
Steve Raed6480452016-08-10 15:00:00 -0700323 pushUrl=None,
Anthony King7bdac712014-07-16 12:56:40 +0100324 review=None,
Dan Willemsen96c2d652016-04-06 16:03:54 -0700325 revision=None,
326 orig_name=None):
Shawn O. Pearced1f70d92009-05-19 14:58:02 -0700327 self.name = name
328 self.url = url
Steve Raed6480452016-08-10 15:00:00 -0700329 self.pushUrl = pushUrl
Shawn O. Pearced1f70d92009-05-19 14:58:02 -0700330 self.review = review
Anthony King36ea2fb2014-05-06 11:54:01 +0100331 self.revision = revision
Dan Willemsen96c2d652016-04-06 16:03:54 -0700332 self.orig_name = orig_name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700333
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700334
Doug Anderson37282b42011-03-04 11:54:18 -0800335class RepoHook(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700336
Doug Anderson37282b42011-03-04 11:54:18 -0800337 """A RepoHook contains information about a script to run as a hook.
338
339 Hooks are used to run a python script before running an upload (for instance,
340 to run presubmit checks). Eventually, we may have hooks for other actions.
341
342 This shouldn't be confused with files in the 'repo/hooks' directory. Those
343 files are copied into each '.git/hooks' folder for each project. Repo-level
344 hooks are associated instead with repo actions.
345
346 Hooks are always python. When a hook is run, we will load the hook into the
347 interpreter and execute its main() function.
348 """
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700349
Doug Anderson37282b42011-03-04 11:54:18 -0800350 def __init__(self,
351 hook_type,
352 hooks_project,
353 topdir,
Mike Frysinger40252c22016-08-15 21:23:44 -0400354 manifest_url,
Doug Anderson37282b42011-03-04 11:54:18 -0800355 abort_if_user_denies=False):
356 """RepoHook constructor.
357
358 Params:
359 hook_type: A string representing the type of hook. This is also used
360 to figure out the name of the file containing the hook. For
361 example: 'pre-upload'.
362 hooks_project: The project containing the repo hooks. If you have a
363 manifest, this is manifest.repo_hooks_project. OK if this is None,
364 which will make the hook a no-op.
365 topdir: Repo's top directory (the one containing the .repo directory).
366 Scripts will run with CWD as this directory. If you have a manifest,
367 this is manifest.topdir
Mike Frysinger40252c22016-08-15 21:23:44 -0400368 manifest_url: The URL to the manifest git repo.
Doug Anderson37282b42011-03-04 11:54:18 -0800369 abort_if_user_denies: If True, we'll throw a HookError() if the user
370 doesn't allow us to run the hook.
371 """
372 self._hook_type = hook_type
373 self._hooks_project = hooks_project
Mike Frysinger40252c22016-08-15 21:23:44 -0400374 self._manifest_url = manifest_url
Doug Anderson37282b42011-03-04 11:54:18 -0800375 self._topdir = topdir
376 self._abort_if_user_denies = abort_if_user_denies
377
378 # Store the full path to the script for convenience.
379 if self._hooks_project:
380 self._script_fullpath = os.path.join(self._hooks_project.worktree,
381 self._hook_type + '.py')
382 else:
383 self._script_fullpath = None
384
385 def _GetHash(self):
386 """Return a hash of the contents of the hooks directory.
387
388 We'll just use git to do this. This hash has the property that if anything
389 changes in the directory we will return a different has.
390
391 SECURITY CONSIDERATION:
392 This hash only represents the contents of files in the hook directory, not
393 any other files imported or called by hooks. Changes to imported files
394 can change the script behavior without affecting the hash.
395
396 Returns:
397 A string representing the hash. This will always be ASCII so that it can
398 be printed to the user easily.
399 """
400 assert self._hooks_project, "Must have hooks to calculate their hash."
401
402 # We will use the work_git object rather than just calling GetRevisionId().
403 # That gives us a hash of the latest checked in version of the files that
404 # the user will actually be executing. Specifically, GetRevisionId()
405 # doesn't appear to change even if a user checks out a different version
406 # of the hooks repo (via git checkout) nor if a user commits their own revs.
407 #
408 # NOTE: Local (non-committed) changes will not be factored into this hash.
409 # I think this is OK, since we're really only worried about warning the user
410 # about upstream changes.
411 return self._hooks_project.work_git.rev_parse('HEAD')
412
413 def _GetMustVerb(self):
414 """Return 'must' if the hook is required; 'should' if not."""
415 if self._abort_if_user_denies:
416 return 'must'
417 else:
418 return 'should'
419
420 def _CheckForHookApproval(self):
421 """Check to see whether this hook has been approved.
422
Mike Frysinger40252c22016-08-15 21:23:44 -0400423 We'll accept approval of manifest URLs if they're using secure transports.
424 This way the user can say they trust the manifest hoster. For insecure
425 hosts, we fall back to checking the hash of the hooks repo.
Doug Anderson37282b42011-03-04 11:54:18 -0800426
427 Note that we ask permission for each individual hook even though we use
428 the hash of all hooks when detecting changes. We'd like the user to be
429 able to approve / deny each hook individually. We only use the hash of all
430 hooks because there is no other easy way to detect changes to local imports.
431
432 Returns:
433 True if this hook is approved to run; False otherwise.
434
435 Raises:
436 HookError: Raised if the user doesn't approve and abort_if_user_denies
437 was passed to the consturctor.
438 """
Mike Frysinger40252c22016-08-15 21:23:44 -0400439 if self._ManifestUrlHasSecureScheme():
440 return self._CheckForHookApprovalManifest()
441 else:
442 return self._CheckForHookApprovalHash()
443
444 def _CheckForHookApprovalHelper(self, subkey, new_val, main_prompt,
445 changed_prompt):
446 """Check for approval for a particular attribute and hook.
447
448 Args:
449 subkey: The git config key under [repo.hooks.<hook_type>] to store the
450 last approved string.
451 new_val: The new value to compare against the last approved one.
452 main_prompt: Message to display to the user to ask for approval.
453 changed_prompt: Message explaining why we're re-asking for approval.
454
455 Returns:
456 True if this hook is approved to run; False otherwise.
457
458 Raises:
459 HookError: Raised if the user doesn't approve and abort_if_user_denies
460 was passed to the consturctor.
461 """
Doug Anderson37282b42011-03-04 11:54:18 -0800462 hooks_config = self._hooks_project.config
Mike Frysinger40252c22016-08-15 21:23:44 -0400463 git_approval_key = 'repo.hooks.%s.%s' % (self._hook_type, subkey)
Doug Anderson37282b42011-03-04 11:54:18 -0800464
Mike Frysinger40252c22016-08-15 21:23:44 -0400465 # Get the last value that the user approved for this hook; may be None.
466 old_val = hooks_config.GetString(git_approval_key)
Doug Anderson37282b42011-03-04 11:54:18 -0800467
Mike Frysinger40252c22016-08-15 21:23:44 -0400468 if old_val is not None:
Doug Anderson37282b42011-03-04 11:54:18 -0800469 # User previously approved hook and asked not to be prompted again.
Mike Frysinger40252c22016-08-15 21:23:44 -0400470 if new_val == old_val:
Doug Anderson37282b42011-03-04 11:54:18 -0800471 # Approval matched. We're done.
472 return True
473 else:
474 # Give the user a reason why we're prompting, since they last told
475 # us to "never ask again".
Mike Frysinger40252c22016-08-15 21:23:44 -0400476 prompt = 'WARNING: %s\n\n' % (changed_prompt,)
Doug Anderson37282b42011-03-04 11:54:18 -0800477 else:
478 prompt = ''
479
480 # Prompt the user if we're not on a tty; on a tty we'll assume "no".
481 if sys.stdout.isatty():
Mike Frysinger40252c22016-08-15 21:23:44 -0400482 prompt += main_prompt + ' (yes/always/NO)? '
Chirayu Desai217ea7d2013-03-01 19:14:38 +0530483 response = input(prompt).lower()
David Pursehouse98ffba12012-11-14 11:18:00 +0900484 print()
Doug Anderson37282b42011-03-04 11:54:18 -0800485
486 # User is doing a one-time approval.
487 if response in ('y', 'yes'):
488 return True
Mike Frysinger40252c22016-08-15 21:23:44 -0400489 elif response == 'always':
490 hooks_config.SetString(git_approval_key, new_val)
Doug Anderson37282b42011-03-04 11:54:18 -0800491 return True
492
493 # For anything else, we'll assume no approval.
494 if self._abort_if_user_denies:
495 raise HookError('You must allow the %s hook or use --no-verify.' %
496 self._hook_type)
497
498 return False
499
Mike Frysinger40252c22016-08-15 21:23:44 -0400500 def _ManifestUrlHasSecureScheme(self):
501 """Check if the URI for the manifest is a secure transport."""
502 secure_schemes = ('file', 'https', 'ssh', 'persistent-https', 'sso', 'rpc')
503 parse_results = urllib.parse.urlparse(self._manifest_url)
504 return parse_results.scheme in secure_schemes
505
506 def _CheckForHookApprovalManifest(self):
507 """Check whether the user has approved this manifest host.
508
509 Returns:
510 True if this hook is approved to run; False otherwise.
511 """
512 return self._CheckForHookApprovalHelper(
513 'approvedmanifest',
514 self._manifest_url,
515 'Run hook scripts from %s' % (self._manifest_url,),
516 'Manifest URL has changed since %s was allowed.' % (self._hook_type,))
517
518 def _CheckForHookApprovalHash(self):
519 """Check whether the user has approved the hooks repo.
520
521 Returns:
522 True if this hook is approved to run; False otherwise.
523 """
524 prompt = ('Repo %s run the script:\n'
525 ' %s\n'
526 '\n'
Jonathan Nieder71e4cea2016-08-16 12:05:09 -0700527 'Do you want to allow this script to run')
Mike Frysinger40252c22016-08-15 21:23:44 -0400528 return self._CheckForHookApprovalHelper(
529 'approvedhash',
530 self._GetHash(),
Jonathan Nieder71e4cea2016-08-16 12:05:09 -0700531 prompt % (self._GetMustVerb(), self._script_fullpath),
Mike Frysinger40252c22016-08-15 21:23:44 -0400532 'Scripts have changed since %s was allowed.' % (self._hook_type,))
533
Doug Anderson37282b42011-03-04 11:54:18 -0800534 def _ExecuteHook(self, **kwargs):
535 """Actually execute the given hook.
536
537 This will run the hook's 'main' function in our python interpreter.
538
539 Args:
540 kwargs: Keyword arguments to pass to the hook. These are often specific
541 to the hook type. For instance, pre-upload hooks will contain
542 a project_list.
543 """
544 # Keep sys.path and CWD stashed away so that we can always restore them
545 # upon function exit.
546 orig_path = os.getcwd()
547 orig_syspath = sys.path
548
549 try:
550 # Always run hooks with CWD as topdir.
551 os.chdir(self._topdir)
552
553 # Put the hook dir as the first item of sys.path so hooks can do
554 # relative imports. We want to replace the repo dir as [0] so
555 # hooks can't import repo files.
556 sys.path = [os.path.dirname(self._script_fullpath)] + sys.path[1:]
557
558 # Exec, storing global context in the context dict. We catch exceptions
559 # and convert to a HookError w/ just the failing traceback.
Mike Frysinger4aa4b212016-03-04 15:03:00 -0500560 context = {'__file__': self._script_fullpath}
Doug Anderson37282b42011-03-04 11:54:18 -0800561 try:
Anthony King70f68902014-05-05 21:15:34 +0100562 exec(compile(open(self._script_fullpath).read(),
563 self._script_fullpath, 'exec'), context)
Doug Anderson37282b42011-03-04 11:54:18 -0800564 except Exception:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700565 raise HookError('%s\nFailed to import %s hook; see traceback above.' %
566 (traceback.format_exc(), self._hook_type))
Doug Anderson37282b42011-03-04 11:54:18 -0800567
568 # Running the script should have defined a main() function.
569 if 'main' not in context:
570 raise HookError('Missing main() in: "%s"' % self._script_fullpath)
571
Doug Anderson37282b42011-03-04 11:54:18 -0800572 # Add 'hook_should_take_kwargs' to the arguments to be passed to main.
573 # We don't actually want hooks to define their main with this argument--
574 # it's there to remind them that their hook should always take **kwargs.
575 # For instance, a pre-upload hook should be defined like:
576 # def main(project_list, **kwargs):
577 #
578 # This allows us to later expand the API without breaking old hooks.
579 kwargs = kwargs.copy()
580 kwargs['hook_should_take_kwargs'] = True
581
582 # Call the main function in the hook. If the hook should cause the
583 # build to fail, it will raise an Exception. We'll catch that convert
584 # to a HookError w/ just the failing traceback.
585 try:
586 context['main'](**kwargs)
587 except Exception:
588 raise HookError('%s\nFailed to run main() for %s hook; see traceback '
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700589 'above.' % (traceback.format_exc(),
590 self._hook_type))
Doug Anderson37282b42011-03-04 11:54:18 -0800591 finally:
592 # Restore sys.path and CWD.
593 sys.path = orig_syspath
594 os.chdir(orig_path)
595
596 def Run(self, user_allows_all_hooks, **kwargs):
597 """Run the hook.
598
599 If the hook doesn't exist (because there is no hooks project or because
600 this particular hook is not enabled), this is a no-op.
601
602 Args:
603 user_allows_all_hooks: If True, we will never prompt about running the
604 hook--we'll just assume it's OK to run it.
605 kwargs: Keyword arguments to pass to the hook. These are often specific
606 to the hook type. For instance, pre-upload hooks will contain
607 a project_list.
608
609 Raises:
610 HookError: If there was a problem finding the hook or the user declined
611 to run a required hook (from _CheckForHookApproval).
612 """
613 # No-op if there is no hooks project or if hook is disabled.
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700614 if ((not self._hooks_project) or (self._hook_type not in
615 self._hooks_project.enabled_repo_hooks)):
Doug Anderson37282b42011-03-04 11:54:18 -0800616 return
617
618 # Bail with a nice error if we can't find the hook.
619 if not os.path.isfile(self._script_fullpath):
620 raise HookError('Couldn\'t find repo hook: "%s"' % self._script_fullpath)
621
622 # Make sure the user is OK with running the hook.
623 if (not user_allows_all_hooks) and (not self._CheckForHookApproval()):
624 return
625
626 # Run the hook with the same version of python we're using.
627 self._ExecuteHook(**kwargs)
628
629
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700630class Project(object):
Kevin Degi384b3c52014-10-16 16:02:58 -0600631 # These objects can be shared between several working trees.
632 shareable_files = ['description', 'info']
633 shareable_dirs = ['hooks', 'objects', 'rr-cache', 'svn']
634 # These objects can only be used by a single working tree.
635 working_tree_files = ['config', 'packed-refs', 'shallow']
636 working_tree_dirs = ['logs', 'refs']
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700637
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700638 def __init__(self,
639 manifest,
640 name,
641 remote,
642 gitdir,
David James8d201162013-10-11 17:03:19 -0700643 objdir,
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700644 worktree,
645 relpath,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700646 revisionExpr,
Mike Pontillod3153822012-02-28 11:53:24 -0800647 revisionId,
Anthony King7bdac712014-07-16 12:56:40 +0100648 rebase=True,
649 groups=None,
650 sync_c=False,
651 sync_s=False,
652 clone_depth=None,
653 upstream=None,
654 parent=None,
655 is_derived=False,
David Pursehouseb1553542014-09-04 21:28:09 +0900656 dest_branch=None,
Simran Basib9a1b732015-08-20 12:19:28 -0700657 optimized_fetch=False,
658 old_revision=None):
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +0800659 """Init a Project object.
660
661 Args:
662 manifest: The XmlManifest object.
663 name: The `name` attribute of manifest.xml's project element.
664 remote: RemoteSpec object specifying its remote's properties.
665 gitdir: Absolute path of git directory.
David James8d201162013-10-11 17:03:19 -0700666 objdir: Absolute path of directory to store git objects.
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +0800667 worktree: Absolute path of git working tree.
668 relpath: Relative path of git working tree to repo's top directory.
669 revisionExpr: The `revision` attribute of manifest.xml's project element.
670 revisionId: git commit id for checking out.
671 rebase: The `rebase` attribute of manifest.xml's project element.
672 groups: The `groups` attribute of manifest.xml's project element.
673 sync_c: The `sync-c` attribute of manifest.xml's project element.
674 sync_s: The `sync-s` attribute of manifest.xml's project element.
675 upstream: The `upstream` attribute of manifest.xml's project element.
676 parent: The parent Project object.
677 is_derived: False if the project was explicitly defined in the manifest;
678 True if the project is a discovered submodule.
Bryan Jacobsf609f912013-05-06 13:36:24 -0400679 dest_branch: The branch to which to push changes for review by default.
David Pursehouseb1553542014-09-04 21:28:09 +0900680 optimized_fetch: If True, when a project is set to a sha1 revision, only
681 fetch from the remote if the sha1 is not present locally.
Simran Basib9a1b732015-08-20 12:19:28 -0700682 old_revision: saved git commit id for open GITC projects.
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +0800683 """
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700684 self.manifest = manifest
685 self.name = name
686 self.remote = remote
Anthony Newnamdf14a702011-01-09 17:31:57 -0800687 self.gitdir = gitdir.replace('\\', '/')
David James8d201162013-10-11 17:03:19 -0700688 self.objdir = objdir.replace('\\', '/')
Shawn O. Pearce0ce6ca92011-01-10 13:26:01 -0800689 if worktree:
Mark E. Hamiltonf9fe3e12016-02-23 18:10:42 -0700690 self.worktree = os.path.normpath(worktree.replace('\\', '/'))
Shawn O. Pearce0ce6ca92011-01-10 13:26:01 -0800691 else:
692 self.worktree = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700693 self.relpath = relpath
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700694 self.revisionExpr = revisionExpr
695
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700696 if revisionId is None \
697 and revisionExpr \
698 and IsId(revisionExpr):
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700699 self.revisionId = revisionExpr
700 else:
701 self.revisionId = revisionId
702
Mike Pontillod3153822012-02-28 11:53:24 -0800703 self.rebase = rebase
Colin Cross5acde752012-03-28 20:15:45 -0700704 self.groups = groups
Anatol Pomazau79770d22012-04-20 14:41:59 -0700705 self.sync_c = sync_c
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +0800706 self.sync_s = sync_s
David Pursehouseede7f122012-11-27 22:25:30 +0900707 self.clone_depth = clone_depth
Brian Harring14a66742012-09-28 20:21:57 -0700708 self.upstream = upstream
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +0800709 self.parent = parent
710 self.is_derived = is_derived
David Pursehouseb1553542014-09-04 21:28:09 +0900711 self.optimized_fetch = optimized_fetch
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +0800712 self.subprojects = []
Mike Pontillod3153822012-02-28 11:53:24 -0800713
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700714 self.snapshots = {}
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700715 self.copyfiles = []
Jeff Hamiltone0df2322014-04-21 17:10:59 -0500716 self.linkfiles = []
James W. Mills24c13082012-04-12 15:04:13 -0500717 self.annotations = []
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700718 self.config = GitConfig.ForRepository(gitdir=self.gitdir,
719 defaults=self.manifest.globalConfig)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700720
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800721 if self.worktree:
David James8d201162013-10-11 17:03:19 -0700722 self.work_git = self._GitGetByExec(self, bare=False, gitdir=gitdir)
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800723 else:
724 self.work_git = None
David James8d201162013-10-11 17:03:19 -0700725 self.bare_git = self._GitGetByExec(self, bare=True, gitdir=gitdir)
Shawn O. Pearced237b692009-04-17 18:49:50 -0700726 self.bare_ref = GitRefs(gitdir)
David James8d201162013-10-11 17:03:19 -0700727 self.bare_objdir = self._GitGetByExec(self, bare=True, gitdir=objdir)
Bryan Jacobsf609f912013-05-06 13:36:24 -0400728 self.dest_branch = dest_branch
Simran Basib9a1b732015-08-20 12:19:28 -0700729 self.old_revision = old_revision
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700730
Doug Anderson37282b42011-03-04 11:54:18 -0800731 # This will be filled in if a project is later identified to be the
732 # project containing repo hooks.
733 self.enabled_repo_hooks = []
734
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700735 @property
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +0800736 def Derived(self):
737 return self.is_derived
738
739 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700740 def Exists(self):
Kevin Degi384b3c52014-10-16 16:02:58 -0600741 return os.path.isdir(self.gitdir) and os.path.isdir(self.objdir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700742
743 @property
744 def CurrentBranch(self):
745 """Obtain the name of the currently checked out branch.
746 The branch name omits the 'refs/heads/' prefix.
747 None is returned if the project is on a detached HEAD.
748 """
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700749 b = self.work_git.GetHead()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700750 if b.startswith(R_HEADS):
751 return b[len(R_HEADS):]
752 return None
753
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700754 def IsRebaseInProgress(self):
755 w = self.worktree
756 g = os.path.join(w, '.git')
757 return os.path.exists(os.path.join(g, 'rebase-apply')) \
758 or os.path.exists(os.path.join(g, 'rebase-merge')) \
759 or os.path.exists(os.path.join(w, '.dotest'))
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200760
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700761 def IsDirty(self, consider_untracked=True):
762 """Is the working directory modified in some way?
763 """
764 self.work_git.update_index('-q',
765 '--unmerged',
766 '--ignore-missing',
767 '--refresh')
David Pursehouse8f62fb72012-11-14 12:09:38 +0900768 if self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700769 return True
770 if self.work_git.DiffZ('diff-files'):
771 return True
772 if consider_untracked and self.work_git.LsOthers():
773 return True
774 return False
775
776 _userident_name = None
777 _userident_email = None
778
779 @property
780 def UserName(self):
781 """Obtain the user's personal name.
782 """
783 if self._userident_name is None:
784 self._LoadUserIdentity()
785 return self._userident_name
786
787 @property
788 def UserEmail(self):
789 """Obtain the user's email address. This is very likely
790 to be their Gerrit login.
791 """
792 if self._userident_email is None:
793 self._LoadUserIdentity()
794 return self._userident_email
795
796 def _LoadUserIdentity(self):
David Pursehousec1b86a22012-11-14 11:36:51 +0900797 u = self.bare_git.var('GIT_COMMITTER_IDENT')
798 m = re.compile("^(.*) <([^>]*)> ").match(u)
799 if m:
800 self._userident_name = m.group(1)
801 self._userident_email = m.group(2)
802 else:
803 self._userident_name = ''
804 self._userident_email = ''
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700805
806 def GetRemote(self, name):
807 """Get the configuration for a single remote.
808 """
809 return self.config.GetRemote(name)
810
811 def GetBranch(self, name):
812 """Get the configuration for a single branch.
813 """
814 return self.config.GetBranch(name)
815
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700816 def GetBranches(self):
817 """Get all existing local branches.
818 """
819 current = self.CurrentBranch
David Pursehouse8a68ff92012-09-24 12:15:13 +0900820 all_refs = self._allrefs
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700821 heads = {}
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700822
Chirayu Desai217ea7d2013-03-01 19:14:38 +0530823 for name, ref_id in all_refs.items():
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700824 if name.startswith(R_HEADS):
825 name = name[len(R_HEADS):]
826 b = self.GetBranch(name)
827 b.current = name == current
828 b.published = None
David Pursehouse8a68ff92012-09-24 12:15:13 +0900829 b.revision = ref_id
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700830 heads[name] = b
831
Chirayu Desai217ea7d2013-03-01 19:14:38 +0530832 for name, ref_id in all_refs.items():
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700833 if name.startswith(R_PUB):
834 name = name[len(R_PUB):]
835 b = heads.get(name)
836 if b:
David Pursehouse8a68ff92012-09-24 12:15:13 +0900837 b.published = ref_id
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700838
839 return heads
840
Colin Cross5acde752012-03-28 20:15:45 -0700841 def MatchesGroups(self, manifest_groups):
842 """Returns true if the manifest groups specified at init should cause
843 this project to be synced.
844 Prefixing a manifest group with "-" inverts the meaning of a group.
Conley Owensbb1b5f52012-08-13 13:11:18 -0700845 All projects are implicitly labelled with "all".
Conley Owens971de8e2012-04-16 10:36:08 -0700846
847 labels are resolved in order. In the example case of
Conley Owensbb1b5f52012-08-13 13:11:18 -0700848 project_groups: "all,group1,group2"
Conley Owens971de8e2012-04-16 10:36:08 -0700849 manifest_groups: "-group1,group2"
850 the project will be matched.
David Holmer0a1c6a12012-11-14 19:19:00 -0500851
852 The special manifest group "default" will match any project that
853 does not have the special project group "notdefault"
Colin Cross5acde752012-03-28 20:15:45 -0700854 """
David Holmer0a1c6a12012-11-14 19:19:00 -0500855 expanded_manifest_groups = manifest_groups or ['default']
Conley Owensbb1b5f52012-08-13 13:11:18 -0700856 expanded_project_groups = ['all'] + (self.groups or [])
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700857 if 'notdefault' not in expanded_project_groups:
David Holmer0a1c6a12012-11-14 19:19:00 -0500858 expanded_project_groups += ['default']
Conley Owensbb1b5f52012-08-13 13:11:18 -0700859
Conley Owens971de8e2012-04-16 10:36:08 -0700860 matched = False
Conley Owensbb1b5f52012-08-13 13:11:18 -0700861 for group in expanded_manifest_groups:
862 if group.startswith('-') and group[1:] in expanded_project_groups:
Conley Owens971de8e2012-04-16 10:36:08 -0700863 matched = False
Conley Owensbb1b5f52012-08-13 13:11:18 -0700864 elif group in expanded_project_groups:
Conley Owens971de8e2012-04-16 10:36:08 -0700865 matched = True
Colin Cross5acde752012-03-28 20:15:45 -0700866
Conley Owens971de8e2012-04-16 10:36:08 -0700867 return matched
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700868
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700869# Status Display ##
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700870 def UncommitedFiles(self, get_all=True):
871 """Returns a list of strings, uncommitted files in the git tree.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700872
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700873 Args:
874 get_all: a boolean, if True - get information about all different
875 uncommitted files. If False - return as soon as any kind of
876 uncommitted files is detected.
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500877 """
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700878 details = []
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500879 self.work_git.update_index('-q',
880 '--unmerged',
881 '--ignore-missing',
882 '--refresh')
883 if self.IsRebaseInProgress():
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700884 details.append("rebase in progress")
885 if not get_all:
886 return details
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500887
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700888 changes = self.work_git.DiffZ('diff-index', '--cached', HEAD).keys()
889 if changes:
890 details.extend(changes)
891 if not get_all:
892 return details
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500893
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700894 changes = self.work_git.DiffZ('diff-files').keys()
895 if changes:
896 details.extend(changes)
897 if not get_all:
898 return details
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500899
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700900 changes = self.work_git.LsOthers()
901 if changes:
902 details.extend(changes)
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500903
Vadim Bendebury14e134d2014-10-05 15:40:30 -0700904 return details
905
906 def HasChanges(self):
907 """Returns true if there are uncommitted changes.
908 """
909 if self.UncommitedFiles(get_all=False):
910 return True
911 else:
912 return False
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500913
Andrew Wheeler4d5bb682012-02-27 13:52:22 -0600914 def PrintWorkTreeStatus(self, output_redir=None, quiet=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700915 """Prints the status of the repository to stdout.
Terence Haddock4655e812011-03-31 12:33:34 +0200916
917 Args:
918 output: If specified, redirect the output to this object.
Andrew Wheeler4d5bb682012-02-27 13:52:22 -0600919 quiet: If True then only print the project name. Do not print
920 the modified files, branch name, etc.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700921 """
922 if not os.path.isdir(self.worktree):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700923 if output_redir is None:
Terence Haddock4655e812011-03-31 12:33:34 +0200924 output_redir = sys.stdout
Sarah Owenscecd1d82012-11-01 22:59:27 -0700925 print(file=output_redir)
926 print('project %s/' % self.relpath, file=output_redir)
927 print(' missing (run "repo sync")', file=output_redir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700928 return
929
930 self.work_git.update_index('-q',
931 '--unmerged',
932 '--ignore-missing',
933 '--refresh')
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700934 rb = self.IsRebaseInProgress()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700935 di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
936 df = self.work_git.DiffZ('diff-files')
937 do = self.work_git.LsOthers()
Ali Utku Selen76abcc12012-01-25 10:51:12 +0100938 if not rb and not di and not df and not do and not self.CurrentBranch:
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700939 return 'CLEAN'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700940
941 out = StatusColoring(self.config)
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700942 if output_redir is not None:
Terence Haddock4655e812011-03-31 12:33:34 +0200943 out.redirect(output_redir)
Jakub Vrana0402cd82014-09-09 15:39:15 -0700944 out.project('project %-40s', self.relpath + '/ ')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700945
Andrew Wheeler4d5bb682012-02-27 13:52:22 -0600946 if quiet:
947 out.nl()
948 return 'DIRTY'
949
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700950 branch = self.CurrentBranch
951 if branch is None:
952 out.nobranch('(*** NO BRANCH ***)')
953 else:
954 out.branch('branch %s', branch)
955 out.nl()
956
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700957 if rb:
958 out.important('prior sync failed; rebase still in progress')
959 out.nl()
960
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700961 paths = list()
962 paths.extend(di.keys())
963 paths.extend(df.keys())
964 paths.extend(do)
965
Chirayu Desai217ea7d2013-03-01 19:14:38 +0530966 for p in sorted(set(paths)):
David Pursehouse5c6eeac2012-10-11 16:44:48 +0900967 try:
968 i = di[p]
969 except KeyError:
970 i = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700971
David Pursehouse5c6eeac2012-10-11 16:44:48 +0900972 try:
973 f = df[p]
974 except KeyError:
975 f = None
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200976
David Pursehouse5c6eeac2012-10-11 16:44:48 +0900977 if i:
978 i_status = i.status.upper()
979 else:
980 i_status = '-'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700981
David Pursehouse5c6eeac2012-10-11 16:44:48 +0900982 if f:
983 f_status = f.status.lower()
984 else:
985 f_status = '-'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700986
987 if i and i.src_path:
Shawn O. Pearcefe086752009-03-03 13:49:48 -0800988 line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -0700989 i.src_path, p, i.level)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700990 else:
991 line = ' %s%s\t%s' % (i_status, f_status, p)
992
993 if i and not f:
994 out.added('%s', line)
995 elif (i and f) or (not i and f):
996 out.changed('%s', line)
997 elif not i and not f:
998 out.untracked('%s', line)
999 else:
1000 out.write('%s', line)
1001 out.nl()
Terence Haddock4655e812011-03-31 12:33:34 +02001002
Shawn O. Pearce161f4452009-04-10 17:41:44 -07001003 return 'DIRTY'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001004
pelyad67872d2012-03-28 14:49:58 +03001005 def PrintWorkTreeDiff(self, absolute_paths=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001006 """Prints the status of the repository to stdout.
1007 """
1008 out = DiffColoring(self.config)
1009 cmd = ['diff']
1010 if out.is_on:
1011 cmd.append('--color')
1012 cmd.append(HEAD)
pelyad67872d2012-03-28 14:49:58 +03001013 if absolute_paths:
1014 cmd.append('--src-prefix=a/%s/' % self.relpath)
1015 cmd.append('--dst-prefix=b/%s/' % self.relpath)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001016 cmd.append('--')
1017 p = GitCommand(self,
1018 cmd,
Anthony King7bdac712014-07-16 12:56:40 +01001019 capture_stdout=True,
1020 capture_stderr=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001021 has_diff = False
1022 for line in p.process.stdout:
1023 if not has_diff:
1024 out.nl()
1025 out.project('project %s/' % self.relpath)
1026 out.nl()
1027 has_diff = True
Sarah Owenscecd1d82012-11-01 22:59:27 -07001028 print(line[:-1])
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001029 p.Wait()
1030
1031
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001032# Publish / Upload ##
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001033
David Pursehouse8a68ff92012-09-24 12:15:13 +09001034 def WasPublished(self, branch, all_refs=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001035 """Was the branch published (uploaded) for code review?
1036 If so, returns the SHA-1 hash of the last published
1037 state for the branch.
1038 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001039 key = R_PUB + branch
David Pursehouse8a68ff92012-09-24 12:15:13 +09001040 if all_refs is None:
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001041 try:
1042 return self.bare_git.rev_parse(key)
1043 except GitError:
1044 return None
1045 else:
1046 try:
David Pursehouse8a68ff92012-09-24 12:15:13 +09001047 return all_refs[key]
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001048 except KeyError:
1049 return None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001050
David Pursehouse8a68ff92012-09-24 12:15:13 +09001051 def CleanPublishedCache(self, all_refs=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001052 """Prunes any stale published refs.
1053 """
David Pursehouse8a68ff92012-09-24 12:15:13 +09001054 if all_refs is None:
1055 all_refs = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001056 heads = set()
1057 canrm = {}
Chirayu Desai217ea7d2013-03-01 19:14:38 +05301058 for name, ref_id in all_refs.items():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001059 if name.startswith(R_HEADS):
1060 heads.add(name)
1061 elif name.startswith(R_PUB):
David Pursehouse8a68ff92012-09-24 12:15:13 +09001062 canrm[name] = ref_id
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001063
Chirayu Desai217ea7d2013-03-01 19:14:38 +05301064 for name, ref_id in canrm.items():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001065 n = name[len(R_PUB):]
1066 if R_HEADS + n not in heads:
David Pursehouse8a68ff92012-09-24 12:15:13 +09001067 self.bare_git.DeleteRef(name, ref_id)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001068
Mandeep Singh Bainesd6c93a22011-05-26 10:34:11 -07001069 def GetUploadableBranches(self, selected_branch=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001070 """List any branches which can be uploaded for review.
1071 """
1072 heads = {}
1073 pubed = {}
1074
Chirayu Desai217ea7d2013-03-01 19:14:38 +05301075 for name, ref_id in self._allrefs.items():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001076 if name.startswith(R_HEADS):
David Pursehouse8a68ff92012-09-24 12:15:13 +09001077 heads[name[len(R_HEADS):]] = ref_id
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001078 elif name.startswith(R_PUB):
David Pursehouse8a68ff92012-09-24 12:15:13 +09001079 pubed[name[len(R_PUB):]] = ref_id
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001080
1081 ready = []
Chirayu Desai217ea7d2013-03-01 19:14:38 +05301082 for branch, ref_id in heads.items():
David Pursehouse8a68ff92012-09-24 12:15:13 +09001083 if branch in pubed and pubed[branch] == ref_id:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001084 continue
Mandeep Singh Bainesd6c93a22011-05-26 10:34:11 -07001085 if selected_branch and branch != selected_branch:
1086 continue
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001087
Shawn O. Pearce35f25962008-11-11 17:03:13 -08001088 rb = self.GetUploadableBranch(branch)
1089 if rb:
1090 ready.append(rb)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001091 return ready
1092
Shawn O. Pearce35f25962008-11-11 17:03:13 -08001093 def GetUploadableBranch(self, branch_name):
1094 """Get a single uploadable branch, or None.
1095 """
1096 branch = self.GetBranch(branch_name)
1097 base = branch.LocalMerge
1098 if branch.LocalMerge:
1099 rb = ReviewableBranch(self, branch, base)
1100 if rb.commits:
1101 return rb
1102 return None
1103
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -07001104 def UploadForReview(self, branch=None,
Anthony King7bdac712014-07-16 12:56:40 +01001105 people=([], []),
Brian Harring435370c2012-07-28 15:37:04 -07001106 auto_topic=False,
Bryan Jacobsf609f912013-05-06 13:36:24 -04001107 draft=False,
1108 dest_branch=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001109 """Uploads the named branch for code review.
1110 """
1111 if branch is None:
1112 branch = self.CurrentBranch
1113 if branch is None:
1114 raise GitError('not currently on a branch')
1115
1116 branch = self.GetBranch(branch)
1117 if not branch.LocalMerge:
1118 raise GitError('branch %s does not track a remote' % branch.name)
1119 if not branch.remote.review:
1120 raise GitError('remote %s has no review url' % branch.remote.name)
1121
Bryan Jacobsf609f912013-05-06 13:36:24 -04001122 if dest_branch is None:
1123 dest_branch = self.dest_branch
1124 if dest_branch is None:
1125 dest_branch = branch.merge
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001126 if not dest_branch.startswith(R_HEADS):
1127 dest_branch = R_HEADS + dest_branch
1128
Shawn O. Pearce339ba9f2008-11-06 09:52:51 -08001129 if not branch.remote.projectname:
1130 branch.remote.projectname = self.name
1131 branch.remote.Save()
1132
Shawn O. Pearcec9571422012-01-11 14:58:54 -08001133 url = branch.remote.ReviewUrl(self.UserEmail)
1134 if url is None:
1135 raise UploadError('review not configured')
1136 cmd = ['push']
Shawn O. Pearceb54a3922009-01-05 16:18:58 -08001137
Shawn O. Pearcec9571422012-01-11 14:58:54 -08001138 if url.startswith('ssh://'):
Shawn O. Pearceb54a3922009-01-05 16:18:58 -08001139 rp = ['gerrit receive-pack']
1140 for e in people[0]:
1141 rp.append('--reviewer=%s' % sq(e))
1142 for e in people[1]:
1143 rp.append('--cc=%s' % sq(e))
Shawn O. Pearceb54a3922009-01-05 16:18:58 -08001144 cmd.append('--receive-pack=%s' % " ".join(rp))
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -07001145
Shawn O. Pearcec9571422012-01-11 14:58:54 -08001146 cmd.append(url)
Shawn O. Pearceb54a3922009-01-05 16:18:58 -08001147
Shawn O. Pearcec9571422012-01-11 14:58:54 -08001148 if dest_branch.startswith(R_HEADS):
1149 dest_branch = dest_branch[len(R_HEADS):]
Brian Harring435370c2012-07-28 15:37:04 -07001150
1151 upload_type = 'for'
1152 if draft:
1153 upload_type = 'drafts'
1154
1155 ref_spec = '%s:refs/%s/%s' % (R_HEADS + branch.name, upload_type,
1156 dest_branch)
Shawn O. Pearcec9571422012-01-11 14:58:54 -08001157 if auto_topic:
1158 ref_spec = ref_spec + '/' + branch.name
Shawn Pearce45d21682013-02-28 00:35:51 -08001159 if not url.startswith('ssh://'):
1160 rp = ['r=%s' % p for p in people[0]] + \
1161 ['cc=%s' % p for p in people[1]]
1162 if rp:
1163 ref_spec = ref_spec + '%' + ','.join(rp)
Shawn O. Pearcec9571422012-01-11 14:58:54 -08001164 cmd.append(ref_spec)
1165
Anthony King7bdac712014-07-16 12:56:40 +01001166 if GitCommand(self, cmd, bare=True).Wait() != 0:
Shawn O. Pearcec9571422012-01-11 14:58:54 -08001167 raise UploadError('Upload failed')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001168
1169 msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
1170 self.bare_git.UpdateRef(R_PUB + branch.name,
1171 R_HEADS + branch.name,
Anthony King7bdac712014-07-16 12:56:40 +01001172 message=msg)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001173
1174
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001175# Sync ##
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001176
Julien Campergue335f5ef2013-10-16 11:02:35 +02001177 def _ExtractArchive(self, tarpath, path=None):
1178 """Extract the given tar on its current location
1179
1180 Args:
1181 - tarpath: The path to the actual tar file
1182
1183 """
1184 try:
1185 with tarfile.open(tarpath, 'r') as tar:
1186 tar.extractall(path=path)
1187 return True
1188 except (IOError, tarfile.TarError) as e:
David Pursehousef33929d2015-08-24 14:39:14 +09001189 _error("Cannot extract archive %s: %s", tarpath, str(e))
Julien Campergue335f5ef2013-10-16 11:02:35 +02001190 return False
1191
Shawn O. Pearcee02ac0a2012-03-14 15:36:59 -07001192 def Sync_NetworkHalf(self,
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001193 quiet=False,
1194 is_new=None,
1195 current_branch_only=False,
1196 force_sync=False,
1197 clone_bundle=True,
1198 no_tags=False,
1199 archive=False,
1200 optimized_fetch=False,
1201 prune=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001202 """Perform only the network IO portion of the sync process.
1203 Local working directory/branch state is not affected.
1204 """
Julien Campergue335f5ef2013-10-16 11:02:35 +02001205 if archive and not isinstance(self, MetaProject):
1206 if self.remote.url.startswith(('http://', 'https://')):
David Pursehousef33929d2015-08-24 14:39:14 +09001207 _error("%s: Cannot fetch archives from http/https remotes.", self.name)
Julien Campergue335f5ef2013-10-16 11:02:35 +02001208 return False
1209
1210 name = self.relpath.replace('\\', '/')
1211 name = name.replace('/', '_')
1212 tarpath = '%s.tar' % name
1213 topdir = self.manifest.topdir
1214
1215 try:
1216 self._FetchArchive(tarpath, cwd=topdir)
1217 except GitError as e:
David Pursehousef33929d2015-08-24 14:39:14 +09001218 _error('%s', e)
Julien Campergue335f5ef2013-10-16 11:02:35 +02001219 return False
1220
1221 # From now on, we only need absolute tarpath
1222 tarpath = os.path.join(topdir, tarpath)
1223
1224 if not self._ExtractArchive(tarpath, path=topdir):
1225 return False
1226 try:
1227 os.remove(tarpath)
1228 except OSError as e:
David Pursehousef33929d2015-08-24 14:39:14 +09001229 _warn("Cannot remove archive %s: %s", tarpath, str(e))
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001230 self._CopyAndLinkFiles()
Julien Campergue335f5ef2013-10-16 11:02:35 +02001231 return True
Shawn O. Pearcef322b9a2011-09-19 14:50:58 -07001232 if is_new is None:
1233 is_new = not self.Exists
Shawn O. Pearce88443382010-10-08 10:02:09 +02001234 if is_new:
Kevin Degiabaa7f32014-11-12 11:27:45 -07001235 self._InitGitDir(force_sync=force_sync)
Jimmie Westera0444582012-10-24 13:44:42 +02001236 else:
1237 self._UpdateHooks()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001238 self._InitRemote()
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07001239
1240 if is_new:
1241 alt = os.path.join(self.gitdir, 'objects/info/alternates')
1242 try:
1243 fd = open(alt, 'rb')
1244 try:
1245 alt_dir = fd.readline().rstrip()
1246 finally:
1247 fd.close()
1248 except IOError:
1249 alt_dir = None
1250 else:
1251 alt_dir = None
1252
Shawn O. Pearcee02ac0a2012-03-14 15:36:59 -07001253 if clone_bundle \
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001254 and alt_dir is None \
1255 and self._ApplyCloneBundle(initial=is_new, quiet=quiet):
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07001256 is_new = False
1257
Shawn O. Pearce6ba6ba02012-05-24 09:46:50 -07001258 if not current_branch_only:
1259 if self.sync_c:
1260 current_branch_only = True
1261 elif not self.manifest._loaded:
1262 # Manifest cannot check defaults until it syncs.
1263 current_branch_only = False
1264 elif self.manifest.default.sync_c:
1265 current_branch_only = True
1266
Aymen Bouaziz6c594462016-10-25 18:03:51 +02001267 if self.clone_depth:
1268 depth = self.clone_depth
1269 else:
1270 depth = self.manifest.manifestProject.config.GetString('repo.depth')
1271
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001272 need_to_fetch = not (optimized_fetch and
1273 (ID_RE.match(self.revisionExpr) and
1274 self._CheckForSha1()))
1275 if (need_to_fetch and
1276 not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir,
1277 current_branch_only=current_branch_only,
Aymen Bouaziz6c594462016-10-25 18:03:51 +02001278 no_tags=no_tags, prune=prune, depth=depth)):
Anthony King7bdac712014-07-16 12:56:40 +01001279 return False
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001280
1281 if self.worktree:
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001282 self._InitMRef()
1283 else:
1284 self._InitMirrorHead()
1285 try:
1286 os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
1287 except OSError:
1288 pass
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001289 return True
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001290
1291 def PostRepoUpgrade(self):
1292 self._InitHooks()
1293
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001294 def _CopyAndLinkFiles(self):
Simran Basib9a1b732015-08-20 12:19:28 -07001295 if self.manifest.isGitcClient:
1296 return
David Pursehouse8a68ff92012-09-24 12:15:13 +09001297 for copyfile in self.copyfiles:
1298 copyfile._Copy()
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001299 for linkfile in self.linkfiles:
1300 linkfile._Link()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001301
Julien Camperguedd654222014-01-09 16:21:37 +01001302 def GetCommitRevisionId(self):
1303 """Get revisionId of a commit.
1304
1305 Use this method instead of GetRevisionId to get the id of the commit rather
1306 than the id of the current git object (for example, a tag)
1307
1308 """
1309 if not self.revisionExpr.startswith(R_TAGS):
1310 return self.GetRevisionId(self._allrefs)
1311
1312 try:
1313 return self.bare_git.rev_list(self.revisionExpr, '-1')[0]
1314 except GitError:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001315 raise ManifestInvalidRevisionError('revision %s in %s not found' %
1316 (self.revisionExpr, self.name))
Julien Camperguedd654222014-01-09 16:21:37 +01001317
David Pursehouse8a68ff92012-09-24 12:15:13 +09001318 def GetRevisionId(self, all_refs=None):
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001319 if self.revisionId:
1320 return self.revisionId
1321
1322 rem = self.GetRemote(self.remote.name)
1323 rev = rem.ToLocal(self.revisionExpr)
1324
David Pursehouse8a68ff92012-09-24 12:15:13 +09001325 if all_refs is not None and rev in all_refs:
1326 return all_refs[rev]
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001327
1328 try:
1329 return self.bare_git.rev_parse('--verify', '%s^0' % rev)
1330 except GitError:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001331 raise ManifestInvalidRevisionError('revision %s in %s not found' %
1332 (self.revisionExpr, self.name))
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001333
Kevin Degiabaa7f32014-11-12 11:27:45 -07001334 def Sync_LocalHalf(self, syncbuf, force_sync=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001335 """Perform only the local IO portion of the sync process.
1336 Network access is not required.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001337 """
Kevin Degiabaa7f32014-11-12 11:27:45 -07001338 self._InitWorkTree(force_sync=force_sync)
David Pursehouse8a68ff92012-09-24 12:15:13 +09001339 all_refs = self.bare_ref.all
1340 self.CleanPublishedCache(all_refs)
1341 revid = self.GetRevisionId(all_refs)
Skyler Kaufman835cd682011-03-08 12:14:41 -08001342
David Pursehouse1d947b32012-10-25 12:23:11 +09001343 def _doff():
1344 self._FastForward(revid)
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001345 self._CopyAndLinkFiles()
David Pursehouse1d947b32012-10-25 12:23:11 +09001346
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001347 head = self.work_git.GetHead()
1348 if head.startswith(R_HEADS):
1349 branch = head[len(R_HEADS):]
1350 try:
David Pursehouse8a68ff92012-09-24 12:15:13 +09001351 head = all_refs[head]
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001352 except KeyError:
1353 head = None
1354 else:
1355 branch = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001356
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001357 if branch is None or syncbuf.detach_head:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001358 # Currently on a detached HEAD. The user is assumed to
1359 # not have any local modifications worth worrying about.
1360 #
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -07001361 if self.IsRebaseInProgress():
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001362 syncbuf.fail(self, _PriorSyncFailedError())
1363 return
1364
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001365 if head == revid:
1366 # No changes; don't do anything further.
Florian Vallee7cf1b362012-06-07 17:11:42 +02001367 # Except if the head needs to be detached
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001368 #
Florian Vallee7cf1b362012-06-07 17:11:42 +02001369 if not syncbuf.detach_head:
Dan Willemsen029eaf32015-09-03 12:52:28 -07001370 # The copy/linkfile config may have changed.
1371 self._CopyAndLinkFiles()
Florian Vallee7cf1b362012-06-07 17:11:42 +02001372 return
1373 else:
1374 lost = self._revlist(not_rev(revid), HEAD)
1375 if lost:
1376 syncbuf.info(self, "discarding %d commits", len(lost))
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001377
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001378 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001379 self._Checkout(revid, quiet=True)
Sarah Owensa5be53f2012-09-09 15:37:57 -07001380 except GitError as e:
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001381 syncbuf.fail(self, e)
1382 return
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001383 self._CopyAndLinkFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001384 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001385
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001386 if head == revid:
1387 # No changes; don't do anything further.
1388 #
Dan Willemsen029eaf32015-09-03 12:52:28 -07001389 # The copy/linkfile config may have changed.
1390 self._CopyAndLinkFiles()
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001391 return
1392
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001393 branch = self.GetBranch(branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001394
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001395 if not branch.LocalMerge:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001396 # The current branch has no tracking configuration.
Anatol Pomazau2a32f6a2011-08-30 10:52:33 -07001397 # Jump off it to a detached HEAD.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001398 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001399 syncbuf.info(self,
1400 "leaving %s; does not track upstream",
1401 branch.name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001402 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001403 self._Checkout(revid, quiet=True)
Sarah Owensa5be53f2012-09-09 15:37:57 -07001404 except GitError as e:
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001405 syncbuf.fail(self, e)
1406 return
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001407 self._CopyAndLinkFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001408 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001409
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001410 upstream_gain = self._revlist(not_rev(HEAD), revid)
David Pursehouse8a68ff92012-09-24 12:15:13 +09001411 pub = self.WasPublished(branch.name, all_refs)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001412 if pub:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001413 not_merged = self._revlist(not_rev(revid), pub)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001414 if not_merged:
1415 if upstream_gain:
1416 # The user has published this branch and some of those
1417 # commits are not yet merged upstream. We do not want
1418 # to rewrite the published commits so we punt.
1419 #
Daniel Sandler4c50dee2010-03-02 15:38:03 -05001420 syncbuf.fail(self,
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001421 "branch %s is published (but not merged) and is now "
1422 "%d commits behind" % (branch.name, len(upstream_gain)))
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001423 return
Shawn O. Pearce05f66b62009-04-21 08:26:32 -07001424 elif pub == head:
1425 # All published commits are merged, and thus we are a
1426 # strict subset. We can fast-forward safely.
Shawn O. Pearcea54c5272008-10-30 11:03:00 -07001427 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001428 syncbuf.later1(self, _doff)
1429 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001430
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001431 # Examine the local commits not in the remote. Find the
1432 # last one attributed to this user, if any.
1433 #
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001434 local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce')
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001435 last_mine = None
1436 cnt_mine = 0
1437 for commit in local_changes:
Chirayu Desai0eb35cb2013-11-19 18:46:29 +05301438 commit_id, committer_email = commit.decode('utf-8').split(' ', 1)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001439 if committer_email == self.UserEmail:
1440 last_mine = commit_id
1441 cnt_mine += 1
1442
Shawn O. Pearceda88ff42009-06-03 11:09:12 -07001443 if not upstream_gain and cnt_mine == len(local_changes):
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001444 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001445
1446 if self.IsDirty(consider_untracked=False):
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001447 syncbuf.fail(self, _DirtyError())
1448 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001449
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001450 # If the upstream switched on us, warn the user.
1451 #
1452 if branch.merge != self.revisionExpr:
1453 if branch.merge and self.revisionExpr:
1454 syncbuf.info(self,
1455 'manifest switched %s...%s',
1456 branch.merge,
1457 self.revisionExpr)
1458 elif branch.merge:
1459 syncbuf.info(self,
1460 'manifest no longer tracks %s',
1461 branch.merge)
1462
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001463 if cnt_mine < len(local_changes):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001464 # Upstream rebased. Not everything in HEAD
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001465 # was created by this user.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001466 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001467 syncbuf.info(self,
1468 "discarding %d commits removed from upstream",
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001469 len(local_changes) - cnt_mine)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001470
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001471 branch.remote = self.GetRemote(self.remote.name)
Anatol Pomazaucd7c5de2012-03-20 13:45:00 -07001472 if not ID_RE.match(self.revisionExpr):
1473 # in case of manifest sync the revisionExpr might be a SHA1
1474 branch.merge = self.revisionExpr
Conley Owens04f2f0e2014-10-01 17:22:46 -07001475 if not branch.merge.startswith('refs/'):
1476 branch.merge = R_HEADS + branch.merge
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001477 branch.Save()
1478
Mike Pontillod3153822012-02-28 11:53:24 -08001479 if cnt_mine > 0 and self.rebase:
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001480 def _dorebase():
Anthony King7bdac712014-07-16 12:56:40 +01001481 self._Rebase(upstream='%s^1' % last_mine, onto=revid)
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001482 self._CopyAndLinkFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001483 syncbuf.later2(self, _dorebase)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001484 elif local_changes:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001485 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001486 self._ResetHard(revid)
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001487 self._CopyAndLinkFiles()
Sarah Owensa5be53f2012-09-09 15:37:57 -07001488 except GitError as e:
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001489 syncbuf.fail(self, e)
1490 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001491 else:
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001492 syncbuf.later1(self, _doff)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001493
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -08001494 def AddCopyFile(self, src, dest, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001495 # dest should already be an absolute path, but src is project relative
1496 # make src an absolute path
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -08001497 abssrc = os.path.join(self.worktree, src)
1498 self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001499
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001500 def AddLinkFile(self, src, dest, absdest):
1501 # dest should already be an absolute path, but src is project relative
Colin Cross0184dcc2015-05-05 00:24:54 -07001502 # make src relative path to dest
1503 absdestdir = os.path.dirname(absdest)
1504 relsrc = os.path.relpath(os.path.join(self.worktree, src), absdestdir)
Wink Saville4c426ef2015-06-03 08:05:17 -07001505 self.linkfiles.append(_LinkFile(self.worktree, src, dest, relsrc, absdest))
Jeff Hamiltone0df2322014-04-21 17:10:59 -05001506
James W. Mills24c13082012-04-12 15:04:13 -05001507 def AddAnnotation(self, name, value, keep):
1508 self.annotations.append(_Annotation(name, value, keep))
1509
Shawn O. Pearce632768b2008-10-23 11:58:52 -07001510 def DownloadPatchSet(self, change_id, patch_id):
1511 """Download a single patch set of a single change to FETCH_HEAD.
1512 """
1513 remote = self.GetRemote(self.remote.name)
1514
1515 cmd = ['fetch', remote.name]
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001516 cmd.append('refs/changes/%2.2d/%d/%d'
Shawn O. Pearce632768b2008-10-23 11:58:52 -07001517 % (change_id % 100, change_id, patch_id))
Shawn O. Pearce632768b2008-10-23 11:58:52 -07001518 if GitCommand(self, cmd, bare=True).Wait() != 0:
1519 return None
1520 return DownloadedChange(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001521 self.GetRevisionId(),
Shawn O. Pearce632768b2008-10-23 11:58:52 -07001522 change_id,
1523 patch_id,
1524 self.bare_git.rev_parse('FETCH_HEAD'))
1525
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001526
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001527# Branch Management ##
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001528
Simran Basib9a1b732015-08-20 12:19:28 -07001529 def StartBranch(self, name, branch_merge=''):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001530 """Create a new branch off the manifest's revision.
1531 """
Simran Basib9a1b732015-08-20 12:19:28 -07001532 if not branch_merge:
1533 branch_merge = self.revisionExpr
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001534 head = self.work_git.GetHead()
1535 if head == (R_HEADS + name):
1536 return True
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001537
David Pursehouse8a68ff92012-09-24 12:15:13 +09001538 all_refs = self.bare_ref.all
Anthony King7bdac712014-07-16 12:56:40 +01001539 if R_HEADS + name in all_refs:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001540 return GitCommand(self,
Shawn O. Pearce89e717d2009-04-18 15:04:41 -07001541 ['checkout', name, '--'],
Anthony King7bdac712014-07-16 12:56:40 +01001542 capture_stdout=True,
1543 capture_stderr=True).Wait() == 0
Shawn O. Pearce0a389e92009-04-10 16:21:18 -07001544
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001545 branch = self.GetBranch(name)
1546 branch.remote = self.GetRemote(self.remote.name)
Simran Basib9a1b732015-08-20 12:19:28 -07001547 branch.merge = branch_merge
1548 if not branch.merge.startswith('refs/') and not ID_RE.match(branch_merge):
1549 branch.merge = R_HEADS + branch_merge
David Pursehouse8a68ff92012-09-24 12:15:13 +09001550 revid = self.GetRevisionId(all_refs)
Shawn O. Pearce0a389e92009-04-10 16:21:18 -07001551
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001552 if head.startswith(R_HEADS):
1553 try:
David Pursehouse8a68ff92012-09-24 12:15:13 +09001554 head = all_refs[head]
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001555 except KeyError:
1556 head = None
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001557 if revid and head and revid == head:
1558 ref = os.path.join(self.gitdir, R_HEADS + name)
1559 try:
1560 os.makedirs(os.path.dirname(ref))
1561 except OSError:
1562 pass
1563 _lwrite(ref, '%s\n' % revid)
1564 _lwrite(os.path.join(self.worktree, '.git', HEAD),
1565 'ref: %s%s\n' % (R_HEADS, name))
1566 branch.Save()
1567 return True
1568
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001569 if GitCommand(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001570 ['checkout', '-b', branch.name, revid],
Anthony King7bdac712014-07-16 12:56:40 +01001571 capture_stdout=True,
1572 capture_stderr=True).Wait() == 0:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -07001573 branch.Save()
1574 return True
1575 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001576
Wink Saville02d79452009-04-10 13:01:24 -07001577 def CheckoutBranch(self, name):
1578 """Checkout a local topic branch.
Doug Anderson3ba5f952011-04-07 12:51:04 -07001579
1580 Args:
1581 name: The name of the branch to checkout.
1582
1583 Returns:
1584 True if the checkout succeeded; False if it didn't; None if the branch
1585 didn't exist.
Wink Saville02d79452009-04-10 13:01:24 -07001586 """
Shawn O. Pearce89e717d2009-04-18 15:04:41 -07001587 rev = R_HEADS + name
1588 head = self.work_git.GetHead()
1589 if head == rev:
1590 # Already on the branch
1591 #
1592 return True
Wink Saville02d79452009-04-10 13:01:24 -07001593
David Pursehouse8a68ff92012-09-24 12:15:13 +09001594 all_refs = self.bare_ref.all
Wink Saville02d79452009-04-10 13:01:24 -07001595 try:
David Pursehouse8a68ff92012-09-24 12:15:13 +09001596 revid = all_refs[rev]
Shawn O. Pearce89e717d2009-04-18 15:04:41 -07001597 except KeyError:
1598 # Branch does not exist in this project
1599 #
Doug Anderson3ba5f952011-04-07 12:51:04 -07001600 return None
Wink Saville02d79452009-04-10 13:01:24 -07001601
Shawn O. Pearce89e717d2009-04-18 15:04:41 -07001602 if head.startswith(R_HEADS):
1603 try:
David Pursehouse8a68ff92012-09-24 12:15:13 +09001604 head = all_refs[head]
Shawn O. Pearce89e717d2009-04-18 15:04:41 -07001605 except KeyError:
1606 head = None
1607
1608 if head == revid:
1609 # Same revision; just update HEAD to point to the new
1610 # target branch, but otherwise take no other action.
1611 #
1612 _lwrite(os.path.join(self.worktree, '.git', HEAD),
1613 'ref: %s%s\n' % (R_HEADS, name))
1614 return True
1615
1616 return GitCommand(self,
1617 ['checkout', name, '--'],
Anthony King7bdac712014-07-16 12:56:40 +01001618 capture_stdout=True,
1619 capture_stderr=True).Wait() == 0
Wink Saville02d79452009-04-10 13:01:24 -07001620
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -08001621 def AbandonBranch(self, name):
1622 """Destroy a local topic branch.
Doug Andersondafb1d62011-04-07 11:46:59 -07001623
1624 Args:
1625 name: The name of the branch to abandon.
1626
1627 Returns:
1628 True if the abandon succeeded; False if it didn't; None if the branch
1629 didn't exist.
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -08001630 """
Shawn O. Pearce552ac892009-04-18 15:15:24 -07001631 rev = R_HEADS + name
David Pursehouse8a68ff92012-09-24 12:15:13 +09001632 all_refs = self.bare_ref.all
1633 if rev not in all_refs:
Doug Andersondafb1d62011-04-07 11:46:59 -07001634 # Doesn't exist
1635 return None
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -08001636
Shawn O. Pearce552ac892009-04-18 15:15:24 -07001637 head = self.work_git.GetHead()
1638 if head == rev:
1639 # We can't destroy the branch while we are sitting
1640 # on it. Switch to a detached HEAD.
1641 #
David Pursehouse8a68ff92012-09-24 12:15:13 +09001642 head = all_refs[head]
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -08001643
David Pursehouse8a68ff92012-09-24 12:15:13 +09001644 revid = self.GetRevisionId(all_refs)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001645 if head == revid:
Shawn O. Pearce552ac892009-04-18 15:15:24 -07001646 _lwrite(os.path.join(self.worktree, '.git', HEAD),
1647 '%s\n' % revid)
1648 else:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001649 self._Checkout(revid, quiet=True)
Shawn O. Pearce552ac892009-04-18 15:15:24 -07001650
1651 return GitCommand(self,
1652 ['branch', '-D', name],
Anthony King7bdac712014-07-16 12:56:40 +01001653 capture_stdout=True,
1654 capture_stderr=True).Wait() == 0
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -08001655
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001656 def PruneHeads(self):
1657 """Prune any topic branches already merged into upstream.
1658 """
1659 cb = self.CurrentBranch
1660 kill = []
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -08001661 left = self._allrefs
1662 for name in left.keys():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001663 if name.startswith(R_HEADS):
1664 name = name[len(R_HEADS):]
1665 if cb is None or name != cb:
1666 kill.append(name)
1667
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001668 rev = self.GetRevisionId(left)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001669 if cb is not None \
1670 and not self._revlist(HEAD + '...' + rev) \
Anthony King7bdac712014-07-16 12:56:40 +01001671 and not self.IsDirty(consider_untracked=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001672 self.work_git.DetachHead(HEAD)
1673 kill.append(cb)
1674
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001675 if kill:
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001676 old = self.bare_git.GetHead()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001677
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001678 try:
1679 self.bare_git.DetachHead(rev)
1680
1681 b = ['branch', '-d']
1682 b.extend(kill)
1683 b = GitCommand(self, b, bare=True,
1684 capture_stdout=True,
1685 capture_stderr=True)
1686 b.Wait()
1687 finally:
Dan Willemsen1a799d12015-12-15 13:40:05 -08001688 if ID_RE.match(old):
1689 self.bare_git.DetachHead(old)
1690 else:
1691 self.bare_git.SetHead(old)
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -08001692 left = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001693
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -08001694 for branch in kill:
1695 if (R_HEADS + branch) not in left:
1696 self.CleanPublishedCache()
1697 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001698
1699 if cb and cb not in kill:
1700 kill.append(cb)
Shawn O. Pearce7c6c64d2009-03-02 12:38:13 -08001701 kill.sort()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001702
1703 kept = []
1704 for branch in kill:
Anthony King7bdac712014-07-16 12:56:40 +01001705 if R_HEADS + branch in left:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001706 branch = self.GetBranch(branch)
1707 base = branch.LocalMerge
1708 if not base:
1709 base = rev
1710 kept.append(ReviewableBranch(self, branch, base))
1711 return kept
1712
1713
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001714# Submodule Management ##
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001715
1716 def GetRegisteredSubprojects(self):
1717 result = []
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001718
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001719 def rec(subprojects):
1720 if not subprojects:
1721 return
1722 result.extend(subprojects)
1723 for p in subprojects:
1724 rec(p.subprojects)
1725 rec(self.subprojects)
1726 return result
1727
1728 def _GetSubmodules(self):
1729 # Unfortunately we cannot call `git submodule status --recursive` here
1730 # because the working tree might not exist yet, and it cannot be used
1731 # without a working tree in its current implementation.
1732
1733 def get_submodules(gitdir, rev):
1734 # Parse .gitmodules for submodule sub_paths and sub_urls
1735 sub_paths, sub_urls = parse_gitmodules(gitdir, rev)
1736 if not sub_paths:
1737 return []
1738 # Run `git ls-tree` to read SHAs of submodule object, which happen to be
1739 # revision of submodule repository
1740 sub_revs = git_ls_tree(gitdir, rev, sub_paths)
1741 submodules = []
1742 for sub_path, sub_url in zip(sub_paths, sub_urls):
1743 try:
1744 sub_rev = sub_revs[sub_path]
1745 except KeyError:
1746 # Ignore non-exist submodules
1747 continue
1748 submodules.append((sub_rev, sub_path, sub_url))
1749 return submodules
1750
1751 re_path = re.compile(r'^submodule\.([^.]+)\.path=(.*)$')
1752 re_url = re.compile(r'^submodule\.([^.]+)\.url=(.*)$')
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001753
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001754 def parse_gitmodules(gitdir, rev):
1755 cmd = ['cat-file', 'blob', '%s:.gitmodules' % rev]
1756 try:
Anthony King7bdac712014-07-16 12:56:40 +01001757 p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True,
1758 bare=True, gitdir=gitdir)
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001759 except GitError:
1760 return [], []
1761 if p.Wait() != 0:
1762 return [], []
1763
1764 gitmodules_lines = []
1765 fd, temp_gitmodules_path = tempfile.mkstemp()
1766 try:
1767 os.write(fd, p.stdout)
1768 os.close(fd)
1769 cmd = ['config', '--file', temp_gitmodules_path, '--list']
Anthony King7bdac712014-07-16 12:56:40 +01001770 p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True,
1771 bare=True, gitdir=gitdir)
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001772 if p.Wait() != 0:
1773 return [], []
1774 gitmodules_lines = p.stdout.split('\n')
1775 except GitError:
1776 return [], []
1777 finally:
1778 os.remove(temp_gitmodules_path)
1779
1780 names = set()
1781 paths = {}
1782 urls = {}
1783 for line in gitmodules_lines:
1784 if not line:
1785 continue
1786 m = re_path.match(line)
1787 if m:
1788 names.add(m.group(1))
1789 paths[m.group(1)] = m.group(2)
1790 continue
1791 m = re_url.match(line)
1792 if m:
1793 names.add(m.group(1))
1794 urls[m.group(1)] = m.group(2)
1795 continue
1796 names = sorted(names)
1797 return ([paths.get(name, '') for name in names],
1798 [urls.get(name, '') for name in names])
1799
1800 def git_ls_tree(gitdir, rev, paths):
1801 cmd = ['ls-tree', rev, '--']
1802 cmd.extend(paths)
1803 try:
Anthony King7bdac712014-07-16 12:56:40 +01001804 p = GitCommand(None, cmd, capture_stdout=True, capture_stderr=True,
1805 bare=True, gitdir=gitdir)
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001806 except GitError:
1807 return []
1808 if p.Wait() != 0:
1809 return []
1810 objects = {}
1811 for line in p.stdout.split('\n'):
1812 if not line.strip():
1813 continue
1814 object_rev, object_path = line.split()[2:4]
1815 objects[object_path] = object_rev
1816 return objects
1817
1818 try:
1819 rev = self.GetRevisionId()
1820 except GitError:
1821 return []
1822 return get_submodules(self.gitdir, rev)
1823
1824 def GetDerivedSubprojects(self):
1825 result = []
1826 if not self.Exists:
1827 # If git repo does not exist yet, querying its submodules will
1828 # mess up its states; so return here.
1829 return result
1830 for rev, path, url in self._GetSubmodules():
1831 name = self.manifest.GetSubprojectName(self, path)
David James8d201162013-10-11 17:03:19 -07001832 relpath, worktree, gitdir, objdir = \
1833 self.manifest.GetSubprojectPaths(self, name, path)
1834 project = self.manifest.paths.get(relpath)
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001835 if project:
1836 result.extend(project.GetDerivedSubprojects())
1837 continue
David James8d201162013-10-11 17:03:19 -07001838
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001839 remote = RemoteSpec(self.remote.name,
Anthony King7bdac712014-07-16 12:56:40 +01001840 url=url,
Steve Raed6480452016-08-10 15:00:00 -07001841 pushUrl=self.remote.pushUrl,
Anthony King7bdac712014-07-16 12:56:40 +01001842 review=self.remote.review,
1843 revision=self.remote.revision)
1844 subproject = Project(manifest=self.manifest,
1845 name=name,
1846 remote=remote,
1847 gitdir=gitdir,
1848 objdir=objdir,
1849 worktree=worktree,
1850 relpath=relpath,
Aymen Bouaziz2598ed02016-06-24 14:34:08 +02001851 revisionExpr=rev,
Anthony King7bdac712014-07-16 12:56:40 +01001852 revisionId=rev,
1853 rebase=self.rebase,
1854 groups=self.groups,
1855 sync_c=self.sync_c,
1856 sync_s=self.sync_s,
1857 parent=self,
1858 is_derived=True)
Che-Liang Chioub2bd91c2012-01-11 11:28:42 +08001859 result.append(subproject)
1860 result.extend(subproject.GetDerivedSubprojects())
1861 return result
1862
1863
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07001864# Direct Git Commands ##
Chris AtLee2fb64662014-01-16 21:32:33 -05001865 def _CheckForSha1(self):
1866 try:
1867 # if revision (sha or tag) is not present then following function
1868 # throws an error.
1869 self.bare_git.rev_parse('--verify', '%s^0' % self.revisionExpr)
1870 return True
1871 except GitError:
1872 # There is no such persistent revision. We have to fetch it.
1873 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001874
Julien Campergue335f5ef2013-10-16 11:02:35 +02001875 def _FetchArchive(self, tarpath, cwd=None):
1876 cmd = ['archive', '-v', '-o', tarpath]
1877 cmd.append('--remote=%s' % self.remote.url)
1878 cmd.append('--prefix=%s/' % self.relpath)
1879 cmd.append(self.revisionExpr)
1880
1881 command = GitCommand(self, cmd, cwd=cwd,
1882 capture_stdout=True,
1883 capture_stderr=True)
1884
1885 if command.Wait() != 0:
1886 raise GitError('git archive %s: %s' % (self.name, command.stderr))
1887
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07001888 def _RemoteFetch(self, name=None,
1889 current_branch_only=False,
Shawn O. Pearce16614f82010-10-29 12:05:43 -07001890 initial=False,
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07001891 quiet=False,
Mitchel Humpherys597868b2012-10-29 10:18:34 -07001892 alt_dir=None,
David Pursehouse74cfd272015-10-14 10:50:15 +09001893 no_tags=False,
Aymen Bouaziz6c594462016-10-25 18:03:51 +02001894 prune=False,
1895 depth=None):
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07001896
1897 is_sha1 = False
1898 tag_name = None
David Pursehouse9bc422f2014-04-15 10:28:56 +09001899 # The depth should not be used when fetching to a mirror because
1900 # it will result in a shallow repository that cannot be cloned or
1901 # fetched from.
Aymen Bouaziz6c594462016-10-25 18:03:51 +02001902 # The repo project should also never be synced with partial depth.
1903 if self.manifest.IsMirror or self.relpath == '.repo/repo':
1904 depth = None
David Pursehouse9bc422f2014-04-15 10:28:56 +09001905
Shawn Pearce69e04d82014-01-29 12:48:54 -08001906 if depth:
1907 current_branch_only = True
1908
Nasser Grainawi909d58b2014-09-19 12:13:04 -06001909 if ID_RE.match(self.revisionExpr) is not None:
1910 is_sha1 = True
1911
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07001912 if current_branch_only:
Nasser Grainawi909d58b2014-09-19 12:13:04 -06001913 if self.revisionExpr.startswith(R_TAGS):
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07001914 # this is a tag and its sha1 value should never change
1915 tag_name = self.revisionExpr[len(R_TAGS):]
1916
1917 if is_sha1 or tag_name is not None:
Chris AtLee2fb64662014-01-16 21:32:33 -05001918 if self._CheckForSha1():
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07001919 return True
Bertrand SIMONNET3000cda2014-11-25 16:19:29 -08001920 if is_sha1 and not depth:
1921 # When syncing a specific commit and --depth is not set:
1922 # * if upstream is explicitly specified and is not a sha1, fetch only
1923 # upstream as users expect only upstream to be fetch.
1924 # Note: The commit might not be in upstream in which case the sync
1925 # will fail.
1926 # * otherwise, fetch all branches to make sure we end up with the
1927 # specific commit.
Aymen Bouaziz037040f2016-06-28 12:27:23 +02001928 if self.upstream:
1929 current_branch_only = not ID_RE.match(self.upstream)
1930 else:
1931 current_branch_only = False
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07001932
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001933 if not name:
1934 name = self.remote.name
Shawn O. Pearcefb231612009-04-10 18:53:46 -07001935
1936 ssh_proxy = False
Shawn O. Pearcef322b9a2011-09-19 14:50:58 -07001937 remote = self.GetRemote(name)
1938 if remote.PreConnectFetch():
Shawn O. Pearcefb231612009-04-10 18:53:46 -07001939 ssh_proxy = True
1940
Shawn O. Pearce88443382010-10-08 10:02:09 +02001941 if initial:
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07001942 if alt_dir and 'objects' == os.path.basename(alt_dir):
1943 ref_dir = os.path.dirname(alt_dir)
Shawn O. Pearce88443382010-10-08 10:02:09 +02001944 packed_refs = os.path.join(self.gitdir, 'packed-refs')
1945 remote = self.GetRemote(name)
1946
David Pursehouse8a68ff92012-09-24 12:15:13 +09001947 all_refs = self.bare_ref.all
1948 ids = set(all_refs.values())
Shawn O. Pearce88443382010-10-08 10:02:09 +02001949 tmp = set()
1950
Chirayu Desai217ea7d2013-03-01 19:14:38 +05301951 for r, ref_id in GitRefs(ref_dir).all.items():
David Pursehouse8a68ff92012-09-24 12:15:13 +09001952 if r not in all_refs:
Shawn O. Pearce88443382010-10-08 10:02:09 +02001953 if r.startswith(R_TAGS) or remote.WritesTo(r):
David Pursehouse8a68ff92012-09-24 12:15:13 +09001954 all_refs[r] = ref_id
1955 ids.add(ref_id)
Shawn O. Pearce88443382010-10-08 10:02:09 +02001956 continue
1957
David Pursehouse8a68ff92012-09-24 12:15:13 +09001958 if ref_id in ids:
Shawn O. Pearce88443382010-10-08 10:02:09 +02001959 continue
1960
David Pursehouse8a68ff92012-09-24 12:15:13 +09001961 r = 'refs/_alt/%s' % ref_id
1962 all_refs[r] = ref_id
1963 ids.add(ref_id)
Shawn O. Pearce88443382010-10-08 10:02:09 +02001964 tmp.add(r)
1965
Shawn O. Pearce88443382010-10-08 10:02:09 +02001966 tmp_packed = ''
1967 old_packed = ''
1968
Chirayu Desai217ea7d2013-03-01 19:14:38 +05301969 for r in sorted(all_refs):
David Pursehouse8a68ff92012-09-24 12:15:13 +09001970 line = '%s %s\n' % (all_refs[r], r)
Shawn O. Pearce88443382010-10-08 10:02:09 +02001971 tmp_packed += line
1972 if r not in tmp:
1973 old_packed += line
1974
1975 _lwrite(packed_refs, tmp_packed)
Shawn O. Pearce88443382010-10-08 10:02:09 +02001976 else:
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07001977 alt_dir = None
Shawn O. Pearce88443382010-10-08 10:02:09 +02001978
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001979 cmd = ['fetch']
Doug Anderson30d45292011-05-04 15:01:04 -07001980
Conley Owensf97e8382015-01-21 11:12:46 -08001981 if depth:
Doug Anderson30d45292011-05-04 15:01:04 -07001982 cmd.append('--depth=%s' % depth)
Dan Willemseneeab6862015-08-03 13:11:53 -07001983 else:
1984 # If this repo has shallow objects, then we don't know which refs have
1985 # shallow objects or not. Tell git to unshallow all fetched refs. Don't
1986 # do this with projects that don't have shallow objects, since it is less
1987 # efficient.
1988 if os.path.exists(os.path.join(self.gitdir, 'shallow')):
1989 cmd.append('--depth=2147483647')
Doug Anderson30d45292011-05-04 15:01:04 -07001990
Shawn O. Pearce16614f82010-10-29 12:05:43 -07001991 if quiet:
1992 cmd.append('--quiet')
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001993 if not self.worktree:
1994 cmd.append('--update-head-ok')
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07001995 cmd.append(name)
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07001996
Mitchel Humpherys26c45a72014-03-10 14:21:59 -07001997 # If using depth then we should not get all the tags since they may
1998 # be outside of the depth.
1999 if no_tags or depth:
2000 cmd.append('--no-tags')
2001 else:
2002 cmd.append('--tags')
2003
David Pursehouse74cfd272015-10-14 10:50:15 +09002004 if prune:
2005 cmd.append('--prune')
2006
Conley Owens80b87fe2014-05-09 17:13:44 -07002007 spec = []
Brian Harring14a66742012-09-28 20:21:57 -07002008 if not current_branch_only:
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07002009 # Fetch whole repo
Conley Owens80b87fe2014-05-09 17:13:44 -07002010 spec.append(str((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*')))
Anatol Pomazau53d6f4d2011-08-25 17:21:47 -07002011 elif tag_name is not None:
Conley Owens80b87fe2014-05-09 17:13:44 -07002012 spec.append('tag')
2013 spec.append(tag_name)
Nasser Grainawi04e52d62014-09-30 13:34:52 -06002014
David Pursehouse403b64e2015-04-27 10:41:33 +09002015 if not self.manifest.IsMirror:
2016 branch = self.revisionExpr
Kevin Degi679bac42015-06-22 15:31:26 -06002017 if is_sha1 and depth and git_require((1, 8, 3)):
David Pursehouse403b64e2015-04-27 10:41:33 +09002018 # Shallow checkout of a specific commit, fetch from that commit and not
2019 # the heads only as the commit might be deeper in the history.
2020 spec.append(branch)
2021 else:
2022 if is_sha1:
2023 branch = self.upstream
2024 if branch is not None and branch.strip():
2025 if not branch.startswith('refs/'):
2026 branch = R_HEADS + branch
2027 spec.append(str((u'+%s:' % branch) + remote.ToLocal(branch)))
Conley Owens80b87fe2014-05-09 17:13:44 -07002028 cmd.extend(spec)
2029
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002030 ok = False
David Pursehouse8a68ff92012-09-24 12:15:13 +09002031 for _i in range(2):
John L. Villalovos9c76f672015-03-16 20:49:10 -07002032 gitcmd = GitCommand(self, cmd, bare=True, ssh_proxy=ssh_proxy)
John L. Villalovos126e2982015-01-29 21:58:12 -08002033 ret = gitcmd.Wait()
Brian Harring14a66742012-09-28 20:21:57 -07002034 if ret == 0:
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002035 ok = True
2036 break
John L. Villalovos126e2982015-01-29 21:58:12 -08002037 # If needed, run the 'git remote prune' the first time through the loop
2038 elif (not _i and
2039 "error:" in gitcmd.stderr and
2040 "git remote prune" in gitcmd.stderr):
2041 prunecmd = GitCommand(self, ['remote', 'prune', name], bare=True,
John L. Villalovos9c76f672015-03-16 20:49:10 -07002042 ssh_proxy=ssh_proxy)
John L. Villalovose30f46b2015-02-25 14:27:02 -08002043 ret = prunecmd.Wait()
John L. Villalovose30f46b2015-02-25 14:27:02 -08002044 if ret:
John L. Villalovos126e2982015-01-29 21:58:12 -08002045 break
2046 continue
Brian Harring14a66742012-09-28 20:21:57 -07002047 elif current_branch_only and is_sha1 and ret == 128:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002048 # Exit code 128 means "couldn't find the ref you asked for"; if we're
2049 # in sha1 mode, we just tried sync'ing from the upstream field; it
2050 # doesn't exist, thus abort the optimization attempt and do a full sync.
Brian Harring14a66742012-09-28 20:21:57 -07002051 break
Colin Crossc4b301f2015-05-13 00:10:02 -07002052 elif ret < 0:
2053 # Git died with a signal, exit immediately
2054 break
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002055 time.sleep(random.randint(30, 45))
Shawn O. Pearce88443382010-10-08 10:02:09 +02002056
2057 if initial:
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002058 if alt_dir:
Shawn O. Pearce88443382010-10-08 10:02:09 +02002059 if old_packed != '':
2060 _lwrite(packed_refs, old_packed)
2061 else:
2062 os.remove(packed_refs)
2063 self.bare_git.pack_refs('--all', '--prune')
Brian Harring14a66742012-09-28 20:21:57 -07002064
Aymen Bouaziz6c594462016-10-25 18:03:51 +02002065 if is_sha1 and current_branch_only:
Brian Harring14a66742012-09-28 20:21:57 -07002066 # We just synced the upstream given branch; verify we
2067 # got what we wanted, else trigger a second run of all
2068 # refs.
Chris AtLee2fb64662014-01-16 21:32:33 -05002069 if not self._CheckForSha1():
Aymen Bouaziz6c594462016-10-25 18:03:51 +02002070 if current_branch_only and depth:
2071 # Sync the current branch only with depth set to None
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002072 return self._RemoteFetch(name=name,
2073 current_branch_only=current_branch_only,
Aymen Bouaziz6c594462016-10-25 18:03:51 +02002074 initial=False, quiet=quiet, alt_dir=alt_dir,
2075 depth=None)
2076 else:
2077 # Avoid infinite recursion: sync all branches with depth set to None
2078 return self._RemoteFetch(name=name, current_branch_only=False,
2079 initial=False, quiet=quiet, alt_dir=alt_dir,
2080 depth=None)
Brian Harring14a66742012-09-28 20:21:57 -07002081
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002082 return ok
Shawn O. Pearce88443382010-10-08 10:02:09 +02002083
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002084 def _ApplyCloneBundle(self, initial=False, quiet=False):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002085 if initial and \
2086 (self.manifest.manifestProject.config.GetString('repo.depth') or
2087 self.clone_depth):
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002088 return False
2089
2090 remote = self.GetRemote(self.remote.name)
2091 bundle_url = remote.url + '/clone.bundle'
2092 bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url)
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002093 if GetSchemeFromUrl(bundle_url) not in ('http', 'https',
2094 'persistent-http',
2095 'persistent-https'):
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002096 return False
2097
2098 bundle_dst = os.path.join(self.gitdir, 'clone.bundle')
2099 bundle_tmp = os.path.join(self.gitdir, 'clone.bundle.tmp')
2100
2101 exist_dst = os.path.exists(bundle_dst)
2102 exist_tmp = os.path.exists(bundle_tmp)
2103
2104 if not initial and not exist_dst and not exist_tmp:
2105 return False
2106
2107 if not exist_dst:
2108 exist_dst = self._FetchBundle(bundle_url, bundle_tmp, bundle_dst, quiet)
2109 if not exist_dst:
2110 return False
2111
2112 cmd = ['fetch']
2113 if quiet:
2114 cmd.append('--quiet')
2115 if not self.worktree:
2116 cmd.append('--update-head-ok')
2117 cmd.append(bundle_dst)
2118 for f in remote.fetch:
2119 cmd.append(str(f))
2120 cmd.append('refs/tags/*:refs/tags/*')
2121
2122 ok = GitCommand(self, cmd, bare=True).Wait() == 0
Shawn O. Pearcef322b9a2011-09-19 14:50:58 -07002123 if os.path.exists(bundle_dst):
2124 os.remove(bundle_dst)
2125 if os.path.exists(bundle_tmp):
2126 os.remove(bundle_tmp)
Shawn O. Pearce88443382010-10-08 10:02:09 +02002127 return ok
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002128
Shawn O. Pearcec325dc32011-10-03 08:30:24 -07002129 def _FetchBundle(self, srcUrl, tmpPath, dstPath, quiet):
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -07002130 if os.path.exists(dstPath):
2131 os.remove(dstPath)
Shawn O. Pearcef322b9a2011-09-19 14:50:58 -07002132
Matt Gumbel2dc810c2012-08-30 09:39:36 -07002133 cmd = ['curl', '--fail', '--output', tmpPath, '--netrc', '--location']
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -07002134 if quiet:
2135 cmd += ['--silent']
2136 if os.path.exists(tmpPath):
2137 size = os.stat(tmpPath).st_size
2138 if size >= 1024:
2139 cmd += ['--continue-at', '%d' % (size,)]
2140 else:
Shawn O. Pearcef322b9a2011-09-19 14:50:58 -07002141 os.remove(tmpPath)
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -07002142 if 'http_proxy' in os.environ and 'darwin' == sys.platform:
2143 cmd += ['--proxy', os.environ['http_proxy']]
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002144 with GetUrlCookieFile(srcUrl, quiet) as (cookiefile, _proxy):
Dave Borowitz137d0132015-01-02 11:12:54 -08002145 if cookiefile:
Dave Borowitz4abf8e62015-01-02 11:39:04 -08002146 cmd += ['--cookie', cookiefile, '--cookie-jar', cookiefile]
Dave Borowitz137d0132015-01-02 11:12:54 -08002147 if srcUrl.startswith('persistent-'):
2148 srcUrl = srcUrl[len('persistent-'):]
2149 cmd += [srcUrl]
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -07002150
Dave Borowitz137d0132015-01-02 11:12:54 -08002151 if IsTrace():
2152 Trace('%s', ' '.join(cmd))
2153 try:
2154 proc = subprocess.Popen(cmd)
2155 except OSError:
2156 return False
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -07002157
Dave Borowitz137d0132015-01-02 11:12:54 -08002158 curlret = proc.wait()
Matt Gumbel2dc810c2012-08-30 09:39:36 -07002159
Dave Borowitz137d0132015-01-02 11:12:54 -08002160 if curlret == 22:
2161 # From curl man page:
2162 # 22: HTTP page not retrieved. The requested url was not found or
2163 # returned another error with the HTTP error code being 400 or above.
2164 # This return code only appears if -f, --fail is used.
2165 if not quiet:
2166 print("Server does not provide clone.bundle; ignoring.",
2167 file=sys.stderr)
2168 return False
Matt Gumbel2dc810c2012-08-30 09:39:36 -07002169
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -07002170 if os.path.exists(tmpPath):
Kris Giesingc8d882a2014-12-23 13:02:32 -08002171 if curlret == 0 and self._IsValidBundle(tmpPath, quiet):
Shawn O. Pearce5e7127d2012-08-02 14:57:37 -07002172 os.rename(tmpPath, dstPath)
2173 return True
2174 else:
2175 os.remove(tmpPath)
2176 return False
2177 else:
2178 return False
Shawn O. Pearcef322b9a2011-09-19 14:50:58 -07002179
Kris Giesingc8d882a2014-12-23 13:02:32 -08002180 def _IsValidBundle(self, path, quiet):
Dave Borowitz91f3ba52013-06-03 12:15:23 -07002181 try:
2182 with open(path) as f:
2183 if f.read(16) == '# v2 git bundle\n':
2184 return True
2185 else:
Kris Giesingc8d882a2014-12-23 13:02:32 -08002186 if not quiet:
2187 print("Invalid clone.bundle file; ignoring.", file=sys.stderr)
Dave Borowitz91f3ba52013-06-03 12:15:23 -07002188 return False
2189 except OSError:
2190 return False
2191
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002192 def _Checkout(self, rev, quiet=False):
2193 cmd = ['checkout']
2194 if quiet:
2195 cmd.append('-q')
2196 cmd.append(rev)
2197 cmd.append('--')
2198 if GitCommand(self, cmd).Wait() != 0:
2199 if self._allrefs:
2200 raise GitError('%s checkout %s ' % (self.name, rev))
2201
Anthony King7bdac712014-07-16 12:56:40 +01002202 def _CherryPick(self, rev):
Pierre Tardye5a21222011-03-24 16:28:18 +01002203 cmd = ['cherry-pick']
2204 cmd.append(rev)
2205 cmd.append('--')
2206 if GitCommand(self, cmd).Wait() != 0:
2207 if self._allrefs:
2208 raise GitError('%s cherry-pick %s ' % (self.name, rev))
2209
Anthony King7bdac712014-07-16 12:56:40 +01002210 def _Revert(self, rev):
Erwan Mahea94f1622011-08-19 13:56:09 +02002211 cmd = ['revert']
2212 cmd.append('--no-edit')
2213 cmd.append(rev)
2214 cmd.append('--')
2215 if GitCommand(self, cmd).Wait() != 0:
2216 if self._allrefs:
2217 raise GitError('%s revert %s ' % (self.name, rev))
2218
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002219 def _ResetHard(self, rev, quiet=True):
2220 cmd = ['reset', '--hard']
2221 if quiet:
2222 cmd.append('-q')
2223 cmd.append(rev)
2224 if GitCommand(self, cmd).Wait() != 0:
2225 raise GitError('%s reset --hard %s ' % (self.name, rev))
2226
Anthony King7bdac712014-07-16 12:56:40 +01002227 def _Rebase(self, upstream, onto=None):
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07002228 cmd = ['rebase']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002229 if onto is not None:
2230 cmd.extend(['--onto', onto])
2231 cmd.append(upstream)
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07002232 if GitCommand(self, cmd).Wait() != 0:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002233 raise GitError('%s rebase %s ' % (self.name, upstream))
2234
Pierre Tardy3d125942012-05-04 12:18:12 +02002235 def _FastForward(self, head, ffonly=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002236 cmd = ['merge', head]
Pierre Tardy3d125942012-05-04 12:18:12 +02002237 if ffonly:
2238 cmd.append("--ff-only")
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002239 if GitCommand(self, cmd).Wait() != 0:
2240 raise GitError('%s merge %s ' % (self.name, head))
2241
Kevin Degiabaa7f32014-11-12 11:27:45 -07002242 def _InitGitDir(self, mirror_git=None, force_sync=False):
Kevin Degi384b3c52014-10-16 16:02:58 -06002243 init_git_dir = not os.path.exists(self.gitdir)
2244 init_obj_dir = not os.path.exists(self.objdir)
Kevin Degib1a07b82015-07-27 13:33:43 -06002245 try:
2246 # Initialize the bare repository, which contains all of the objects.
2247 if init_obj_dir:
2248 os.makedirs(self.objdir)
2249 self.bare_objdir.init()
David James8d201162013-10-11 17:03:19 -07002250
Kevin Degib1a07b82015-07-27 13:33:43 -06002251 # If we have a separate directory to hold refs, initialize it as well.
2252 if self.objdir != self.gitdir:
2253 if init_git_dir:
2254 os.makedirs(self.gitdir)
2255
2256 if init_obj_dir or init_git_dir:
2257 self._ReferenceGitDir(self.objdir, self.gitdir, share_refs=False,
2258 copy_all=True)
Kevin Degiabaa7f32014-11-12 11:27:45 -07002259 try:
2260 self._CheckDirReference(self.objdir, self.gitdir, share_refs=False)
2261 except GitError as e:
Kevin Degiabaa7f32014-11-12 11:27:45 -07002262 if force_sync:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002263 print("Retrying clone after deleting %s" %
2264 self.gitdir, file=sys.stderr)
Kevin Degiabaa7f32014-11-12 11:27:45 -07002265 try:
2266 shutil.rmtree(os.path.realpath(self.gitdir))
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002267 if self.worktree and os.path.exists(os.path.realpath
2268 (self.worktree)):
Kevin Degiabaa7f32014-11-12 11:27:45 -07002269 shutil.rmtree(os.path.realpath(self.worktree))
2270 return self._InitGitDir(mirror_git=mirror_git, force_sync=False)
2271 except:
2272 raise e
2273 raise e
Kevin Degib1a07b82015-07-27 13:33:43 -06002274
Kevin Degi384b3c52014-10-16 16:02:58 -06002275 if init_git_dir:
Kevin Degib1a07b82015-07-27 13:33:43 -06002276 mp = self.manifest.manifestProject
2277 ref_dir = mp.config.GetString('repo.reference') or ''
Kevin Degi384b3c52014-10-16 16:02:58 -06002278
Kevin Degib1a07b82015-07-27 13:33:43 -06002279 if ref_dir or mirror_git:
2280 if not mirror_git:
2281 mirror_git = os.path.join(ref_dir, self.name + '.git')
2282 repo_git = os.path.join(ref_dir, '.repo', 'projects',
2283 self.relpath + '.git')
Shawn O. Pearce2816d4f2009-03-03 17:53:18 -08002284
Kevin Degib1a07b82015-07-27 13:33:43 -06002285 if os.path.exists(mirror_git):
2286 ref_dir = mirror_git
Shawn O. Pearce88443382010-10-08 10:02:09 +02002287
Kevin Degib1a07b82015-07-27 13:33:43 -06002288 elif os.path.exists(repo_git):
2289 ref_dir = repo_git
Shawn O. Pearce88443382010-10-08 10:02:09 +02002290
Kevin Degib1a07b82015-07-27 13:33:43 -06002291 else:
2292 ref_dir = None
Shawn O. Pearce88443382010-10-08 10:02:09 +02002293
Kevin Degib1a07b82015-07-27 13:33:43 -06002294 if ref_dir:
2295 _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'),
2296 os.path.join(ref_dir, 'objects') + '\n')
Shawn O. Pearce88443382010-10-08 10:02:09 +02002297
Kevin Degib1a07b82015-07-27 13:33:43 -06002298 self._UpdateHooks()
2299
2300 m = self.manifest.manifestProject.config
2301 for key in ['user.name', 'user.email']:
2302 if m.Has(key, include_defaults=False):
2303 self.config.SetString(key, m.GetString(key))
David Pursehouse76a4a9d2016-08-16 12:11:12 +09002304 self.config.SetString('filter.lfs.smudge', 'git-lfs smudge --skip -- %f')
Kevin Degib1a07b82015-07-27 13:33:43 -06002305 if self.manifest.IsMirror:
2306 self.config.SetString('core.bare', 'true')
Shawn O. Pearce88443382010-10-08 10:02:09 +02002307 else:
Kevin Degib1a07b82015-07-27 13:33:43 -06002308 self.config.SetString('core.bare', None)
2309 except Exception:
2310 if init_obj_dir and os.path.exists(self.objdir):
2311 shutil.rmtree(self.objdir)
2312 if init_git_dir and os.path.exists(self.gitdir):
2313 shutil.rmtree(self.gitdir)
2314 raise
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002315
Jimmie Westera0444582012-10-24 13:44:42 +02002316 def _UpdateHooks(self):
2317 if os.path.exists(self.gitdir):
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08002318 self._InitHooks()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002319
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08002320 def _InitHooks(self):
Jesse Hall672cc492013-11-27 11:17:13 -08002321 hooks = os.path.realpath(self._gitdir_path('hooks'))
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08002322 if not os.path.exists(hooks):
2323 os.makedirs(hooks)
Jonathan Nieder93719792015-03-17 11:29:58 -07002324 for stock_hook in _ProjectHooks():
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07002325 name = os.path.basename(stock_hook)
2326
Victor Boivie65e0f352011-04-18 11:23:29 +02002327 if name in ('commit-msg',) and not self.remote.review \
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002328 and self is not self.manifest.manifestProject:
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07002329 # Don't install a Gerrit Code Review hook if this
2330 # project does not appear to use it for reviews.
2331 #
Victor Boivie65e0f352011-04-18 11:23:29 +02002332 # Since the manifest project is one of those, but also
2333 # managed through gerrit, it's excluded
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07002334 continue
2335
2336 dst = os.path.join(hooks, name)
2337 if os.path.islink(dst):
2338 continue
2339 if os.path.exists(dst):
2340 if filecmp.cmp(stock_hook, dst, shallow=False):
2341 os.remove(dst)
2342 else:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002343 _warn("%s: Not replacing locally modified %s hook",
2344 self.relpath, name)
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07002345 continue
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08002346 try:
Mickaël Salaünb9477bc2012-08-05 13:39:26 +02002347 os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst)
Sarah Owensa5be53f2012-09-09 15:37:57 -07002348 except OSError as e:
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07002349 if e.errno == errno.EPERM:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08002350 raise GitError('filesystem must support symlinks')
2351 else:
2352 raise
2353
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002354 def _InitRemote(self):
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07002355 if self.remote.url:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002356 remote = self.GetRemote(self.remote.name)
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07002357 remote.url = self.remote.url
Steve Raed6480452016-08-10 15:00:00 -07002358 remote.pushUrl = self.remote.pushUrl
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07002359 remote.review = self.remote.review
2360 remote.projectname = self.name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002361
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08002362 if self.worktree:
2363 remote.ResetFetch(mirror=False)
2364 else:
2365 remote.ResetFetch(mirror=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002366 remote.Save()
2367
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002368 def _InitMRef(self):
2369 if self.manifest.branch:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07002370 self._InitAnyMRef(R_M + self.manifest.branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002371
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08002372 def _InitMirrorHead(self):
Shawn O. Pearcefe200ee2009-06-01 15:28:21 -07002373 self._InitAnyMRef(HEAD)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07002374
2375 def _InitAnyMRef(self, ref):
2376 cur = self.bare_ref.symref(ref)
2377
2378 if self.revisionId:
2379 if cur != '' or self.bare_ref.get(ref) != self.revisionId:
2380 msg = 'manifest set to %s' % self.revisionId
2381 dst = self.revisionId + '^0'
Anthony King7bdac712014-07-16 12:56:40 +01002382 self.bare_git.UpdateRef(ref, dst, message=msg, detach=True)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07002383 else:
2384 remote = self.GetRemote(self.remote.name)
2385 dst = remote.ToLocal(self.revisionExpr)
2386 if cur != dst:
2387 msg = 'manifest set to %s' % self.revisionExpr
2388 self.bare_git.symbolic_ref('-m', msg, ref, dst)
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08002389
Kevin Degi384b3c52014-10-16 16:02:58 -06002390 def _CheckDirReference(self, srcdir, destdir, share_refs):
Dan Willemsenbdb866e2016-04-05 17:22:02 -07002391 symlink_files = self.shareable_files[:]
2392 symlink_dirs = self.shareable_dirs[:]
Kevin Degi384b3c52014-10-16 16:02:58 -06002393 if share_refs:
2394 symlink_files += self.working_tree_files
2395 symlink_dirs += self.working_tree_dirs
2396 to_symlink = symlink_files + symlink_dirs
2397 for name in set(to_symlink):
2398 dst = os.path.realpath(os.path.join(destdir, name))
2399 if os.path.lexists(dst):
2400 src = os.path.realpath(os.path.join(srcdir, name))
2401 # Fail if the links are pointing to the wrong place
2402 if src != dst:
Marc Herbertec287902016-10-27 12:58:26 -07002403 _error('%s is different in %s vs %s', name, destdir, srcdir)
Kevin Degiabaa7f32014-11-12 11:27:45 -07002404 raise GitError('--force-sync not enabled; cannot overwrite a local '
Simon Ruggierf9b76832015-07-31 17:18:34 -04002405 'work tree. If you\'re comfortable with the '
2406 'possibility of losing the work tree\'s git metadata,'
2407 ' use `repo sync --force-sync {0}` to '
2408 'proceed.'.format(self.relpath))
Kevin Degi384b3c52014-10-16 16:02:58 -06002409
David James8d201162013-10-11 17:03:19 -07002410 def _ReferenceGitDir(self, gitdir, dotgit, share_refs, copy_all):
2411 """Update |dotgit| to reference |gitdir|, using symlinks where possible.
2412
2413 Args:
2414 gitdir: The bare git repository. Must already be initialized.
2415 dotgit: The repository you would like to initialize.
2416 share_refs: If true, |dotgit| will store its refs under |gitdir|.
2417 Only one work tree can store refs under a given |gitdir|.
2418 copy_all: If true, copy all remaining files from |gitdir| -> |dotgit|.
2419 This saves you the effort of initializing |dotgit| yourself.
2420 """
Dan Willemsenbdb866e2016-04-05 17:22:02 -07002421 symlink_files = self.shareable_files[:]
2422 symlink_dirs = self.shareable_dirs[:]
David James8d201162013-10-11 17:03:19 -07002423 if share_refs:
Kevin Degi384b3c52014-10-16 16:02:58 -06002424 symlink_files += self.working_tree_files
2425 symlink_dirs += self.working_tree_dirs
David James8d201162013-10-11 17:03:19 -07002426 to_symlink = symlink_files + symlink_dirs
2427
2428 to_copy = []
2429 if copy_all:
2430 to_copy = os.listdir(gitdir)
2431
Dan Willemsen2a3e1522015-07-30 20:43:33 -07002432 dotgit = os.path.realpath(dotgit)
David James8d201162013-10-11 17:03:19 -07002433 for name in set(to_copy).union(to_symlink):
2434 try:
2435 src = os.path.realpath(os.path.join(gitdir, name))
Dan Willemsen2a3e1522015-07-30 20:43:33 -07002436 dst = os.path.join(dotgit, name)
David James8d201162013-10-11 17:03:19 -07002437
Kevin Degi384b3c52014-10-16 16:02:58 -06002438 if os.path.lexists(dst):
2439 continue
David James8d201162013-10-11 17:03:19 -07002440
2441 # If the source dir doesn't exist, create an empty dir.
2442 if name in symlink_dirs and not os.path.lexists(src):
2443 os.makedirs(src)
2444
Conley Owens80b87fe2014-05-09 17:13:44 -07002445 # If the source file doesn't exist, ensure the destination
2446 # file doesn't either.
2447 if name in symlink_files and not os.path.lexists(src):
2448 try:
2449 os.remove(dst)
2450 except OSError:
2451 pass
2452
David James8d201162013-10-11 17:03:19 -07002453 if name in to_symlink:
2454 os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst)
2455 elif copy_all and not os.path.islink(dst):
2456 if os.path.isdir(src):
2457 shutil.copytree(src, dst)
2458 elif os.path.isfile(src):
2459 shutil.copy(src, dst)
2460 except OSError as e:
2461 if e.errno == errno.EPERM:
Kevin Degiabaa7f32014-11-12 11:27:45 -07002462 raise DownloadError('filesystem must support symlinks')
David James8d201162013-10-11 17:03:19 -07002463 else:
2464 raise
2465
Kevin Degiabaa7f32014-11-12 11:27:45 -07002466 def _InitWorkTree(self, force_sync=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002467 dotgit = os.path.join(self.worktree, '.git')
Kevin Degi384b3c52014-10-16 16:02:58 -06002468 init_dotgit = not os.path.exists(dotgit)
Kevin Degib1a07b82015-07-27 13:33:43 -06002469 try:
2470 if init_dotgit:
2471 os.makedirs(dotgit)
2472 self._ReferenceGitDir(self.gitdir, dotgit, share_refs=True,
2473 copy_all=False)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002474
Kevin Degiabaa7f32014-11-12 11:27:45 -07002475 try:
2476 self._CheckDirReference(self.gitdir, dotgit, share_refs=True)
2477 except GitError as e:
2478 if force_sync:
2479 try:
2480 shutil.rmtree(dotgit)
2481 return self._InitWorkTree(force_sync=False)
2482 except:
2483 raise e
2484 raise e
Kevin Degi384b3c52014-10-16 16:02:58 -06002485
Kevin Degib1a07b82015-07-27 13:33:43 -06002486 if init_dotgit:
2487 _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002488
Kevin Degib1a07b82015-07-27 13:33:43 -06002489 cmd = ['read-tree', '--reset', '-u']
2490 cmd.append('-v')
2491 cmd.append(HEAD)
2492 if GitCommand(self, cmd).Wait() != 0:
2493 raise GitError("cannot initialize work tree")
Victor Boivie0960b5b2010-11-26 13:42:13 +01002494
Kevin Degib1a07b82015-07-27 13:33:43 -06002495 self._CopyAndLinkFiles()
2496 except Exception:
2497 if init_dotgit:
2498 shutil.rmtree(dotgit)
2499 raise
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002500
2501 def _gitdir_path(self, path):
David James8d201162013-10-11 17:03:19 -07002502 return os.path.realpath(os.path.join(self.gitdir, path))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002503
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07002504 def _revlist(self, *args, **kw):
2505 a = []
2506 a.extend(args)
2507 a.append('--')
2508 return self.work_git.rev_list(*a, **kw)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002509
2510 @property
2511 def _allrefs(self):
Shawn O. Pearced237b692009-04-17 18:49:50 -07002512 return self.bare_ref.all
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002513
Sebastian Schuberth7ecccf62016-03-29 14:11:20 +02002514 def _getLogs(self, rev1, rev2, oneline=False, color=True, pretty_format=None):
Julien Camperguedd654222014-01-09 16:21:37 +01002515 """Get logs between two revisions of this project."""
2516 comp = '..'
2517 if rev1:
2518 revs = [rev1]
2519 if rev2:
2520 revs.extend([comp, rev2])
2521 cmd = ['log', ''.join(revs)]
2522 out = DiffColoring(self.config)
2523 if out.is_on and color:
2524 cmd.append('--color')
Sebastian Schuberth7ecccf62016-03-29 14:11:20 +02002525 if pretty_format is not None:
2526 cmd.append('--pretty=format:%s' % pretty_format)
Julien Camperguedd654222014-01-09 16:21:37 +01002527 if oneline:
2528 cmd.append('--oneline')
2529
2530 try:
2531 log = GitCommand(self, cmd, capture_stdout=True, capture_stderr=True)
2532 if log.Wait() == 0:
2533 return log.stdout
2534 except GitError:
2535 # worktree may not exist if groups changed for example. In that case,
2536 # try in gitdir instead.
2537 if not os.path.exists(self.worktree):
2538 return self.bare_git.log(*cmd[1:])
2539 else:
2540 raise
2541 return None
2542
Sebastian Schuberth7ecccf62016-03-29 14:11:20 +02002543 def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True,
2544 pretty_format=None):
Julien Camperguedd654222014-01-09 16:21:37 +01002545 """Get the list of logs from this revision to given revisionId"""
2546 logs = {}
2547 selfId = self.GetRevisionId(self._allrefs)
2548 toId = toProject.GetRevisionId(toProject._allrefs)
2549
Sebastian Schuberth7ecccf62016-03-29 14:11:20 +02002550 logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color,
2551 pretty_format=pretty_format)
2552 logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color,
2553 pretty_format=pretty_format)
Julien Camperguedd654222014-01-09 16:21:37 +01002554 return logs
2555
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002556 class _GitGetByExec(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002557
David James8d201162013-10-11 17:03:19 -07002558 def __init__(self, project, bare, gitdir):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002559 self._project = project
2560 self._bare = bare
David James8d201162013-10-11 17:03:19 -07002561 self._gitdir = gitdir
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002562
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002563 def LsOthers(self):
2564 p = GitCommand(self._project,
2565 ['ls-files',
2566 '-z',
2567 '--others',
2568 '--exclude-standard'],
Anthony King7bdac712014-07-16 12:56:40 +01002569 bare=False,
David James8d201162013-10-11 17:03:19 -07002570 gitdir=self._gitdir,
Anthony King7bdac712014-07-16 12:56:40 +01002571 capture_stdout=True,
2572 capture_stderr=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002573 if p.Wait() == 0:
2574 out = p.stdout
2575 if out:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002576 # Backslash is not anomalous
David Pursehouse1d947b32012-10-25 12:23:11 +09002577 return out[:-1].split('\0') # pylint: disable=W1401
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002578 return []
2579
2580 def DiffZ(self, name, *args):
2581 cmd = [name]
2582 cmd.append('-z')
2583 cmd.extend(args)
2584 p = GitCommand(self._project,
2585 cmd,
David James8d201162013-10-11 17:03:19 -07002586 gitdir=self._gitdir,
Anthony King7bdac712014-07-16 12:56:40 +01002587 bare=False,
2588 capture_stdout=True,
2589 capture_stderr=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002590 try:
2591 out = p.process.stdout.read()
2592 r = {}
2593 if out:
David Pursehouse1d947b32012-10-25 12:23:11 +09002594 out = iter(out[:-1].split('\0')) # pylint: disable=W1401
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002595 while out:
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -07002596 try:
Anthony King2cd1f042014-05-05 21:24:05 +01002597 info = next(out)
2598 path = next(out)
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -07002599 except StopIteration:
2600 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002601
2602 class _Info(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002603
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002604 def __init__(self, path, omode, nmode, oid, nid, state):
2605 self.path = path
2606 self.src_path = None
2607 self.old_mode = omode
2608 self.new_mode = nmode
2609 self.old_id = oid
2610 self.new_id = nid
2611
2612 if len(state) == 1:
2613 self.status = state
2614 self.level = None
2615 else:
2616 self.status = state[:1]
2617 self.level = state[1:]
2618 while self.level.startswith('0'):
2619 self.level = self.level[1:]
2620
2621 info = info[1:].split(' ')
David Pursehouse8f62fb72012-11-14 12:09:38 +09002622 info = _Info(path, *info)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002623 if info.status in ('R', 'C'):
2624 info.src_path = info.path
Anthony King2cd1f042014-05-05 21:24:05 +01002625 info.path = next(out)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002626 r[info.path] = info
2627 return r
2628 finally:
2629 p.Wait()
2630
2631 def GetHead(self):
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07002632 if self._bare:
2633 path = os.path.join(self._project.gitdir, HEAD)
2634 else:
2635 path = os.path.join(self._project.worktree, '.git', HEAD)
Conley Owens75ee0572012-11-15 17:33:11 -08002636 try:
2637 fd = open(path, 'rb')
Dan Sandler53e902a2014-03-09 13:20:02 -04002638 except IOError as e:
2639 raise NoManifestException(path, str(e))
Shawn O. Pearce76ca9f82009-04-18 14:48:03 -07002640 try:
2641 line = fd.read()
2642 finally:
2643 fd.close()
Chirayu Desai217ea7d2013-03-01 19:14:38 +05302644 try:
2645 line = line.decode()
2646 except AttributeError:
2647 pass
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07002648 if line.startswith('ref: '):
2649 return line[5:-1]
2650 return line[:-1]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002651
2652 def SetHead(self, ref, message=None):
2653 cmdv = []
2654 if message is not None:
2655 cmdv.extend(['-m', message])
2656 cmdv.append(HEAD)
2657 cmdv.append(ref)
2658 self.symbolic_ref(*cmdv)
2659
2660 def DetachHead(self, new, message=None):
2661 cmdv = ['--no-deref']
2662 if message is not None:
2663 cmdv.extend(['-m', message])
2664 cmdv.append(HEAD)
2665 cmdv.append(new)
2666 self.update_ref(*cmdv)
2667
2668 def UpdateRef(self, name, new, old=None,
2669 message=None,
2670 detach=False):
2671 cmdv = []
2672 if message is not None:
2673 cmdv.extend(['-m', message])
2674 if detach:
2675 cmdv.append('--no-deref')
2676 cmdv.append(name)
2677 cmdv.append(new)
2678 if old is not None:
2679 cmdv.append(old)
2680 self.update_ref(*cmdv)
2681
2682 def DeleteRef(self, name, old=None):
2683 if not old:
2684 old = self.rev_parse(name)
2685 self.update_ref('-d', name, old)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07002686 self._project.bare_ref.deleted(name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002687
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07002688 def rev_list(self, *args, **kw):
2689 if 'format' in kw:
2690 cmdv = ['log', '--pretty=format:%s' % kw['format']]
2691 else:
2692 cmdv = ['rev-list']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002693 cmdv.extend(args)
2694 p = GitCommand(self._project,
2695 cmdv,
Anthony King7bdac712014-07-16 12:56:40 +01002696 bare=self._bare,
David James8d201162013-10-11 17:03:19 -07002697 gitdir=self._gitdir,
Anthony King7bdac712014-07-16 12:56:40 +01002698 capture_stdout=True,
2699 capture_stderr=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002700 r = []
2701 for line in p.process.stdout:
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07002702 if line[-1] == '\n':
2703 line = line[:-1]
2704 r.append(line)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002705 if p.Wait() != 0:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002706 raise GitError('%s rev-list %s: %s' %
2707 (self._project.name, str(args), p.stderr))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002708 return r
2709
2710 def __getattr__(self, name):
Doug Anderson37282b42011-03-04 11:54:18 -08002711 """Allow arbitrary git commands using pythonic syntax.
2712
2713 This allows you to do things like:
2714 git_obj.rev_parse('HEAD')
2715
2716 Since we don't have a 'rev_parse' method defined, the __getattr__ will
2717 run. We'll replace the '_' with a '-' and try to run a git command.
Dave Borowitz091f8932012-10-23 17:01:04 -07002718 Any other positional arguments will be passed to the git command, and the
2719 following keyword arguments are supported:
2720 config: An optional dict of git config options to be passed with '-c'.
Doug Anderson37282b42011-03-04 11:54:18 -08002721
2722 Args:
2723 name: The name of the git command to call. Any '_' characters will
2724 be replaced with '-'.
2725
2726 Returns:
2727 A callable object that will try to call git with the named command.
2728 """
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002729 name = name.replace('_', '-')
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002730
Dave Borowitz091f8932012-10-23 17:01:04 -07002731 def runner(*args, **kwargs):
2732 cmdv = []
2733 config = kwargs.pop('config', None)
2734 for k in kwargs:
2735 raise TypeError('%s() got an unexpected keyword argument %r'
2736 % (name, k))
2737 if config is not None:
Dave Borowitzb42b4742012-10-31 12:27:27 -07002738 if not git_require((1, 7, 2)):
2739 raise ValueError('cannot set config on command line for %s()'
2740 % name)
Chirayu Desai217ea7d2013-03-01 19:14:38 +05302741 for k, v in config.items():
Dave Borowitz091f8932012-10-23 17:01:04 -07002742 cmdv.append('-c')
2743 cmdv.append('%s=%s' % (k, v))
2744 cmdv.append(name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002745 cmdv.extend(args)
2746 p = GitCommand(self._project,
2747 cmdv,
Anthony King7bdac712014-07-16 12:56:40 +01002748 bare=self._bare,
David James8d201162013-10-11 17:03:19 -07002749 gitdir=self._gitdir,
Anthony King7bdac712014-07-16 12:56:40 +01002750 capture_stdout=True,
2751 capture_stderr=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002752 if p.Wait() != 0:
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002753 raise GitError('%s %s: %s' %
2754 (self._project.name, name, p.stderr))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002755 r = p.stdout
Chirayu Desai217ea7d2013-03-01 19:14:38 +05302756 try:
Conley Owensedd01512013-09-26 12:59:58 -07002757 r = r.decode('utf-8')
Chirayu Desai217ea7d2013-03-01 19:14:38 +05302758 except AttributeError:
2759 pass
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002760 if r.endswith('\n') and r.index('\n') == len(r) - 1:
2761 return r[:-1]
2762 return r
2763 return runner
2764
2765
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002766class _PriorSyncFailedError(Exception):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002767
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002768 def __str__(self):
2769 return 'prior sync failed; rebase still in progress'
2770
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002771
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002772class _DirtyError(Exception):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002773
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002774 def __str__(self):
2775 return 'contains uncommitted changes'
2776
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002777
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002778class _InfoMessage(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002779
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002780 def __init__(self, project, text):
2781 self.project = project
2782 self.text = text
2783
2784 def Print(self, syncbuf):
2785 syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
2786 syncbuf.out.nl()
2787
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002788
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002789class _Failure(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002790
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002791 def __init__(self, project, why):
2792 self.project = project
2793 self.why = why
2794
2795 def Print(self, syncbuf):
2796 syncbuf.out.fail('error: %s/: %s',
2797 self.project.relpath,
2798 str(self.why))
2799 syncbuf.out.nl()
2800
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002801
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002802class _Later(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002803
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002804 def __init__(self, project, action):
2805 self.project = project
2806 self.action = action
2807
2808 def Run(self, syncbuf):
2809 out = syncbuf.out
2810 out.project('project %s/', self.project.relpath)
2811 out.nl()
2812 try:
2813 self.action()
2814 out.nl()
2815 return True
David Pursehouse8a68ff92012-09-24 12:15:13 +09002816 except GitError:
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002817 out.nl()
2818 return False
2819
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002820
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002821class _SyncColoring(Coloring):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002822
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002823 def __init__(self, config):
2824 Coloring.__init__(self, config, 'reposync')
Anthony King7bdac712014-07-16 12:56:40 +01002825 self.project = self.printer('header', attr='bold')
2826 self.info = self.printer('info')
2827 self.fail = self.printer('fail', fg='red')
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002828
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002829
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002830class SyncBuffer(object):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002831
Shawn O. Pearce350cde42009-04-16 11:21:18 -07002832 def __init__(self, config, detach_head=False):
2833 self._messages = []
2834 self._failures = []
2835 self._later_queue1 = []
2836 self._later_queue2 = []
2837
2838 self.out = _SyncColoring(config)
2839 self.out.redirect(sys.stderr)
2840
2841 self.detach_head = detach_head
2842 self.clean = True
2843
2844 def info(self, project, fmt, *args):
2845 self._messages.append(_InfoMessage(project, fmt % args))
2846
2847 def fail(self, project, err=None):
2848 self._failures.append(_Failure(project, err))
2849 self.clean = False
2850
2851 def later1(self, project, what):
2852 self._later_queue1.append(_Later(project, what))
2853
2854 def later2(self, project, what):
2855 self._later_queue2.append(_Later(project, what))
2856
2857 def Finish(self):
2858 self._PrintMessages()
2859 self._RunLater()
2860 self._PrintMessages()
2861 return self.clean
2862
2863 def _RunLater(self):
2864 for q in ['_later_queue1', '_later_queue2']:
2865 if not self._RunQueue(q):
2866 return
2867
2868 def _RunQueue(self, queue):
2869 for m in getattr(self, queue):
2870 if not m.Run(self):
2871 self.clean = False
2872 return False
2873 setattr(self, queue, [])
2874 return True
2875
2876 def _PrintMessages(self):
2877 for m in self._messages:
2878 m.Print(self)
2879 for m in self._failures:
2880 m.Print(self)
2881
2882 self._messages = []
2883 self._failures = []
2884
2885
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002886class MetaProject(Project):
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002887
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002888 """A special project housed under .repo.
2889 """
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002890
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002891 def __init__(self, manifest, name, gitdir, worktree):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002892 Project.__init__(self,
Anthony King7bdac712014-07-16 12:56:40 +01002893 manifest=manifest,
2894 name=name,
2895 gitdir=gitdir,
2896 objdir=gitdir,
2897 worktree=worktree,
2898 remote=RemoteSpec('origin'),
2899 relpath='.repo/%s' % name,
2900 revisionExpr='refs/heads/master',
2901 revisionId=None,
2902 groups=None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002903
2904 def PreSync(self):
2905 if self.Exists:
2906 cb = self.CurrentBranch
2907 if cb:
2908 base = self.GetBranch(cb).merge
2909 if base:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07002910 self.revisionExpr = base
2911 self.revisionId = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002912
Anthony King7bdac712014-07-16 12:56:40 +01002913 def MetaBranchSwitch(self):
Florian Vallee5d016502012-06-07 17:19:26 +02002914 """ Prepare MetaProject for manifest branch switch
2915 """
2916
2917 # detach and delete manifest branch, allowing a new
2918 # branch to take over
Anthony King7bdac712014-07-16 12:56:40 +01002919 syncbuf = SyncBuffer(self.config, detach_head=True)
Florian Vallee5d016502012-06-07 17:19:26 +02002920 self.Sync_LocalHalf(syncbuf)
2921 syncbuf.Finish()
2922
2923 return GitCommand(self,
Mark E. Hamilton30b0f4e2016-02-10 10:44:30 -07002924 ['update-ref', '-d', 'refs/heads/default'],
2925 capture_stdout=True,
2926 capture_stderr=True).Wait() == 0
Florian Vallee5d016502012-06-07 17:19:26 +02002927
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002928 @property
Shawn O. Pearcef6906872009-04-18 10:49:00 -07002929 def LastFetch(self):
2930 try:
2931 fh = os.path.join(self.gitdir, 'FETCH_HEAD')
2932 return os.path.getmtime(fh)
2933 except OSError:
2934 return 0
2935
2936 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002937 def HasChanges(self):
2938 """Has the remote received new commits not yet checked out?
2939 """
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07002940 if not self.remote or not self.revisionExpr:
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07002941 return False
2942
David Pursehouse8a68ff92012-09-24 12:15:13 +09002943 all_refs = self.bare_ref.all
2944 revid = self.GetRevisionId(all_refs)
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07002945 head = self.work_git.GetHead()
2946 if head.startswith(R_HEADS):
2947 try:
David Pursehouse8a68ff92012-09-24 12:15:13 +09002948 head = all_refs[head]
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07002949 except KeyError:
2950 head = None
2951
2952 if revid == head:
2953 return False
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07002954 elif self._revlist(not_rev(HEAD), revid):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07002955 return True
2956 return False