D5409: remotefilelog: accepting a None node to cmp

rdamazio (Rodrigo Damazio Bovendorp) phabricator at mercurial-scm.org
Tue Dec 11 01:51:24 UTC 2018


rdamazio created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  In context.py, basefilectx.cmp explicitly calls it with None, so it has to be
  supported. Specifically, this breaks "hg absorb -i" currently.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/remotefilelog/remotefilelog.py

CHANGE DETAILS

diff --git a/hgext/remotefilelog/remotefilelog.py b/hgext/remotefilelog/remotefilelog.py
--- a/hgext/remotefilelog/remotefilelog.py
+++ b/hgext/remotefilelog/remotefilelog.py
@@ -187,7 +187,7 @@
         returns True if text is different than what is stored.
         """
 
-        if node == nullid:
+        if not node or node == nullid:
             return True
 
         nodetext = self.read(node)



To: rdamazio, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list