Patchwork [1,of,5,STABLE,pypy] rebase: sort collapsed revisions in commit message (issue5643)

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 2, 2017, 2:22 p.m.
Message ID <4291548fe6ee8bf5249d.1501683741@mimosa>
Download mbox | patch
Permalink /patch/22636/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 2, 2017, 2:22 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1501678342 -32400
#      Wed Aug 02 21:52:22 2017 +0900
# Branch stable
# Node ID 4291548fe6ee8bf5249d73c1eefbb145818e1318
# Parent  76b171209151fe41dbf8dbfec473cc533f3b40ca
rebase: sort collapsed revisions in commit message (issue5643)

This fixes the test instability.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -472,7 +472,7 @@  class rebaseruntime(object):
                 commitmsg = self.collapsemsg
             else:
                 commitmsg = 'Collapsed revision'
-                for rebased in self.state:
+                for rebased in sorted(self.state):
                     if rebased not in self.skipped and\
                        self.state[rebased] > nullmerge:
                         commitmsg += '\n* %s' % repo[rebased].description()