Mercurial > public > mercurial-scm > hg

comparison mercurial/filemerge.py @ 47012:d55b71393907

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
node: replace nullid and friends with nodeconstants class The introduction of 256bit hashes require changes to nullid and other constant magic values. Start pushing them down from repository and revlog where sensible. Differential Revision: https://phab.mercurial-scm.org/D9465
author Joerg Sonnenberger <joerg@bec.de>
date Mon, 29 Mar 2021 01:52:06 +0200
parents d4ba4d51f85f
children 053dd53a0b59
comparison
equal deleted inserted replaced
46992:5fa019ceb499 47012:d55b71393907
13 import shutil 13 import shutil
14 14
15 from .i18n import _ 15 from .i18n import _
16 from .node import ( 16 from .node import (
17 hex, 17 hex,
18 nullid,
19 short, 18 short,
20 ) 19 )
21 from .pycompat import ( 20 from .pycompat import (
22 getattr, 21 getattr,
23 open, 22 open,
109 108
110 def data(self): 109 def data(self):
111 return None 110 return None
112 111
113 def filenode(self): 112 def filenode(self):
114 return nullid 113 return self._ctx.repo().nullid
115 114
116 _customcmp = True 115 _customcmp = True
117 116
118 def cmp(self, fctx): 117 def cmp(self, fctx):
119 """compare with other file context 118 """compare with other file context