mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 20:37:51 +00:00
Update git-changelog by John Wiegley
This commit is contained in:
parent
f34f0b9b39
commit
28731855f7
|
@ -52,19 +52,42 @@ for commit in repo.iter_commits(ref, paths=path):
|
||||||
diff = commit.diff(commit.parents[0])
|
diff = commit.diff(commit.parents[0])
|
||||||
files = []
|
files = []
|
||||||
for f in diff:
|
for f in diff:
|
||||||
p = f.a_blob.path or f.b_blob.path
|
if not f.a_blob:
|
||||||
|
p = f.b_blob.path
|
||||||
|
elif not f.b_blob:
|
||||||
|
p = f.a_blob.path
|
||||||
|
else:
|
||||||
|
continue
|
||||||
|
|
||||||
p2 = re.sub('^' + path + '/', '', p)
|
p2 = re.sub('^' + path + '/', '', p)
|
||||||
if p != p2:
|
if p != p2:
|
||||||
files.append(p2)
|
files.append(p2)
|
||||||
|
|
||||||
fp = Popen(["fmt", "-72"], shell = True, stdin = PIPE, stdout = PIPE)
|
fp = Popen(["fmt", "-72"], shell = True, stdin = PIPE, stdout = PIPE)
|
||||||
fp.stdin.write("\t* %s: %s" % (string.join(files, ",\n\t"), log_text))
|
if files:
|
||||||
|
fp.stdin.write("\t* %s: %s" % (string.join(files, ",\n\t"), log_text))
|
||||||
|
else:
|
||||||
|
fp.stdin.write("\t* %s" % log_text)
|
||||||
fp.stdin.close()
|
fp.stdin.close()
|
||||||
log_text = fp.stdout.read()
|
log_text = fp.stdout.read()
|
||||||
del fp
|
del fp
|
||||||
|
|
||||||
print "%s %s <%s>\n\n%s%s" % \
|
print "%s %s <%s>\n" % \
|
||||||
(time.strftime("%Y-%m-%d", time.gmtime(date)),
|
(time.strftime("%Y-%m-%d", time.gmtime(date)),
|
||||||
author.name, author.email, log_text, log_text_remainder)
|
author.name, author.email)
|
||||||
|
|
||||||
|
if path:
|
||||||
|
log_text = re.sub(' ' + path + '/', ' ', log_text)
|
||||||
|
log_text_remainder = re.sub(' ' + path + '/', ' ', log_text_remainder)
|
||||||
|
|
||||||
|
# If the log_text_remainder already begins with a *, then use that as the
|
||||||
|
# changelog text.
|
||||||
|
if re.match('\s+\* ', log_text_remainder):
|
||||||
|
if log_text_remainder[0] == '\n':
|
||||||
|
print log_text_remainder[1:]
|
||||||
|
else:
|
||||||
|
print log_text_remainder
|
||||||
|
else:
|
||||||
|
print "%s%s" % (log_text, log_text_remainder)
|
||||||
|
|
||||||
# git-changelog ends here
|
# git-changelog ends here
|
||||||
|
|
Loading…
Reference in a new issue