Patchwork D10288: simplemerge: simplify

login
register
mail settings
Submitter phabricator
Date March 29, 2021, 12:06 a.m.
Message ID <differential-rev-PHID-DREV-63gigctyhqe5aytw2tif-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48604/
State Superseded
Headers show

Comments

phabricator - March 29, 2021, 12:06 a.m.
joerg.sonnenberger created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10288

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




To: joerg.sonnenberger, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -19,7 +19,7 @@ 
 from __future__ import absolute_import
 
 from .i18n import _
-from .node import nullid
+from .node import nullrev
 from . import (
     error,
     mdiff,
@@ -427,7 +427,7 @@ 
 def is_not_null(ctx):
     if not util.safehasattr(ctx, "node"):
         return False
-    return ctx.node() != nullid
+    return ctx.rev() != nullrev
 
 
 def _mergediff(m3, name_a, name_b, name_base):