Patchwork debugdag: stop wrongly sorting parents

login
register
mail settings
Submitter Henrik Stuart
Date Aug. 30, 2014, 10:40 a.m.
Message ID <ff70ce70f88279323c7f.1409395234@icarus>
Download mbox | patch
Permalink /patch/5628/
State Accepted
Headers show

Comments

Henrik Stuart - Aug. 30, 2014, 10:40 a.m.
# HG changeset patch
# User Henrik Stuart <hg@hstuart.dk>
# Date 1409392593 -7200
#      Sat Aug 30 11:56:33 2014 +0200
# Node ID ff70ce70f88279323c7f4904c6b2f73a61aed0c0
# Parent  bdc0e04df243d3995c7266bf7d138fddd0449ba6
debugdag: stop wrongly sorting parents

The dag being dumped is not in a format that allows us to reconstruct the
original dag as the parent revisions are normalised.
Matt Mackall - Aug. 30, 2014, 12:19 p.m.
On Sat, 2014-08-30 at 12:40 +0200, Henrik Stuart wrote:
> # HG changeset patch
> # User Henrik Stuart <hg@hstuart.dk>
> # Date 1409392593 -7200
> #      Sat Aug 30 11:56:33 2014 +0200
> # Node ID ff70ce70f88279323c7f4904c6b2f73a61aed0c0
> # Parent  bdc0e04df243d3995c7266bf7d138fddd0449ba6
> debugdag: stop wrongly sorting parents

Queued for default, thanks.

Patch

diff -r bdc0e04df243 -r ff70ce70f882 mercurial/commands.py
--- a/mercurial/commands.py	Wed Aug 27 18:35:34 2014 +0200
+++ b/mercurial/commands.py	Sat Aug 30 11:56:33 2014 +0200
@@ -1905,8 +1905,8 @@ 
         revs = set((int(r) for r in revs))
         def events():
             for r in rlog:
-                yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
-                                        if p != -1)))
+                yield 'n', (r, list(p for p in rlog.parentrevs(r)
+                                        if p != -1))
                 if r in revs:
                     yield 'l', (r, "r%i" % r)
     elif repo:
@@ -1925,8 +1925,8 @@ 
                     if newb != b:
                         yield 'a', newb
                         b = newb
-                yield 'n', (r, list(set(p for p in cl.parentrevs(r)
-                                        if p != -1)))
+                yield 'n', (r, list(p for p in cl.parentrevs(r)
+                                        if p != -1))
                 if tags:
                     ls = labels.get(r)
                     if ls: