android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix flake8 warnings for some files

Browse Source 
Change-Id: If67f8660cfb0479f0e710b3566285ef401fcf077
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/355969
Tested-by: Sergiy Belozorov <sergiyb@chromium.org>
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Sergiy Belozorov 2023-01-05 18:57:31 +01:00
parent 37ae75f27d
commit 78e82ec78e
5 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command.py
View File

@ -320,7 +320,8 @@ class Command(object):
for arg in args: for arg in args:
# We have to filter by manifest groups in case the requested project is # We have to filter by manifest groups in case the requested project is
# checked out multiple times or differently based on them. # checked out multiple times or differently based on them.
projects = [project for project in manifest.GetProjectsWithName( projects = [project
for project in manifest.GetProjectsWithName(
arg, all_manifests=all_manifests) arg, all_manifests=all_manifests)
if project.MatchesGroups(groups)] if project.MatchesGroups(groups)]

6
git_command.py
View File

@ -194,8 +194,7 @@ def _build_env(
env['GIT_OBJECT_DIRECTORY'] = objdir env['GIT_OBJECT_DIRECTORY'] = objdir
alt_objects = os.path.join(gitdir, 'objects') if gitdir else None alt_objects = os.path.join(gitdir, 'objects') if gitdir else None
if (alt_objects and if alt_objects and os.path.realpath(alt_objects) != os.path.realpath(objdir):
os.path.realpath(alt_objects) != os.path.realpath(objdir)):
# Allow git to search the original place in case of local or unique refs # Allow git to search the original place in case of local or unique refs
# that git will attempt to resolve even if we aren't fetching them. # that git will attempt to resolve even if we aren't fetching them.
env['GIT_ALTERNATE_OBJECT_DIRECTORIES'] = alt_objects env['GIT_ALTERNATE_OBJECT_DIRECTORIES'] = alt_objects
@ -279,7 +278,8 @@ class GitCommand(object):
if 'GIT_OBJECT_DIRECTORY' in env: if 'GIT_OBJECT_DIRECTORY' in env:
dbg += ': export GIT_OBJECT_DIRECTORY=%s\n' % env['GIT_OBJECT_DIRECTORY'] dbg += ': export GIT_OBJECT_DIRECTORY=%s\n' % env['GIT_OBJECT_DIRECTORY']
if 'GIT_ALTERNATE_OBJECT_DIRECTORIES' in env: if 'GIT_ALTERNATE_OBJECT_DIRECTORIES' in env:
dbg += ': export GIT_ALTERNATE_OBJECT_DIRECTORIES=%s\n' % env['GIT_ALTERNATE_OBJECT_DIRECTORIES'] dbg += ': export GIT_ALTERNATE_OBJECT_DIRECTORIES=%s\n' % (
env['GIT_ALTERNATE_OBJECT_DIRECTORIES'])
dbg += ': ' dbg += ': '
dbg += ' '.join(command) dbg += ' '.join(command)

8
project.py
View File

@ -54,6 +54,7 @@ class SyncNetworkHalfResult(NamedTuple):
# commit already present. # commit already present.
remote_fetched: bool remote_fetched: bool
# Maximum sleep time allowed during retries. # Maximum sleep time allowed during retries.
MAXIMUM_RETRY_SLEEP_SEC = 3600.0 MAXIMUM_RETRY_SLEEP_SEC = 3600.0
# +-10% random jitter is added to each Fetches retry sleep duration. # +-10% random jitter is added to each Fetches retry sleep duration.
@ -63,6 +64,7 @@ RETRY_JITTER_PERCENT = 0.1
# TODO(vapier): Remove knob once behavior is verified. # TODO(vapier): Remove knob once behavior is verified.
_ALTERNATES = os.environ.get('REPO_USE_ALTERNATES') == '1' _ALTERNATES = os.environ.get('REPO_USE_ALTERNATES') == '1'
def _lwrite(path, content): def _lwrite(path, content):
lock = '%s.lock' % path lock = '%s.lock' % path
@ -3415,6 +3417,7 @@ class RepoProject(MetaProject):
except OSError: except OSError:
return 0 return 0
class ManifestProject(MetaProject): class ManifestProject(MetaProject):
"""The MetaProject for manifests.""" """The MetaProject for manifests."""
@ -3845,11 +3848,12 @@ class ManifestProject(MetaProject):
self.config.SetBoolean('repo.superproject', use_superproject) self.config.SetBoolean('repo.superproject', use_superproject)
if not standalone_manifest: if not standalone_manifest:
if not self.Sync_NetworkHalf( success = self.Sync_NetworkHalf(
is_new=is_new, quiet=not verbose, verbose=verbose, is_new=is_new, quiet=not verbose, verbose=verbose,
clone_bundle=clone_bundle, current_branch_only=current_branch_only, clone_bundle=clone_bundle, current_branch_only=current_branch_only,
tags=tags, submodules=submodules, clone_filter=clone_filter, tags=tags, submodules=submodules, clone_filter=clone_filter,
partial_clone_exclude=self.manifest.PartialCloneExclude).success: partial_clone_exclude=self.manifest.PartialCloneExclude).success
if not success:
r = self.GetRemote() r = self.GetRemote()
print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr) print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr)

3
subcmds/upload.py
View File

@ -615,8 +615,7 @@ Gerrit Code Review: https://www.gerritcodereview.com/
hook = RepoHook.FromSubcmd( hook = RepoHook.FromSubcmd(
hook_type='pre-upload', manifest=manifest, hook_type='pre-upload', manifest=manifest,
opt=opt, abort_if_user_denies=True) opt=opt, abort_if_user_denies=True)
if not hook.Run( if not hook.Run(project_list=pending_proj_names,
project_list=pending_proj_names,
worktree_list=pending_worktrees): worktree_list=pending_worktrees):
ret = 1 ret = 1
if ret: if ret: