Mercurial > public > mercurial-scm > hg-stable
diff mercurial/patch.py @ 47055: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 | 5f86765c9707 |
| children | e0d566f3ffce |
line wrap: on
line diff
--- a/mercurial/patch.py Mon Apr 19 20:38:52 2021 -0400 +++ b/mercurial/patch.py Mon Mar 29 01:52:06 2021 +0200 @@ -20,7 +20,7 @@ from .i18n import _ from .node import ( hex, - nullhex, + sha1nodeconstants, short, ) from .pycompat import open @@ -3100,8 +3100,8 @@ ctx1, fctx1, path1, flag1, content1, date1 = data1 ctx2, fctx2, path2, flag2, content2, date2 = data2 - index1 = _gitindex(content1) if path1 in ctx1 else nullhex - index2 = _gitindex(content2) if path2 in ctx2 else nullhex + index1 = _gitindex(content1) if path1 in ctx1 else sha1nodeconstants.nullhex + index2 = _gitindex(content2) if path2 in ctx2 else sha1nodeconstants.nullhex if binary and opts.git and not opts.nobinary: text = mdiff.b85diff(content1, content2) if text: