lineage-push: Rename --merge to --bypass
Change-Id: I3510977b62a304920103a4c5f555cb66ccd4cbea
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# LineageOS Push Script
|
||||
|
||||
```
|
||||
usage: lineage-push.py [-h] [-d] [-e] [-f] [-l LABEL] [-m] [-p [PRIVATE]]
|
||||
usage: lineage-push.py [-h] [-b] [-d] [-e] [-f] [-l LABEL] [-p [PRIVATE]]
|
||||
[-r REF] [-s] [-t TOPIC] [-w [WIP]]
|
||||
branch
|
||||
|
||||
@@ -12,12 +12,12 @@ positional arguments:
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
-b, --bypass bypass review and merge
|
||||
-d, --draft upload change as draft
|
||||
-e, --edit upload change as edit
|
||||
-f, --force force push
|
||||
-l LABEL, --label LABEL
|
||||
assign label
|
||||
-m, --merge bypass review and merge
|
||||
-p [PRIVATE], --private [PRIVATE]
|
||||
upload change as private
|
||||
-r REF, --ref REF push to specified ref
|
||||
|
||||
@@ -25,7 +25,7 @@ def push(args):
|
||||
|
||||
if args.ref != 'for':
|
||||
command += 'refs/{}/'.format(args.ref)
|
||||
elif args.merge:
|
||||
elif args.bypass:
|
||||
command += ''
|
||||
elif args.draft:
|
||||
command += 'refs/drafts/'
|
||||
@@ -77,6 +77,8 @@ def parse_cmdline():
|
||||
parser = ArgumentParser(
|
||||
description='Pushes a local git repository\'s changes to Gerrit for code review')
|
||||
parser.add_argument('branch', help='upload change to branch')
|
||||
parser.add_argument('-b', '--bypass', action='store_true',
|
||||
help='bypass review and merge')
|
||||
parser.add_argument('-d', '--draft', action='store_true',
|
||||
help='upload change as draft')
|
||||
parser.add_argument('-e', '--edit', action='store_true',
|
||||
@@ -84,8 +86,6 @@ def parse_cmdline():
|
||||
parser.add_argument(
|
||||
'-f', '--force', action='store_true', help='force push')
|
||||
parser.add_argument('-l', '--label', help='assign label')
|
||||
parser.add_argument('-m', '--merge', action='store_true',
|
||||
help='bypass review and merge')
|
||||
parser.add_argument('-p', '--private', type=str2bool, nargs='?',
|
||||
const=True, help='upload change as private')
|
||||
parser.add_argument(
|
||||
|
||||
Reference in New Issue
Block a user