LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lineage-push: Rename --merge to --bypass

Browse Source 
Change-Id: I3510977b62a304920103a4c5f555cb66ccd4cbea
This commit is contained in:
Luca Stefani
2018-04-14 23:04:01 +02:00
parent f8370f65ba
commit 6e0ab73c74
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lineage-push/README.md
View File

@@ -1,7 +1,7 @@
# LineageOS Push Script # 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]] [-r REF] [-s] [-t TOPIC] [-w [WIP]]
branch branch
@@ -12,12 +12,12 @@ positional arguments:
optional arguments: optional arguments:
-h, --help show this help message and exit -h, --help show this help message and exit
-b, --bypass bypass review and merge
-d, --draft upload change as draft -d, --draft upload change as draft
-e, --edit upload change as edit -e, --edit upload change as edit
-f, --force force push -f, --force force push
-l LABEL, --label LABEL -l LABEL, --label LABEL
assign label assign label
-m, --merge bypass review and merge
-p [PRIVATE], --private [PRIVATE] -p [PRIVATE], --private [PRIVATE]
upload change as private upload change as private
-r REF, --ref REF push to specified ref -r REF, --ref REF push to specified ref

6
lineage-push/lineage-push.py
View File

@@ -25,7 +25,7 @@ def push(args):
if args.ref != 'for': if args.ref != 'for':
command += 'refs/{}/'.format(args.ref) command += 'refs/{}/'.format(args.ref)
elif args.merge: elif args.bypass:
command += '' command += ''
elif args.draft: elif args.draft:
command += 'refs/drafts/' command += 'refs/drafts/'
@@ -77,6 +77,8 @@ def parse_cmdline():
parser = ArgumentParser( parser = ArgumentParser(
description='Pushes a local git repository\'s changes to Gerrit for code review') 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('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', parser.add_argument('-d', '--draft', action='store_true',
help='upload change as draft') help='upload change as draft')
parser.add_argument('-e', '--edit', action='store_true', parser.add_argument('-e', '--edit', action='store_true',
@@ -84,8 +86,6 @@ def parse_cmdline():
parser.add_argument( parser.add_argument(
'-f', '--force', action='store_true', help='force push') '-f', '--force', action='store_true', help='force push')
parser.add_argument('-l', '--label', help='assign label') 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='?', parser.add_argument('-p', '--private', type=str2bool, nargs='?',
const=True, help='upload change as private') const=True, help='upload change as private')
parser.add_argument( parser.add_argument(