From b8e09ea1d6e8051697da52db1291e8267844e206 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 3 May 2021 00:51:52 -0400 Subject: harmonize --current-branch short option across subcommands We're inconsistent with the short option for this flag: * gitc-init: * info: -b * init: -c * overview: -b * sync: -c * upload: --cbr Since info & overview are not as heavily used as the others, switch them from -b to -c. We leave -b in as a hidden alias for now. Similarly, switch upload from --cbr to just -c. A lot of people use --cbr, so we leave this as a hidden alias for now too. Ideally gitc-init wouldn't use -c, but that ship has sailed, and we're more likely to deprecate gitc entirely at this point. This provides a consistent set of options across subcommands. Bug: https://crbug.com/gerrit/12401 Change-Id: Iec249729223866fe1ea0ebabed12ca851cc38b35 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/304902 Reviewed-by: Raman Tenneti Tested-by: Mike Frysinger --- subcmds/info.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'subcmds/info.py') diff --git a/subcmds/info.py b/subcmds/info.py index 6381fa8e..8e017ed8 100644 --- a/subcmds/info.py +++ b/subcmds/info.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import optparse + from command import PagedCommand from color import Coloring from git_refs import R_M, R_HEADS @@ -25,7 +27,7 @@ class _Coloring(Coloring): class Info(PagedCommand): common = True helpSummary = "Get info on the manifest branch, current branch or unmerged branches" - helpUsage = "%prog [-dl] [-o [-b]] [...]" + helpUsage = "%prog [-dl] [-o [-c]] [...]" def _Options(self, p): p.add_option('-d', '--diff', @@ -34,9 +36,13 @@ class Info(PagedCommand): p.add_option('-o', '--overview', dest='overview', action='store_true', help='show overview of all local commits') - p.add_option('-b', '--current-branch', + p.add_option('-c', '--current-branch', dest="current_branch", action="store_true", help="consider only checked out branches") + # Turn this into a warning & remove this someday. + p.add_option('-b', + dest='current_branch', action='store_true', + help=optparse.SUPPRESS_HELP) p.add_option('-l', '--local-only', dest="local", action="store_true", help="Disable all remote operations") -- cgit v1.2.3-54-g00ecf