avoid negative variables
Trying to use booleans with names like "no_xxx" are hard to follow due
to the double negatives. Invert all of them so we only have positive
meanings to follow.
Change-Id: Ifd37d0368f97034d94aa2cf38db52c723ac0c6ed
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255493
Tested-by: Mike Frysinger <vapier@google.com>
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
diff --git a/main.py b/main.py
index ec031a4..9846d24 100755
--- a/main.py
+++ b/main.py
@@ -108,7 +108,7 @@
dest='pager', action='store_true',
help='display command output in the pager')
global_options.add_option('--no-pager',
- dest='no_pager', action='store_true',
+ dest='pager', action='store_false',
help='disable the pager')
global_options.add_option('--color',
choices=('auto', 'always', 'never'), default=None,
@@ -222,7 +222,7 @@
file=sys.stderr)
return 1
- if not gopts.no_pager and not isinstance(cmd, InteractiveCommand):
+ if gopts.pager and not isinstance(cmd, InteractiveCommand):
config = cmd.manifest.globalConfig
if gopts.pager:
use_pager = True
diff --git a/project.py b/project.py
index 8bef9a8..bfe4a34 100644
--- a/project.py
+++ b/project.py
@@ -1432,7 +1432,7 @@
current_branch_only=False,
force_sync=False,
clone_bundle=True,
- no_tags=False,
+ tags=True,
archive=False,
optimized_fetch=False,
prune=False,
@@ -1501,9 +1501,8 @@
elif self.manifest.default.sync_c:
current_branch_only = True
- if not no_tags:
- if not self.sync_tags:
- no_tags = True
+ if not self.sync_tags:
+ tags = False
if self.clone_depth:
depth = self.clone_depth
@@ -1517,7 +1516,7 @@
if not self._RemoteFetch(
initial=is_new, quiet=quiet, verbose=verbose, alt_dir=alt_dir,
current_branch_only=current_branch_only,
- no_tags=no_tags, prune=prune, depth=depth,
+ tags=tags, prune=prune, depth=depth,
submodules=submodules, force_sync=force_sync,
clone_filter=clone_filter):
return False
@@ -2197,7 +2196,7 @@
quiet=False,
verbose=False,
alt_dir=None,
- no_tags=False,
+ tags=True,
prune=False,
depth=None,
submodules=False,
@@ -2355,7 +2354,7 @@
# If using depth then we should not get all the tags since they may
# be outside of the depth.
- if no_tags or depth:
+ if not tags or depth:
cmd.append('--no-tags')
else:
cmd.append('--tags')
diff --git a/repo b/repo
index 7771c2d..77e7fe9 100755
--- a/repo
+++ b/repo
@@ -315,9 +315,11 @@
help='restrict manifest projects to ones with a specified '
'platform group [auto|all|none|linux|darwin|...]',
metavar='PLATFORM')
- group.add_option('--no-clone-bundle', action='store_true',
+ group.add_option('--no-clone-bundle',
+ dest='clone_bundle', default=True, action='store_false',
help='disable use of /clone.bundle on HTTP/HTTPS')
- group.add_option('--no-tags', action='store_true',
+ group.add_option('--no-tags',
+ dest='tags', default=True, action='store_false',
help="don't fetch tags in the manifest")
# Tool.
@@ -326,7 +328,8 @@
help='repo repository location ($REPO_URL)')
group.add_option('--repo-branch', metavar='REVISION',
help='repo branch or revision ($REPO_REV)')
- group.add_option('--no-repo-verify', action='store_true',
+ group.add_option('--no-repo-verify',
+ dest='repo_verify', default=True, action='store_false',
help='do not verify repo source code')
# Other.
@@ -505,7 +508,7 @@
_CheckGitVersion()
try:
- if opt.no_repo_verify:
+ if not opt.repo_verify:
do_verify = False
else:
if NeedSetupGnuPG():
@@ -514,7 +517,7 @@
do_verify = True
dst = os.path.abspath(os.path.join(repodir, S_repo))
- _Clone(url, dst, opt.quiet, not opt.no_clone_bundle)
+ _Clone(url, dst, opt.quiet, opt.clone_bundle)
if do_verify:
rev = _Verify(dst, branch, opt.quiet)
diff --git a/subcmds/init.py b/subcmds/init.py
index dde9728..3c68c2c 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -146,10 +146,10 @@
'platform group [auto|all|none|linux|darwin|...]',
metavar='PLATFORM')
g.add_option('--no-clone-bundle',
- dest='no_clone_bundle', action='store_true',
+ dest='clone_bundle', default=True, action='store_false',
help='disable use of /clone.bundle on HTTP/HTTPS')
g.add_option('--no-tags',
- dest='no_tags', action='store_true',
+ dest='tags', default=True, action='store_false',
help="don't fetch tags in the manifest")
# Tool
@@ -161,7 +161,7 @@
dest='repo_branch',
help='repo branch or revision', metavar='REVISION')
g.add_option('--no-repo-verify',
- dest='no_repo_verify', action='store_true',
+ dest='repo_verify', default=True, action='store_false',
help='do not verify repo source code')
# Other
@@ -281,9 +281,9 @@
m.config.SetString('repo.submodules', 'true')
if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet,
- clone_bundle=not opt.no_clone_bundle,
+ clone_bundle=opt.clone_bundle,
current_branch_only=opt.current_branch_only,
- no_tags=opt.no_tags, submodules=opt.submodules,
+ tags=opt.tags, submodules=opt.submodules,
clone_filter=opt.clone_filter):
r = m.GetRemote(m.remote.name)
print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr)
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index eb92a3c..24d80bf 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -53,7 +53,7 @@
dest='force_rebase', action='store_true',
help='Pass --force-rebase to git rebase')
p.add_option('--no-ff',
- dest='no_ff', action='store_true',
+ dest='ff', default=True, action='store_false',
help='Pass --no-ff to git rebase')
p.add_option('-q', '--quiet',
dest='quiet', action='store_true',
@@ -93,7 +93,7 @@
common_args.append('--quiet')
if opt.force_rebase:
common_args.append('--force-rebase')
- if opt.no_ff:
+ if not opt.ff:
common_args.append('--no-ff')
if opt.autosquash:
common_args.append('--autosquash')
diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py
index 4817a86..bf6256a 100644
--- a/subcmds/selfupdate.py
+++ b/subcmds/selfupdate.py
@@ -40,7 +40,7 @@
def _Options(self, p):
g = p.add_option_group('repo Version options')
g.add_option('--no-repo-verify',
- dest='no_repo_verify', action='store_true',
+ dest='repo_verify', default=True, action='store_false',
help='do not verify repo source code')
g.add_option('--repo-upgraded',
dest='repo_upgraded', action='store_true',
@@ -60,5 +60,5 @@
rp.bare_git.gc('--auto')
_PostRepoFetch(rp,
- no_repo_verify=opt.no_repo_verify,
+ repo_verify=opt.repo_verify,
verbose=True)
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 849e878..1988cc7 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -247,7 +247,7 @@
dest='manifest_name',
help='temporary manifest to use for this sync', metavar='NAME.xml')
p.add_option('--no-clone-bundle',
- dest='no_clone_bundle', action='store_true',
+ dest='clone_bundle', default=True, action='store_false',
help='disable use of /clone.bundle on HTTP/HTTPS')
p.add_option('-u', '--manifest-server-username', action='store',
dest='manifest_server_username',
@@ -259,7 +259,7 @@
dest='fetch_submodules', action='store_true',
help='fetch submodules from server')
p.add_option('--no-tags',
- dest='no_tags', action='store_true',
+ dest='tags', default=True, action='store_false',
help="don't fetch tags")
p.add_option('--optimized-fetch',
dest='optimized_fetch', action='store_true',
@@ -276,7 +276,7 @@
g = p.add_option_group('repo Version options')
g.add_option('--no-repo-verify',
- dest='no_repo_verify', action='store_true',
+ dest='repo_verify', default=True, action='store_false',
help='do not verify repo source code')
g.add_option('--repo-upgraded',
dest='repo_upgraded', action='store_true',
@@ -338,8 +338,8 @@
verbose=opt.verbose,
current_branch_only=opt.current_branch_only,
force_sync=opt.force_sync,
- clone_bundle=not opt.no_clone_bundle,
- no_tags=opt.no_tags, archive=self.manifest.IsArchive,
+ clone_bundle=opt.clone_bundle,
+ tags=opt.tags, archive=self.manifest.IsArchive,
optimized_fetch=opt.optimized_fetch,
prune=opt.prune,
clone_filter=clone_filter)
@@ -841,7 +841,7 @@
start = time.time()
success = mp.Sync_NetworkHalf(quiet=opt.quiet, verbose=opt.verbose,
current_branch_only=opt.current_branch_only,
- no_tags=opt.no_tags,
+ tags=opt.tags,
optimized_fetch=opt.optimized_fetch,
submodules=self.manifest.HasSubmodules,
clone_filter=self.manifest.CloneFilter)
@@ -977,7 +977,7 @@
fetched = self._Fetch(to_fetch, opt, err_event)
- _PostRepoFetch(rp, opt.no_repo_verify)
+ _PostRepoFetch(rp, opt.repo_verify)
if opt.network_only:
# bail out now; the rest touches the working tree
if err_event.isSet():
@@ -1067,11 +1067,11 @@
project.PostRepoUpgrade()
-def _PostRepoFetch(rp, no_repo_verify=False, verbose=False):
+def _PostRepoFetch(rp, repo_verify=True, verbose=False):
if rp.HasChanges:
print('info: A new version of repo is available', file=sys.stderr)
print(file=sys.stderr)
- if no_repo_verify or _VerifyTag(rp):
+ if not repo_verify or _VerifyTag(rp):
syncbuf = SyncBuffer(rp.config)
rp.Sync_LocalHalf(syncbuf)
if not syncbuf.Finish():
