[PATCH 2 of 4] changeset_printer: handle workingctx in _meaningful_parentrevs()

Yuya Nishihara yuya at tcha.org
Thu Apr 2 08:35:57 CDT 2015


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1426321788 -32400
#      Sat Mar 14 17:29:48 2015 +0900
# Node ID 398d78e415506124dd758574a36ee3dba3e53598
# Parent  ab6b3165b3f0afc274311ab8c6070a3c81ac35ec
changeset_printer: handle workingctx in _meaningful_parentrevs()

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -1237,7 +1237,7 @@ class changeset_printer(object):
             return parents
         if self.ui.debugflag:
             return [parents[0], self.repo['null']]
-        if parents[0].rev() >= ctx.rev() - 1:
+        if parents[0].rev() >= scmutil.intrev(self.repo, ctx.rev()) - 1:
             return []
         return parents
 


More information about the Mercurial-devel mailing list