summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2019-10-30 13:02:16 +0100
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2019-10-30 15:34:51 +0100
commit6d3751db2a1521ab53e91509202811d033990a80 (patch)
tree9b4174f3f6af8e2c112f620646e6ca6b183990cf /scripts
parentc6412a34f038310117bdb284cbfbdbca5f19067a (diff)
branch_qt: allow skipping git hooks
We need to be able to bump versions in lts branches, but the hooks will prevent that since we don't create cherry-pick commits. Change-Id: Ifb6411c94d00518f29cf9575464055f70f4f6a72 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/qt/branch_qt.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/qt/branch_qt.py b/scripts/qt/branch_qt.py
index 022590da..2ea42012 100755
--- a/scripts/qt/branch_qt.py
+++ b/scripts/qt/branch_qt.py
@@ -87,11 +87,12 @@ def is_major_minor_patch(version: str) -> bool:
class QtBranching:
- def __init__(self, mode: Mode, fromBranch: str, toBranch: str, pretend: bool) -> None:
+ def __init__(self, mode: Mode, fromBranch: str, toBranch: str, pretend: bool, skip_hooks: bool) -> None:
self.mode = mode
self.fromBranch = fromBranch
self.toBranch = toBranch
self.pretend = pretend
+ self.skip_hooks = skip_hooks
log.info(f"{self.mode.name} from '{self.fromBranch}' to '{self.toBranch}'")
def subprocess_or_pretend(self, *args: typing.Any, **kwargs: typing.Any) -> None:
@@ -292,7 +293,7 @@ class QtBranching:
if not repo.is_dirty():
log.warning(f"nothing to do for {repo_name}, is the version bump already done?")
return
- repo.index.commit("Bump version")
+ repo.index.commit("Bump version", skip_hooks=self.skip_hooks)
self.push(repo_name, self.fromBranch)
def push(self, project: str, branch: str) -> None:
@@ -368,6 +369,8 @@ def parse_args() -> argparse.Namespace:
type=str, dest="toBranch")
parser.add_argument("--pretend", action="store_true",
help="Make the changes to the repositories, but do not push to Gerrit.")
+ parser.add_argument("--skip-hooks", action="store_true",
+ help="Do not run git commit hooks.")
return parser.parse_args(sys.argv[1:])
@@ -389,7 +392,7 @@ if __name__ == "__main__":
if not args.pretend:
gerrit_add_pushmaster()
- branching = QtBranching(mode=Mode[args.mode], fromBranch=args.fromBranch, toBranch=args.toBranch, pretend=args.pretend)
+ branching = QtBranching(mode=Mode[args.mode], fromBranch=args.fromBranch, toBranch=args.toBranch, pretend=args.pretend, skip_hooks=args.skip_hooks)
branching.run()
finally:
if not args.pretend: