Mercurial > hg-stable
changeset 17718:4562570ae0f7
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.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Thu, 04 Oct 2012 01:24:05 +0900 |
| parents | 009db477c9fb |
| children | 2e3ceb59c312 |
| files | mercurial/verify.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)