Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/commands.py @ 2301:7c2623aedeb4
Strip empty lines and trailing spaces around commit messages.
Fixes issue213 and part of issue249 (trying to keep node id on import)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 17 May 2006 19:38:41 +0200 |
| parents | 52b9b6751b2c |
| children | b2f37c7026ca |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1713,14 +1713,14 @@ def import_(ui, repo, patch1, *patches, 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)