mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
Strip empty lines and trailing spaces around commit messages.
Fixes issue213 and part of issue249 (trying to keep node id on import)
This commit is contained in:
parent
be2a7bb68c
commit
be0ce7238f
@ -139,7 +139,7 @@ class queue:
|
||||
# when looking for tags (subject: from: etc) they
|
||||
# end once you find a blank line in the source
|
||||
format = "tagdone"
|
||||
else:
|
||||
elif message or line:
|
||||
message.append(line)
|
||||
comments.append(line)
|
||||
|
||||
|
@ -1713,14 +1713,14 @@ def import_(ui, repo, patch1, *patches, **opts):
|
||||
elif line == '# HG changeset patch':
|
||||
hgpatch = True
|
||||
message = [] # We may have collected garbage
|
||||
else:
|
||||
elif message or line:
|
||||
message.append(line)
|
||||
|
||||
# make sure message isn't empty
|
||||
if not message:
|
||||
message = _("imported patch %s\n") % patch
|
||||
else:
|
||||
message = "%s\n" % '\n'.join(message)
|
||||
message = '\n'.join(message).rstrip()
|
||||
ui.debug(_('message:\n%s\n') % message)
|
||||
|
||||
files = util.patch(strip, pf, ui)
|
||||
|
@ -550,12 +550,15 @@ class localrepository(object):
|
||||
# run editor in the repository root
|
||||
olddir = os.getcwd()
|
||||
os.chdir(self.root)
|
||||
edittext = self.ui.edit("\n".join(edittext), user)
|
||||
text = self.ui.edit("\n".join(edittext), user)
|
||||
os.chdir(olddir)
|
||||
if not edittext.rstrip():
|
||||
return None
|
||||
text = edittext
|
||||
|
||||
lines = [line.rstrip() for line in text.rstrip().splitlines()]
|
||||
while lines and not lines[0]:
|
||||
del lines[0]
|
||||
if not lines:
|
||||
return None
|
||||
text = '\n'.join(lines)
|
||||
n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date)
|
||||
self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
|
||||
parent2=xp2)
|
||||
|
Loading…
Reference in New Issue
Block a user