diff options
author | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-04-14 23:04:01 +0200 |
---|---|---|
committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2018-04-14 23:21:12 +0200 |
commit | 6e0ab73c747eaa299d17433ac49155a1c628b22e (patch) | |
tree | e22eb014035c806232695cc28f3f658f0de5573c | |
parent | f8370f65bad957b8d5ff7cde503662c5e961594a (diff) | |
download | scripts-6e0ab73c747eaa299d17433ac49155a1c628b22e.tar.gz scripts-6e0ab73c747eaa299d17433ac49155a1c628b22e.tar.bz2 scripts-6e0ab73c747eaa299d17433ac49155a1c628b22e.zip |
lineage-push: Rename --merge to --bypass
Change-Id: I3510977b62a304920103a4c5f555cb66ccd4cbea
-rw-r--r-- | lineage-push/README.md | 4 | ||||
-rwxr-xr-x | lineage-push/lineage-push.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lineage-push/README.md b/lineage-push/README.md index 70a0fb3..1f9682e 100644 --- a/lineage-push/README.md +++ b/lineage-push/README.md @@ -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 diff --git a/lineage-push/lineage-push.py b/lineage-push/lineage-push.py index af75367..94146c6 100755 --- a/lineage-push/lineage-push.py +++ b/lineage-push/lineage-push.py @@ -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( |