Mercurial > hg
diff mercurial/metadata.py @ 47012:d55b71393907
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 | 433cef8f3104 |
children | 64cd1496bb70 |
line wrap: on
line diff
--- a/mercurial/metadata.py Mon Apr 19 20:38:52 2021 -0400 +++ b/mercurial/metadata.py Mon Mar 29 01:52:06 2021 +0200 @@ -11,10 +11,7 @@ import multiprocessing import struct -from .node import ( - nullid, - nullrev, -) +from .node import nullrev from . import ( error, pycompat, @@ -617,7 +614,7 @@ if f in ctx: fctx = ctx[f] parents = fctx._filelog.parents(fctx._filenode) - if parents[1] != nullid: + if parents[1] != ctx.repo().nullid: merged.append(f) return merged