From 0332bcda765c04a2f72f32d49429cae853d9b2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Koutn=C3=BD?= Date: Fri, 5 Jul 2024 01:15:25 +0200 Subject: [PATCH] Implement --prefix option It is advertised already, and TopicManager is ready for it too. Wire it all together. Fixes #8 --- git_explode/cli.py | 7 ++++--- git_explode/exploder.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/git_explode/cli.py b/git_explode/cli.py index c8295d1..4fc3abf 100644 --- a/git_explode/cli.py +++ b/git_explode/cli.py @@ -35,9 +35,10 @@ def parse_args(args): parser.add_argument( '-p', '--prefix', dest="prefix", - help="prefix for all created topic branches", + help="prefix for all created topic branches [%(default)]", type=str, - metavar="PREFIX") + metavar="PREFIX", + default="topic") parser.add_argument( '-c', '--context-lines', dest='context_lines', @@ -63,7 +64,7 @@ def main(args): args = parse_args(args) repo = GitUtils.get_repo() exploder = GitExploder(repo, args.base, args.head, args.debug, - args.context_lines) + args.context_lines, args.prefix) exploder.run() diff --git a/git_explode/exploder.py b/git_explode/exploder.py index 19452a7..efdf327 100644 --- a/git_explode/exploder.py +++ b/git_explode/exploder.py @@ -18,7 +18,7 @@ class GitExploder(object): topic branches. """ - def __init__(self, repo, base, head, debug, context_lines): + def __init__(self, repo, base, head, debug, context_lines, prefix): self.logger = standard_logger('git-explode', debug) self.debug = debug @@ -29,7 +29,7 @@ def __init__(self, repo, base, head, debug, context_lines): (base, GitUtils.commit_summary(self.base_commit))) self.head = head self.context_lines = context_lines - self.topic_mgr = TopicManager('topic%d', self.logger) + self.topic_mgr = TopicManager('%s%%d' % prefix, self.logger) # Map commits to their exploded version self.exploded = {}