summaryrefslogtreecommitdiffstats
path: root/subcmds/rebase.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2021-05-04 08:06:36 -0400
committerMike Frysinger <vapier@google.com>2021-05-04 16:40:53 +0000
commitc177f944d95c460803f8a894fd13d4901c3155fe (patch)
tree1645c1bcf6e2cd304600ebc1f5193a0edf329429 /subcmds/rebase.py
parentaedd1e5ef015fba194681e167edf460c21a1c980 (diff)
downloadgit-repo-c177f944d95c460803f8a894fd13d4901c3155fe.tar.gz
subcmds: force consistent help text format
We're inconsistent with help text as to whether it uses title case and whether it ends in a period. Add a test to enforce a standard, and use the style that Python optparse & argparse use themselves (e.g. with the --help option): always lowercase, and never trailing period. Change-Id: Ic1defae23daeac0ac9116aaf487427f50b34050d Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/305144 Reviewed-by: Raman Tenneti <rtenneti@google.com> Tested-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'subcmds/rebase.py')
-rw-r--r--subcmds/rebase.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index e0186d4d..9ce4ecb8 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -46,27 +46,27 @@ branch but need to incorporate new upstream changes "underneath" them.
46 46
47 p.add_option('--fail-fast', 47 p.add_option('--fail-fast',
48 dest='fail_fast', action='store_true', 48 dest='fail_fast', action='store_true',
49 help='Stop rebasing after first error is hit') 49 help='stop rebasing after first error is hit')
50 p.add_option('-f', '--force-rebase', 50 p.add_option('-f', '--force-rebase',
51 dest='force_rebase', action='store_true', 51 dest='force_rebase', action='store_true',
52 help='Pass --force-rebase to git rebase') 52 help='pass --force-rebase to git rebase')
53 p.add_option('--no-ff', 53 p.add_option('--no-ff',
54 dest='ff', default=True, action='store_false', 54 dest='ff', default=True, action='store_false',
55 help='Pass --no-ff to git rebase') 55 help='pass --no-ff to git rebase')
56 p.add_option('--autosquash', 56 p.add_option('--autosquash',
57 dest='autosquash', action='store_true', 57 dest='autosquash', action='store_true',
58 help='Pass --autosquash to git rebase') 58 help='pass --autosquash to git rebase')
59 p.add_option('--whitespace', 59 p.add_option('--whitespace',
60 dest='whitespace', action='store', metavar='WS', 60 dest='whitespace', action='store', metavar='WS',
61 help='Pass --whitespace to git rebase') 61 help='pass --whitespace to git rebase')
62 p.add_option('--auto-stash', 62 p.add_option('--auto-stash',
63 dest='auto_stash', action='store_true', 63 dest='auto_stash', action='store_true',
64 help='Stash local modifications before starting') 64 help='stash local modifications before starting')
65 p.add_option('-m', '--onto-manifest', 65 p.add_option('-m', '--onto-manifest',
66 dest='onto_manifest', action='store_true', 66 dest='onto_manifest', action='store_true',
67 help='Rebase onto the manifest version instead of upstream ' 67 help='rebase onto the manifest version instead of upstream '
68 'HEAD. This helps to make sure the local tree stays ' 68 'HEAD (this helps to make sure the local tree stays '
69 'consistent if you previously synced to a manifest.') 69 'consistent if you previously synced to a manifest)')
70 70
71 def Execute(self, opt, args): 71 def Execute(self, opt, args):
72 all_projects = self.GetProjects(args) 72 all_projects = self.GetProjects(args)