aboutsummaryrefslogtreecommitdiff
path: root/git-dch
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-10-07 13:08:55 +0200
committerGuido Guenther <agx@sigxcpu.org>2007-10-07 13:08:55 +0200
commitc29bd4274603aef1e2cc98507c341bec85f2d25e (patch)
tree4cbb108ff3fd6de0e7dfc8e2bb9da4741668f14a /git-dch
parent8abfcf4601c886a9c735caa618f5c581a131f561 (diff)
--auto: guess last changelogged commit from the snapshot header
Diffstat (limited to 'git-dch')
-rwxr-xr-xgit-dch25
1 files changed, 22 insertions, 3 deletions
diff --git a/git-dch b/git-dch
index 9157b2f4..c42bbad0 100755
--- a/git-dch
+++ b/git-dch
@@ -29,10 +29,10 @@ from gbp.config import GbpOptionParser
from gbp.errors import GbpError
from gbp.deb_utils import parse_changelog
-snapshot_re = "\s*\*\* SNAPSHOT build @[a-z0-9]+"
+snapshot_re = "\s*\*\* SNAPSHOT build @(?P<commit>[a-z0-9]+)\s+\*\*"
def get_log(start, end):
- """Get the shortlog from commit start to commit end"""
+ """Get the shortlog from commit 'start' to commit 'end'"""
try:
p1 = subprocess.Popen(["git-log", "--no-merges", "%s...%s" % (start, end)],
stdout=subprocess.PIPE)
@@ -163,6 +163,14 @@ def shortlog_to_dch(changes):
if msg:
add_changelog_entry(msg, author)
+
+def guess_snapshot_commit(cp):
+ """guess the last commit documented in the changelog from the snapshot banner"""
+ sr = re.search(snapshot_re, cp['Changes'])
+ if sr:
+ return sr.group('commit')
+
+
def main(argv):
ret = 0
changelog = 'debian/changelog'
@@ -181,6 +189,8 @@ def main(argv):
help="mark as release")
parser.add_option("--snapshot", action="store_true", dest="snapshot", default=False,
help="mark as snapshot build")
+ parser.add_option("-a", "--auto", action="store_true", dest="auto", default=False,
+ help="autocomplete changelog from last snapshot or tag")
(options, args) = parser.parse_args(argv[1:])
if options.snapshot and options.release:
@@ -205,10 +215,19 @@ def main(argv):
raise GbpError, "Use --git-debian-branch to set the branch to pick changes from"
cp = parse_changelog(changelog)
+
if options.since:
since = options.since
else:
- since = build_tag(options.debian_tag, cp['Version'])
+ since = ''
+ if options.auto:
+ since = guess_snapshot_commit(cp)
+ if since:
+ print "Continuing from commit '%s'" % since
+ else:
+ print "Couldn't get snapshot header, using version info"
+ if not since:
+ since = build_tag(options.debian_tag, cp['Version'])
changes = get_log(since, until)
if changes: