Mercurial > hg > pyhgsh
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 2300:52b9b6751b2c | 2301:7c2623aedeb4 |
|---|---|
| 548 edittext.append("HG: no files changed") | 548 edittext.append("HG: no files changed") |
| 549 edittext.append("") | 549 edittext.append("") |
| 550 # run editor in the repository root | 550 # run editor in the repository root |
| 551 olddir = os.getcwd() | 551 olddir = os.getcwd() |
| 552 os.chdir(self.root) | 552 os.chdir(self.root) |
| 553 edittext = self.ui.edit("\n".join(edittext), user) | 553 text = self.ui.edit("\n".join(edittext), user) |
| 554 os.chdir(olddir) | 554 os.chdir(olddir) |
| 555 if not edittext.rstrip(): | 555 |
| 556 return None | 556 lines = [line.rstrip() for line in text.rstrip().splitlines()] |
| 557 text = edittext | 557 while lines and not lines[0]: |
| 558 | 558 del lines[0] |
| 559 if not lines: | |
| 560 return None | |
| 561 text = '\n'.join(lines) | |
| 559 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date) | 562 n = self.changelog.add(mn, changed + remove, text, tr, p1, p2, user, date) |
| 560 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, | 563 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1, |
| 561 parent2=xp2) | 564 parent2=xp2) |
| 562 tr.close() | 565 tr.close() |
| 563 | 566 |