Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2301:7c2623aedeb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2300:52b9b6751b2c 2301:7c2623aedeb4
1711 message.append(line) 1711 message.append(line)
1712 hgpatch = False 1712 hgpatch = False
1713 elif line == '# HG changeset patch': 1713 elif line == '# HG changeset patch':
1714 hgpatch = True 1714 hgpatch = True
1715 message = [] # We may have collected garbage 1715 message = [] # We may have collected garbage
1716 else: 1716 elif message or line:
1717 message.append(line) 1717 message.append(line)
1718 1718
1719 # make sure message isn't empty 1719 # make sure message isn't empty
1720 if not message: 1720 if not message:
1721 message = _("imported patch %s\n") % patch 1721 message = _("imported patch %s\n") % patch
1722 else: 1722 else:
1723 message = "%s\n" % '\n'.join(message) 1723 message = '\n'.join(message).rstrip()
1724 ui.debug(_('message:\n%s\n') % message) 1724 ui.debug(_('message:\n%s\n') % message)
1725 1725
1726 files = util.patch(strip, pf, ui) 1726 files = util.patch(strip, pf, ui)
1727 1727
1728 if len(files) > 0: 1728 if len(files) > 0: