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/overview.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'subcmds/overview.py') diff --git a/subcmds/overview.py b/subcmds/overview.py index 004a847c..4f62f94f 100644 --- a/subcmds/overview.py +++ b/subcmds/overview.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import optparse + from color import Coloring from command import PagedCommand @@ -26,15 +28,19 @@ class Overview(PagedCommand): The '%prog' command is used to display an overview of the projects branches, and list any local commits that have not yet been merged into the project. -The -b/--current-branch option can be used to restrict the output to only +The -c/--current-branch option can be used to restrict the output to only branches currently checked out in each project. By default, all branches are displayed. """ def _Options(self, p): - 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) def Execute(self, opt, args): all_branches = [] -- cgit v1.2.3-54-g00ecf