merge v1.12.37
1. 4350791 On project cleanup, don't remove nested projects
2. revert 76a4a9d project: Set config option to skip lfs smudge filter
diff --git a/project.py b/project.py
index 878d227..5479985 100644
--- a/project.py
+++ b/project.py
@@ -30,7 +30,8 @@
from color import Coloring
from git_command import GitCommand, git_require
-from git_config import GitConfig, IsId, GetSchemeFromUrl, GetUrlCookieFile, ID_RE
+from git_config import GitConfig, IsId, GetSchemeFromUrl, GetUrlCookieFile, \
+ ID_RE
from error import GitError, HookError, UploadError, DownloadError
from error import ManifestInvalidRevisionError
from error import NoManifestException
@@ -39,11 +40,18 @@
from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
from pyversion import is_python3
-if not is_python3():
+if is_python3():
+ import urllib.parse
+else:
+ import imp
+ import urlparse
+ urllib = imp.new_module('urllib')
+ urllib.parse = urlparse
# pylint:disable=W0622
input = raw_input
# pylint:enable=W0622
+
def _lwrite(path, content):
lock = '%s.lock' % path
@@ -59,21 +67,27 @@
os.remove(lock)
raise
+
def _error(fmt, *args):
msg = fmt % args
print('error: %s' % msg, file=sys.stderr)
+
def _warn(fmt, *args):
msg = fmt % args
print('warn: %s' % msg, file=sys.stderr)
+
def not_rev(r):
return '^' + r
+
def sq(r):
return "'" + r.replace("'", "'\''") + "'"
_project_hook_list = None
+
+
def _ProjectHooks():
"""List the hooks present in the 'hooks' directory.
@@ -107,15 +121,14 @@
@property
def commits(self):
if self._commit_cache is None:
- self._commit_cache = self.project.bare_git.rev_list(
- '--abbrev=8',
- '--abbrev-commit',
- '--pretty=oneline',
- '--reverse',
- '--date-order',
- not_rev(self.base),
- self.commit,
- '--')
+ self._commit_cache = self.project.bare_git.rev_list('--abbrev=8',
+ '--abbrev-commit',
+ '--pretty=oneline',
+ '--reverse',
+ '--date-order',
+ not_rev(self.base),
+ self.commit,
+ '--')
return self._commit_cache
@@ -134,36 +147,36 @@
@property
def commits(self):
if self._commit_cache is None:
- self._commit_cache = self.project.bare_git.rev_list(
- '--abbrev=8',
- '--abbrev-commit',
- '--pretty=oneline',
- '--reverse',
- '--date-order',
- not_rev(self.base),
- R_HEADS + self.name,
- '--')
+ self._commit_cache = self.project.bare_git.rev_list('--abbrev=8',
+ '--abbrev-commit',
+ '--pretty=oneline',
+ '--reverse',
+ '--date-order',
+ not_rev(self.base),
+ R_HEADS + self.name,
+ '--')
return self._commit_cache
@property
def unabbrev_commits(self):
r = dict()
- for commit in self.project.bare_git.rev_list(
- not_rev(self.base),
- R_HEADS + self.name,
- '--'):
+ for commit in self.project.bare_git.rev_list(not_rev(self.base),
+ R_HEADS + self.name,
+ '--'):
r[commit[0:8]] = commit
return r
@property
def date(self):
- return self.project.bare_git.log(
- '--pretty=format:%cd',
- '-n', '1',
- R_HEADS + self.name,
- '--')
+ return self.project.bare_git.log('--pretty=format:%cd',
+ '-n', '1',
+ R_HEADS + self.name,
+ '--')
- def UploadForReview(self, people, auto_topic=False, draft=False, dest_branch=None):
+ def UploadForReview(self, people,
+ auto_topic=False,
+ draft=False,
+ dest_branch=None):
self.project.UploadForReview(self.name,
people,
auto_topic=auto_topic,
@@ -173,8 +186,8 @@
def GetPublishedRefs(self):
refs = {}
output = self.project.bare_git.ls_remote(
- self.branch.remote.SshReviewUrl(self.project.UserEmail),
- 'refs/changes/*')
+ self.branch.remote.SshReviewUrl(self.project.UserEmail),
+ 'refs/changes/*')
for line in output.split('\n'):
try:
(sha, ref) = line.split()
@@ -184,7 +197,9 @@
return refs
+
class StatusColoring(Coloring):
+
def __init__(self, config):
Coloring.__init__(self, config, 'status')
self.project = self.printer('header', attr='bold')
@@ -198,17 +213,22 @@
class DiffColoring(Coloring):
+
def __init__(self, config):
Coloring.__init__(self, config, 'diff')
self.project = self.printer('header', attr='bold')
+
class _Annotation(object):
+
def __init__(self, name, value, keep):
self.name = name
self.value = value
self.keep = keep
+
class _CopyFile(object):
+
def __init__(self, src, dest, abssrc, absdest):
self.src = src
self.dest = dest
@@ -236,7 +256,9 @@
except IOError:
_error('Cannot copy file %s to %s', src, dest)
+
class _LinkFile(object):
+
def __init__(self, git_worktree, src, dest, relsrc, absdest):
self.git_worktree = git_worktree
self.src = src
@@ -275,7 +297,7 @@
absDestDir = self.abs_dest
if os.path.exists(absDestDir) and not os.path.isdir(absDestDir):
_error('Link error: src with wildcard, %s must be a directory',
- absDestDir)
+ absDestDir)
else:
absSrcFiles = glob.glob(absSrc)
for absSrcFile in absSrcFiles:
@@ -292,18 +314,26 @@
relSrc = os.path.join(relSrcDir, srcFile)
self.__linkIt(relSrc, absDest)
+
class RemoteSpec(object):
+
def __init__(self,
name,
url=None,
+ pushUrl=None,
review=None,
- revision=None):
+ revision=None,
+ orig_name=None):
self.name = name
self.url = url
+ self.pushUrl = pushUrl
self.review = review
self.revision = revision
+ self.orig_name = orig_name
+
class RepoHook(object):
+
"""A RepoHook contains information about a script to run as a hook.
Hooks are used to run a python script before running an upload (for instance,
@@ -316,10 +346,12 @@
Hooks are always python. When a hook is run, we will load the hook into the
interpreter and execute its main() function.
"""
+
def __init__(self,
hook_type,
hooks_project,
topdir,
+ manifest_url,
abort_if_user_denies=False):
"""RepoHook constructor.
@@ -333,11 +365,13 @@
topdir: Repo's top directory (the one containing the .repo directory).
Scripts will run with CWD as this directory. If you have a manifest,
this is manifest.topdir
+ manifest_url: The URL to the manifest git repo.
abort_if_user_denies: If True, we'll throw a HookError() if the user
doesn't allow us to run the hook.
"""
self._hook_type = hook_type
self._hooks_project = hooks_project
+ self._manifest_url = manifest_url
self._topdir = topdir
self._abort_if_user_denies = abort_if_user_denies
@@ -386,9 +420,9 @@
def _CheckForHookApproval(self):
"""Check to see whether this hook has been approved.
- We'll look at the hash of all of the hooks. If this matches the hash that
- the user last approved, we're done. If it doesn't, we'll ask the user
- about approval.
+ We'll accept approval of manifest URLs if they're using secure transports.
+ This way the user can say they trust the manifest hoster. For insecure
+ hosts, we fall back to checking the hash of the hooks repo.
Note that we ask permission for each individual hook even though we use
the hash of all hooks when detecting changes. We'd like the user to be
@@ -402,44 +436,58 @@
HookError: Raised if the user doesn't approve and abort_if_user_denies
was passed to the consturctor.
"""
- hooks_config = self._hooks_project.config
- git_approval_key = 'repo.hooks.%s.approvedhash' % self._hook_type
+ if self._ManifestUrlHasSecureScheme():
+ return self._CheckForHookApprovalManifest()
+ else:
+ return self._CheckForHookApprovalHash()
+
+ def _CheckForHookApprovalHelper(self, subkey, new_val, main_prompt,
+ changed_prompt):
+ """Check for approval for a particular attribute and hook.
- # Get the last hash that the user approved for this hook; may be None.
- old_hash = hooks_config.GetString(git_approval_key)
+ Args:
+ subkey: The git config key under [repo.hooks.<hook_type>] to store the
+ last approved string.
+ new_val: The new value to compare against the last approved one.
+ main_prompt: Message to display to the user to ask for approval.
+ changed_prompt: Message explaining why we're re-asking for approval.
- # Get the current hash so we can tell if scripts changed since approval.
- new_hash = self._GetHash()
+ Returns:
+ True if this hook is approved to run; False otherwise.
- if old_hash is not None:
+ Raises:
+ HookError: Raised if the user doesn't approve and abort_if_user_denies
+ was passed to the consturctor.
+ """
+ hooks_config = self._hooks_project.config
+ git_approval_key = 'repo.hooks.%s.%s' % (self._hook_type, subkey)
+
+ # Get the last value that the user approved for this hook; may be None.
+ old_val = hooks_config.GetString(git_approval_key)
+
+ if old_val is not None:
# User previously approved hook and asked not to be prompted again.
- if new_hash == old_hash:
+ if new_val == old_val:
# Approval matched. We're done.
return True
else:
# Give the user a reason why we're prompting, since they last told
# us to "never ask again".
- prompt = 'WARNING: Scripts have changed since %s was allowed.\n\n' % (
- self._hook_type)
+ prompt = 'WARNING: %s\n\n' % (changed_prompt,)
else:
prompt = ''
# Prompt the user if we're not on a tty; on a tty we'll assume "no".
if sys.stdout.isatty():
- prompt += ('Repo %s run the script:\n'
- ' %s\n'
- '\n'
- 'Do you want to allow this script to run '
- '(yes/yes-never-ask-again/NO)? ') % (
- self._GetMustVerb(), self._script_fullpath)
+ prompt += main_prompt + ' (yes/always/NO)? '
response = input(prompt).lower()
print()
# User is doing a one-time approval.
if response in ('y', 'yes'):
return True
- elif response == 'yes-never-ask-again':
- hooks_config.SetString(git_approval_key, new_hash)
+ elif response == 'always':
+ hooks_config.SetString(git_approval_key, new_val)
return True
# For anything else, we'll assume no approval.
@@ -449,6 +497,40 @@
return False
+ def _ManifestUrlHasSecureScheme(self):
+ """Check if the URI for the manifest is a secure transport."""
+ secure_schemes = ('file', 'https', 'ssh', 'persistent-https', 'sso', 'rpc')
+ parse_results = urllib.parse.urlparse(self._manifest_url)
+ return parse_results.scheme in secure_schemes
+
+ def _CheckForHookApprovalManifest(self):
+ """Check whether the user has approved this manifest host.
+
+ Returns:
+ True if this hook is approved to run; False otherwise.
+ """
+ return self._CheckForHookApprovalHelper(
+ 'approvedmanifest',
+ self._manifest_url,
+ 'Run hook scripts from %s' % (self._manifest_url,),
+ 'Manifest URL has changed since %s was allowed.' % (self._hook_type,))
+
+ def _CheckForHookApprovalHash(self):
+ """Check whether the user has approved the hooks repo.
+
+ Returns:
+ True if this hook is approved to run; False otherwise.
+ """
+ prompt = ('Repo %s run the script:\n'
+ ' %s\n'
+ '\n'
+ 'Do you want to allow this script to run')
+ return self._CheckForHookApprovalHelper(
+ 'approvedhash',
+ self._GetHash(),
+ prompt % (self._GetMustVerb(), self._script_fullpath),
+ 'Scripts have changed since %s was allowed.' % (self._hook_type,))
+
def _ExecuteHook(self, **kwargs):
"""Actually execute the given hook.
@@ -475,19 +557,18 @@
# Exec, storing global context in the context dict. We catch exceptions
# and convert to a HookError w/ just the failing traceback.
- context = {}
+ context = {'__file__': self._script_fullpath}
try:
exec(compile(open(self._script_fullpath).read(),
self._script_fullpath, 'exec'), context)
except Exception:
- raise HookError('%s\nFailed to import %s hook; see traceback above.' % (
- traceback.format_exc(), self._hook_type))
+ raise HookError('%s\nFailed to import %s hook; see traceback above.' %
+ (traceback.format_exc(), self._hook_type))
# Running the script should have defined a main() function.
if 'main' not in context:
raise HookError('Missing main() in: "%s"' % self._script_fullpath)
-
# Add 'hook_should_take_kwargs' to the arguments to be passed to main.
# We don't actually want hooks to define their main with this argument--
# it's there to remind them that their hook should always take **kwargs.
@@ -505,8 +586,8 @@
context['main'](**kwargs)
except Exception:
raise HookError('%s\nFailed to run main() for %s hook; see traceback '
- 'above.' % (
- traceback.format_exc(), self._hook_type))
+ 'above.' % (traceback.format_exc(),
+ self._hook_type))
finally:
# Restore sys.path and CWD.
sys.path = orig_syspath
@@ -530,8 +611,8 @@
to run a required hook (from _CheckForHookApproval).
"""
# No-op if there is no hooks project or if hook is disabled.
- if ((not self._hooks_project) or
- (self._hook_type not in self._hooks_project.enabled_repo_hooks)):
+ if ((not self._hooks_project) or (self._hook_type not in
+ self._hooks_project.enabled_repo_hooks)):
return
# Bail with a nice error if we can't find the hook.
@@ -553,6 +634,7 @@
# These objects can only be used by a single working tree.
working_tree_files = ['config', 'packed-refs', 'shallow']
working_tree_dirs = ['logs', 'refs']
+
def __init__(self,
manifest,
name,
@@ -607,15 +689,15 @@
self.gitdir = gitdir.replace('\\', '/')
self.objdir = objdir.replace('\\', '/')
if worktree:
- self.worktree = worktree.replace('\\', '/')
+ self.worktree = os.path.normpath(worktree.replace('\\', '/'))
else:
self.worktree = None
self.relpath = relpath
self.revisionExpr = revisionExpr
- if revisionId is None \
- and revisionExpr \
- and IsId(revisionExpr):
+ if revisionId is None \
+ and revisionExpr \
+ and IsId(revisionExpr):
self.revisionId = revisionExpr
else:
self.revisionId = revisionId
@@ -635,9 +717,8 @@
self.copyfiles = []
self.linkfiles = []
self.annotations = []
- self.config = GitConfig.ForRepository(
- gitdir=self.gitdir,
- defaults=self.manifest.globalConfig)
+ self.config = GitConfig.ForRepository(gitdir=self.gitdir,
+ defaults=self.manifest.globalConfig)
if self.worktree:
self.work_git = self._GitGetByExec(self, bare=False, gitdir=gitdir)
@@ -776,7 +857,7 @@
"""
expanded_manifest_groups = manifest_groups or ['default']
expanded_project_groups = ['all'] + (self.groups or [])
- if not 'notdefault' in expanded_project_groups:
+ if 'notdefault' not in expanded_project_groups:
expanded_project_groups += ['default']
matched = False
@@ -788,7 +869,7 @@
return matched
-## Status Display ##
+# Status Display ##
def UncommitedFiles(self, get_all=True):
"""Returns a list of strings, uncommitted files in the git tree.
@@ -840,7 +921,7 @@
output: If specified, redirect the output to this object.
"""
if not os.path.isdir(self.worktree):
- if output_redir == None:
+ if output_redir is None:
output_redir = sys.stdout
print(file=output_redir)
print('project %s/' % self.relpath, file=output_redir)
@@ -859,7 +940,7 @@
return 'CLEAN'
out = StatusColoring(self.config)
- if not output_redir == None:
+ if output_redir is not None:
out.redirect(output_redir)
out.project('project %-40s', self.relpath + '/ ')
@@ -902,7 +983,7 @@
if i and i.src_path:
line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
- i.src_path, p, i.level)
+ i.src_path, p, i.level)
else:
line = ' %s%s\t%s' % (i_status, f_status, p)
@@ -945,7 +1026,7 @@
p.Wait()
-## Publish / Upload ##
+# Publish / Upload ##
def WasPublished(self, branch, all_refs=None):
"""Was the branch published (uploaded) for code review?
@@ -1088,7 +1169,6 @@
message=msg)
-## Sync ##
def __FetchLfsObjects(self, name, refs):
if 'refs/heads/*' in refs:
refs = []
@@ -1114,6 +1194,7 @@
except OSError:
pass
_lwrite(ref, '%s\n' % revid)
+# Sync ##
def _ExtractArchive(self, tarpath, path=None):
"""Extract the given tar on its current location
@@ -1131,15 +1212,15 @@
return False
def Sync_NetworkHalf(self,
- quiet=False,
- is_new=None,
- current_branch_only=False,
- force_sync=False,
- clone_bundle=True,
- no_tags=False,
- archive=False,
- optimized_fetch=False,
- prune=False):
+ quiet=False,
+ is_new=None,
+ current_branch_only=False,
+ force_sync=False,
+ clone_bundle=True,
+ no_tags=False,
+ archive=False,
+ optimized_fetch=False,
+ prune=False):
"""Perform only the network IO portion of the sync process.
Local working directory/branch state is not affected.
"""
@@ -1192,8 +1273,8 @@
alt_dir = None
if clone_bundle \
- and alt_dir is None \
- and self._ApplyCloneBundle(initial=is_new, quiet=quiet):
+ and alt_dir is None \
+ and self._ApplyCloneBundle(initial=is_new, quiet=quiet):
is_new = False
if not current_branch_only:
@@ -1205,12 +1286,13 @@
elif self.manifest.default.sync_c:
current_branch_only = True
- need_to_fetch = not (optimized_fetch and \
- (ID_RE.match(self.revisionExpr) and self._CheckForSha1()))
- if (need_to_fetch
- and not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir,
- current_branch_only=current_branch_only,
- no_tags=no_tags, prune=prune)):
+ need_to_fetch = not (optimized_fetch and
+ (ID_RE.match(self.revisionExpr) and
+ self._CheckForSha1()))
+ if (need_to_fetch and
+ not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir,
+ current_branch_only=current_branch_only,
+ no_tags=no_tags, prune=prune)):
return False
if self.worktree:
@@ -1276,9 +1358,8 @@
try:
return self.bare_git.rev_list(self.revisionExpr, '-1')[0]
except GitError:
- raise ManifestInvalidRevisionError(
- 'revision %s in %s not found' % (self.revisionExpr,
- self.name))
+ raise ManifestInvalidRevisionError('revision %s in %s not found' %
+ (self.revisionExpr, self.name))
def GetRevisionId(self, all_refs=None):
if self.revisionId:
@@ -1293,9 +1374,8 @@
try:
return self.bare_git.rev_parse('--verify', '%s^0' % rev)
except GitError:
- raise ManifestInvalidRevisionError(
- 'revision %s in %s not found' % (self.revisionExpr,
- self.name))
+ raise ManifestInvalidRevisionError('revision %s in %s not found' %
+ (self.revisionExpr, self.name))
def Sync_LocalHalf(self, syncbuf, force_sync=False):
"""Perform only the local IO portion of the sync process.
@@ -1384,8 +1464,8 @@
# to rewrite the published commits so we punt.
#
syncbuf.fail(self,
- "branch %s is published (but not merged) and is now %d commits behind"
- % (branch.name, len(upstream_gain)))
+ "branch %s is published (but not merged) and is now "
+ "%d commits behind" % (branch.name, len(upstream_gain)))
return
elif pub == head:
# All published commits are merged, and thus we are a
@@ -1479,7 +1559,7 @@
remote = self.GetRemote(self.remote.name)
cmd = ['fetch', remote.name]
- cmd.append('refs/changes/%2.2d/%d/%d' \
+ cmd.append('refs/changes/%2.2d/%d/%d'
% (change_id % 100, change_id, patch_id))
if GitCommand(self, cmd, bare=True).Wait() != 0:
return None
@@ -1490,7 +1570,7 @@
self.bare_git.rev_parse('FETCH_HEAD'))
-## Branch Management ##
+# Branch Management ##
def StartBranch(self, name, branch_merge=''):
"""Create a new branch off the manifest's revision.
@@ -1680,10 +1760,11 @@
return kept
-## Submodule Management ##
+# Submodule Management ##
def GetRegisteredSubprojects(self):
result = []
+
def rec(subprojects):
if not subprojects:
return
@@ -1718,6 +1799,7 @@
re_path = re.compile(r'^submodule\.([^.]+)\.path=(.*)$')
re_url = re.compile(r'^submodule\.([^.]+)\.url=(.*)$')
+
def parse_gitmodules(gitdir, rev):
cmd = ['cat-file', 'blob', '%s:.gitmodules' % rev]
try:
@@ -1805,6 +1887,7 @@
remote = RemoteSpec(self.remote.name,
url=url,
+ pushUrl=self.remote.pushUrl,
review=self.remote.review,
revision=self.remote.revision)
subproject = Project(manifest=self.manifest,
@@ -1814,7 +1897,7 @@
objdir=objdir,
worktree=worktree,
relpath=relpath,
- revisionExpr=self.revisionExpr,
+ revisionExpr=rev,
revisionId=rev,
rebase=self.rebase,
groups=self.groups,
@@ -1827,7 +1910,7 @@
return result
-## Direct Git Commands ##
+# Direct Git Commands ##
def _CheckForSha1(self):
try:
# if revision (sha or tag) is not present then following function
@@ -1851,7 +1934,6 @@
if command.Wait() != 0:
raise GitError('git archive %s: %s' % (self.name, command.stderr))
-
def _RemoteFetch(self, name=None,
current_branch_only=False,
initial=False,
@@ -1898,7 +1980,10 @@
# will fail.
# * otherwise, fetch all branches to make sure we end up with the
# specific commit.
- current_branch_only = self.upstream and not ID_RE.match(self.upstream)
+ if self.upstream:
+ current_branch_only = not ID_RE.match(self.upstream)
+ else:
+ current_branch_only = False
if not name:
name = self.remote.name
@@ -2019,9 +2104,9 @@
break
continue
elif current_branch_only and is_sha1 and ret == 128:
- # Exit code 128 means "couldn't find the ref you asked for"; if we're in sha1
- # mode, we just tried sync'ing from the upstream field; it doesn't exist, thus
- # abort the optimization attempt and do a full sync.
+ # Exit code 128 means "couldn't find the ref you asked for"; if we're
+ # in sha1 mode, we just tried sync'ing from the upstream field; it
+ # doesn't exist, thus abort the optimization attempt and do a full sync.
break
elif ret < 0:
# Git died with a signal, exit immediately
@@ -2048,21 +2133,25 @@
initial=False, quiet=quiet, alt_dir=alt_dir)
if self.clone_depth:
self.clone_depth = None
- return self._RemoteFetch(name=name, current_branch_only=current_branch_only,
+ return self._RemoteFetch(name=name,
+ current_branch_only=current_branch_only,
initial=False, quiet=quiet, alt_dir=alt_dir)
if self.lfs_fetch:
self.__FetchLfsObjects(name, refs)
return ok
def _ApplyCloneBundle(self, initial=False, quiet=False):
- if initial and (self.manifest.manifestProject.config.GetString('repo.depth') or self.clone_depth):
+ if initial and \
+ (self.manifest.manifestProject.config.GetString('repo.depth') or
+ self.clone_depth):
return False
remote = self.GetRemote(self.remote.name)
bundle_url = remote.url + '/clone.bundle'
bundle_url = GitConfig.ForUser().UrlInsteadOf(bundle_url)
- if GetSchemeFromUrl(bundle_url) not in (
- 'http', 'https', 'persistent-http', 'persistent-https'):
+ if GetSchemeFromUrl(bundle_url) not in ('http', 'https',
+ 'persistent-http',
+ 'persistent-https'):
return False
bundle_dst = os.path.join(self.gitdir, 'clone.bundle')
@@ -2111,7 +2200,7 @@
os.remove(tmpPath)
if 'http_proxy' in os.environ and 'darwin' == sys.platform:
cmd += ['--proxy', os.environ['http_proxy']]
- with GetUrlCookieFile(srcUrl, quiet) as (cookiefile, proxy):
+ with GetUrlCookieFile(srcUrl, quiet) as (cookiefile, _proxy):
if cookiefile:
cmd += ['--cookie', cookiefile, '--cookie-jar', cookiefile]
if srcUrl.startswith('persistent-'):
@@ -2230,11 +2319,12 @@
self._CheckDirReference(self.objdir, self.gitdir, share_refs=False)
except GitError as e:
if force_sync:
- print("Retrying clone after deleting %s" % self.gitdir, file=sys.stderr)
+ print("Retrying clone after deleting %s" %
+ self.gitdir, file=sys.stderr)
try:
shutil.rmtree(os.path.realpath(self.gitdir))
- if self.worktree and os.path.exists(
- os.path.realpath(self.worktree)):
+ if self.worktree and os.path.exists(os.path.realpath
+ (self.worktree)):
shutil.rmtree(os.path.realpath(self.worktree))
return self._InitGitDir(mirror_git=mirror_git, force_sync=False)
except:
@@ -2269,7 +2359,7 @@
m = self.manifest.manifestProject.config
for key in ['user.name', 'user.email']:
if m.Has(key, include_defaults=False):
- self.config.SetString(key, m.GetString(key))
+ self.config.SetString(key, m.GetString(key))
if self.manifest.IsMirror:
self.config.SetString('core.bare', 'true')
else:
@@ -2299,7 +2389,7 @@
name = os.path.basename(stock_hook)
if name in ('commit-msg',) and not self.remote.review \
- and not self is self.manifest.manifestProject:
+ and self is not self.manifest.manifestProject:
# Don't install a Gerrit Code Review hook if this
# project does not appear to use it for reviews.
#
@@ -2314,7 +2404,8 @@
if filecmp.cmp(stock_hook, dst, shallow=False):
os.remove(dst)
else:
- _warn("%s: Not replacing locally modified %s hook", self.relpath, name)
+ _warn("%s: Not replacing locally modified %s hook",
+ self.relpath, name)
continue
try:
os.symlink(os.path.relpath(stock_hook, os.path.dirname(dst)), dst)
@@ -2328,6 +2419,7 @@
if self.remote.url:
remote = self.GetRemote(self.remote.name)
remote.url = self.remote.url
+ remote.pushUrl = self.remote.pushUrl
remote.review = self.remote.review
remote.projectname = self.name
@@ -2360,8 +2452,8 @@
self.bare_git.symbolic_ref('-m', msg, ref, dst)
def _CheckDirReference(self, srcdir, destdir, share_refs):
- symlink_files = self.shareable_files
- symlink_dirs = self.shareable_dirs
+ symlink_files = self.shareable_files[:]
+ symlink_dirs = self.shareable_dirs[:]
if share_refs:
symlink_files += self.working_tree_files
symlink_dirs += self.working_tree_dirs
@@ -2389,8 +2481,8 @@
copy_all: If true, copy all remaining files from |gitdir| -> |dotgit|.
This saves you the effort of initializing |dotgit| yourself.
"""
- symlink_files = self.shareable_files
- symlink_dirs = self.shareable_dirs
+ symlink_files = self.shareable_files[:]
+ symlink_dirs = self.shareable_dirs[:]
if share_refs:
symlink_files += self.working_tree_files
symlink_dirs += self.working_tree_dirs
@@ -2482,7 +2574,7 @@
def _allrefs(self):
return self.bare_ref.all
- def _getLogs(self, rev1, rev2, oneline=False, color=True):
+ def _getLogs(self, rev1, rev2, oneline=False, color=True, pretty_format=None):
"""Get logs between two revisions of this project."""
comp = '..'
if rev1:
@@ -2493,6 +2585,8 @@
out = DiffColoring(self.config)
if out.is_on and color:
cmd.append('--color')
+ if pretty_format is not None:
+ cmd.append('--pretty=format:%s' % pretty_format)
if oneline:
cmd.append('--oneline')
@@ -2509,17 +2603,21 @@
raise
return None
- def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True):
+ def getAddedAndRemovedLogs(self, toProject, oneline=False, color=True,
+ pretty_format=None):
"""Get the list of logs from this revision to given revisionId"""
logs = {}
selfId = self.GetRevisionId(self._allrefs)
toId = toProject.GetRevisionId(toProject._allrefs)
- logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color)
- logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color)
+ logs['added'] = self._getLogs(selfId, toId, oneline=oneline, color=color,
+ pretty_format=pretty_format)
+ logs['removed'] = self._getLogs(toId, selfId, oneline=oneline, color=color,
+ pretty_format=pretty_format)
return logs
class _GitGetByExec(object):
+
def __init__(self, project, bare, gitdir):
self._project = project
self._bare = bare
@@ -2538,8 +2636,8 @@
if p.Wait() == 0:
out = p.stdout
if out:
+ # Backslash is not anomalous
return out[:-1].split('\0') # pylint: disable=W1401
- # Backslash is not anomalous
return []
def DiffZ(self, name, *args):
@@ -2565,6 +2663,7 @@
break
class _Info(object):
+
def __init__(self, path, omode, nmode, oid, nid, state):
self.path = path
self.src_path = None
@@ -2667,10 +2766,8 @@
line = line[:-1]
r.append(line)
if p.Wait() != 0:
- raise GitError('%s rev-list %s: %s' % (
- self._project.name,
- str(args),
- p.stderr))
+ raise GitError('%s rev-list %s: %s' %
+ (self._project.name, str(args), p.stderr))
return r
def __getattr__(self, name):
@@ -2693,6 +2790,7 @@
A callable object that will try to call git with the named command.
"""
name = name.replace('_', '-')
+
def runner(*args, **kwargs):
cmdv = []
config = kwargs.pop('config', None)
@@ -2715,10 +2813,8 @@
capture_stdout=True,
capture_stderr=True)
if p.Wait() != 0:
- raise GitError('%s %s: %s' % (
- self._project.name,
- name,
- p.stderr))
+ raise GitError('%s %s: %s' %
+ (self._project.name, name, p.stderr))
r = p.stdout
try:
r = r.decode('utf-8')
@@ -2731,14 +2827,19 @@
class _PriorSyncFailedError(Exception):
+
def __str__(self):
return 'prior sync failed; rebase still in progress'
+
class _DirtyError(Exception):
+
def __str__(self):
return 'contains uncommitted changes'
+
class _InfoMessage(object):
+
def __init__(self, project, text):
self.project = project
self.text = text
@@ -2747,7 +2848,9 @@
syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
syncbuf.out.nl()
+
class _Failure(object):
+
def __init__(self, project, why):
self.project = project
self.why = why
@@ -2758,7 +2861,9 @@
str(self.why))
syncbuf.out.nl()
+
class _Later(object):
+
def __init__(self, project, action):
self.project = project
self.action = action
@@ -2775,14 +2880,18 @@
out.nl()
return False
+
class _SyncColoring(Coloring):
+
def __init__(self, config):
Coloring.__init__(self, config, 'reposync')
self.project = self.printer('header', attr='bold')
self.info = self.printer('info')
self.fail = self.printer('fail', fg='red')
+
class SyncBuffer(object):
+
def __init__(self, config, detach_head=False):
self._messages = []
self._failures = []
@@ -2838,8 +2947,10 @@
class MetaProject(Project):
+
"""A special project housed under .repo.
"""
+
def __init__(self, manifest, name, gitdir, worktree):
Project.__init__(self,
manifest=manifest,
@@ -2873,10 +2984,9 @@
syncbuf.Finish()
return GitCommand(self,
- ['update-ref', '-d', 'refs/heads/default'],
- capture_stdout=True,
- capture_stderr=True).Wait() == 0
-
+ ['update-ref', '-d', 'refs/heads/default'],
+ capture_stdout=True,
+ capture_stderr=True).Wait() == 0
@property
def LastFetch(self):