facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Strip empty lines and trailing spaces around commit messages.

Browse Source 
Fixes issue213 and part of issue249 (trying to keep node id on import)
This commit is contained in:
Thomas Arendsen Hein 2006-05-17 19:38:41 +02:00
parent be2a7bb68c
commit be0ce7238f
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hgext/mq.py
View File

@ -139,7 +139,7 @@ class queue:
# when looking for tags (subject: from: etc) they # when looking for tags (subject: from: etc) they
# end once you find a blank line in the source # end once you find a blank line in the source
format = "tagdone" format = "tagdone"
else: elif message or line:
message.append(line) message.append(line)
comments.append(line) comments.append(line)

4
mercurial/commands.py
View File

@ -1713,14 +1713,14 @@ def import_(ui, repo, patch1, *patches, **opts):
elif line == '# HG changeset patch': elif line == '# HG changeset patch':
hgpatch = True hgpatch = True
message = [] # We may have collected garbage message = [] # We may have collected garbage
else: elif message or line:
message.append(line) message.append(line)
# make sure message isn't empty # make sure message isn't empty
if not message: if not message:
message = _("imported patch %s\n") % patch message = _("imported patch %s\n") % patch
else: else:
message = "%s\n" % '\n'.join(message) message = '\n'.join(message).rstrip()
ui.debug(_('message:\n%s\n') % message) ui.debug(_('message:\n%s\n') % message)
files = util.patch(strip, pf, ui) files = util.patch(strip, pf, ui)

11
mercurial/localrepo.py
View File

@ -550,12 +550,15 @@ class localrepository(object):
# run editor in the repository root # run editor in the repository root
olddir = os.getcwd() olddir = os.getcwd()
os.chdir(self.root) os.chdir(self.root)
edittext = self.ui.edit("\n".join(edittext), user) text = self.ui.edit("\n".join(edittext), user)
os.chdir(olddir) 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) n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date)
self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
parent2=xp2) parent2=xp2)