[PATCH 02 of 15 RFC] verify: use appropriate node information to show verification error

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Wed Oct 3 11:38:59 CDT 2012


# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1349281445 -32400
# Node ID c6908bae78adb4563f343a311c1ac5f59f24f277
# Parent  3ded599feac3543b7fea7f86e3db922cd29d2fe8
verify: use appropriate node information to show verification error

Before this patch, verify module shows verification error message
below:

    unknown parent 2 <HASH_OF_P2> of <HASH_OF_P1>

even though it should show:

    unknown parent 2 <HASH_OF_P2> of <HASH_OF_TARGET>

This patch uses appropriate node information.

diff -r 3ded599feac3 -r c6908bae78ad mercurial/verify.py
--- a/mercurial/verify.py	Thu Oct 04 01:24:05 2012 +0900
+++ b/mercurial/verify.py	Thu Oct 04 01:24:05 2012 +0900
@@ -99,7 +99,7 @@
                     (short(p1), short(n)), f)
             if p2 not in seen and p2 != nullid:
                 err(lr, _("unknown parent 2 %s of %s") %
-                    (short(p2), short(p1)), f)
+                    (short(p2), short(n)), f)
         except Exception, inst:
             exc(lr, _("checking parents of %s") % short(node), inst, f)
 


More information about the Mercurial-devel mailing list