Mercurial > public > mercurial-scm > hg
diff mercurial/localrepo.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 | dfa17bd1d45e |
| children | dbdce3b99988 |
line wrap: on
line diff
--- a/mercurial/localrepo.py Wed May 17 19:00:16 2006 +0200 +++ b/mercurial/localrepo.py Wed May 17 19:38:41 2006 +0200 @@ -550,12 +550,15 @@ # 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)