mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
init: handle -c conflicts with gitc-init
We keep getting requests for init to support -c. This conflicts with gitc-init which allocates -c for its own use. Lets make this dynamic so we keep it with "init" but omit it for "gitc-init". Bug: https://crbug.com/gerrit/10200 Change-Id: Ibf69c2bbeff638e28e63cb08926fea0c622258db Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253252 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
parent
f7b64e3350
commit
66098f707a
@ -50,7 +50,7 @@ use for this GITC client.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def _Options(self, p):
|
def _Options(self, p):
|
||||||
super(GitcInit, self)._Options(p)
|
super(GitcInit, self)._Options(p, gitc_init=True)
|
||||||
g = p.add_option_group('GITC options')
|
g = p.add_option_group('GITC options')
|
||||||
g.add_option('-f', '--manifest-file',
|
g.add_option('-f', '--manifest-file',
|
||||||
dest='manifest_file',
|
dest='manifest_file',
|
||||||
|
@ -81,7 +81,7 @@ manifest, a subsequent `repo sync` (or `repo sync -d`) is necessary
|
|||||||
to update the working directory files.
|
to update the working directory files.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def _Options(self, p):
|
def _Options(self, p, gitc_init=False):
|
||||||
# Logging
|
# Logging
|
||||||
g = p.add_option_group('Logging options')
|
g = p.add_option_group('Logging options')
|
||||||
g.add_option('-q', '--quiet',
|
g.add_option('-q', '--quiet',
|
||||||
@ -96,7 +96,12 @@ to update the working directory files.
|
|||||||
g.add_option('-b', '--manifest-branch',
|
g.add_option('-b', '--manifest-branch',
|
||||||
dest='manifest_branch',
|
dest='manifest_branch',
|
||||||
help='manifest branch or revision', metavar='REVISION')
|
help='manifest branch or revision', metavar='REVISION')
|
||||||
g.add_option('-c', '--current-branch',
|
cbr_opts = ['--current-branch']
|
||||||
|
# The gitc-init subcommand allocates -c itself, but a lot of init users
|
||||||
|
# want -c, so try to satisfy both as best we can.
|
||||||
|
if gitc_init:
|
||||||
|
cbr_opts += ['-c']
|
||||||
|
g.add_option(*cbr_opts,
|
||||||
dest='current_branch_only', action='store_true',
|
dest='current_branch_only', action='store_true',
|
||||||
help='fetch only current manifest branch from server')
|
help='fetch only current manifest branch from server')
|
||||||
g.add_option('-m', '--manifest-name',
|
g.add_option('-m', '--manifest-name',
|
||||||
|
Loading…
Reference in New Issue
Block a user