Mercurial > hg
comparison hgext/rebase.py @ 33622:5a5f600b06ad stable
rebase: sort collapsed revisions in commit message (issue5643)
This fixes the test instability.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 02 Aug 2017 21:52:22 +0900 |
| parents | 52f82e7d6a7e |
| children | 86aca74a063b 2f427b57bf90 |
comparison
equal
deleted
inserted
replaced
| 33621:16a175b3681e | 33622:5a5f600b06ad |
|---|---|
| 470 editform = 'rebase.collapse' | 470 editform = 'rebase.collapse' |
| 471 if self.collapsemsg: | 471 if self.collapsemsg: |
| 472 commitmsg = self.collapsemsg | 472 commitmsg = self.collapsemsg |
| 473 else: | 473 else: |
| 474 commitmsg = 'Collapsed revision' | 474 commitmsg = 'Collapsed revision' |
| 475 for rebased in self.state: | 475 for rebased in sorted(self.state): |
| 476 if rebased not in self.skipped and\ | 476 if rebased not in self.skipped and\ |
| 477 self.state[rebased] > nullmerge: | 477 self.state[rebased] > nullmerge: |
| 478 commitmsg += '\n* %s' % repo[rebased].description() | 478 commitmsg += '\n* %s' % repo[rebased].description() |
| 479 editopt = True | 479 editopt = True |
| 480 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | 480 editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) |