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

login
register
mail settings
Submitter Yuya Nishihara
Date April 2, 2015, 1:35 p.m.
Message ID <398d78e415506124dd75.1427981757@mimosa>
Download mbox | patch
Permalink /patch/8453/
State Accepted
Headers show

Comments

Yuya Nishihara - April 2, 2015, 1:35 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@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()

Patch

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