Details

Reviewers

indygreg
durin42
martinvonz

Group Reviewers

hg-reviewers

Commits

rHGd55b71393907: node: replace nullid and friends with nodeconstants class
rHG07b9ebea3ce8: node: replace nullid and friends with nodeconstants class [WIP]

Summary

The introduction of 256bit hashes require changes to nullid and other
constant magic values. Start pushing them down from repository and
revlog where sensible.

Diff Detail

Repository

rHG Mercurial

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

joerg.sonnenberger created this revision.Nov 30 2020, 6:23 AM

Herald added a reviewer: indygreg. · View Herald TranscriptNov 30 2020, 6:23 AM

Herald added a reviewer: durin42. · View Herald Transcript

Herald added a reviewer: martinvonz. · View Herald Transcript

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added subscribers: mercurial-patches, Kwan. · View Herald Transcript

joerg.sonnenberger updated this revision to Diff 24306.Dec 16 2020, 8:12 AM

joerg.sonnenberger mentioned this in D9750: node: introduce nodeconstants class.Jan 13 2021, 10:56 AM

joerg.sonnenberger retitled this revision from [POC] node: replace nullid and friends with nodeconstants class to node: replace nullid and friends with nodeconstants class [WIP].Mar 28 2021, 8:55 PM

joerg.sonnenberger edited the summary of this revision. (Show Details)

joerg.sonnenberger updated this revision to Diff 26621.

joerg.sonnenberger added a parent revision: D10290: refactor: prefer checks against nullrev over nullid.Mar 29 2021, 8:42 PM

joerg.sonnenberger updated this revision to Diff 26629.

Fails tests, eg:

--- tests/test-push-checkheads-unpushed-D7.t
+++ tests/test-push-checkheads-unpushed-D7.t.err
@@ -65,27 +65,16 @@
   $ mkcommit C0
   created new head
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
+  abort: cannot import name 'noderev' from 'mercurial.node' (/tmp/hgtests.5j0okzgk/install/lib/python/mercurial/node.py)
+  abort: cannot import name 'noderev' from 'mercurial.node' (/tmp/hgtests.5j0okzgk/install/lib/python/mercurial/node.py)
   $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
+  abort: cannot import name 'noderev' from 'mercurial.node' (/tmp/hgtests.5j0okzgk/install/lib/python/mercurial/node.py)
+  abort: cannot import name 'noderev' from 'mercurial.node' (/tmp/hgtests.5j0okzgk/install/lib/python/mercurial/node.py)
   $ hg debugobsolete --record-parents `getid "desc(A2)"`
-  1 new obsolescence markers
-  obsoleted 1 changesets
+  abort: cannot import name 'noderev' from 'mercurial.node' (/tmp/hgtests.5j0okzgk/install/lib/python/mercurial/node.py)
   $ hg log -G --hidden
-  @  0f88766e02d6 (draft): C0
-  |
-  | x  c1f8d089020f (draft): A2
-  |/
-  | x  ba93660aff8d (draft): A1
-  | |
-  | o  74ff5441d343 (draft): B0
-  |/
-  | x  8aaa48160adc (draft): A0
-  |/
-  o  1e4be0697311 (public): root
-
+  abort: cannot import name 'noderev' from 'mercurial.node' (/tmp/hgtests.5j0okzgk/install/lib/python/mercurial/node.py)
+  [255]

(among others)

This revision now requires changes to proceed.Mar 30 2021, 4:21 PM

joerg.sonnenberger updated this revision to Diff 27131.Apr 20 2021, 11:35 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

joerg.sonnenberger added a commit: rHG07b9ebea3ce8: node: replace nullid and friends with nodeconstants class [WIP].Apr 20 2021, 12:44 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHG07b9ebea3ce8: node: replace nullid and friends with nodeconstants class [WIP] (authored by joerg.sonnenberger). · Explain Why

This revision was automatically updated to reflect the committed changes.

joerg.sonnenberger retitled this revision from node: replace nullid and friends with nodeconstants class [WIP] to node: replace nullid and friends with nodeconstants class.Apr 20 2021, 1:49 PM

joerg.sonnenberger edited the summary of this revision. (Show Details)

joerg.sonnenberger updated this revision to Diff 27148.

joerg.sonnenberger updated this revision to Diff 27171.Apr 27 2021, 7:42 PM

joerg.sonnenberger added a commit: rHGd55b71393907: node: replace nullid and friends with nodeconstants class.Apr 28 2021, 11:09 AM

			Path	Packages
M			hgext/absorb.py (5 lines)
M			hgext/convert/git.py (14 lines)
M			hgext/convert/hg.py (15 lines)
M			hgext/git/dirstate.py (14 lines)
M			hgext/git/gitlog.py (36 lines)
M			hgext/git/gitutil.py (4 lines)
M			hgext/git/index.py (11 lines)
M			hgext/gpg.py (5 lines)
M			hgext/hgk.py (7 lines)
M			hgext/journal.py (7 lines)
M			hgext/largefiles/basestore.py (5 lines)
M			hgext/largefiles/lfcommands.py (7 lines)
M			hgext/largefiles/lfutil.py (7 lines)
M			hgext/lfs/wrapper.py (4 lines)
M			hgext/mq.py (9 lines)
M			hgext/narrow/narrowbundle2.py (5 lines)
M			hgext/narrow/narrowcommands.py (7 lines)
M			hgext/phabricator.py (6 lines)
M			hgext/remotefilelog/contentstore.py (35 lines)
M			hgext/remotefilelog/datapack.py (7 lines)
M			hgext/remotefilelog/debugcommands.py (16 lines)
M			hgext/remotefilelog/fileserverclient.py (10 lines)
M			hgext/remotefilelog/historypack.py (13 lines)
M			hgext/remotefilelog/metadatastore.py (9 lines)
M			hgext/remotefilelog/remotefilectx.py (22 lines)
M			hgext/remotefilelog/remotefilelog.py (48 lines)
M			hgext/remotefilelog/remotefilelogserver.py (14 lines)
M			hgext/remotefilelog/repack.py (27 lines)
M			hgext/remotefilelog/shallowbundle.py (10 lines)
M			hgext/remotefilelog/shallowrepo.py (6 lines)
M			hgext/sqlitestore.py (49 lines)
M			hgext/transplant.py (10 lines)
M			hgext/uncommit.py (3 lines)
M			mercurial/bookmarks.py (5 lines)
M			mercurial/branchmap.py (10 lines)
M			mercurial/bundle2.py (3 lines)
M			mercurial/bundlerepo.py (5 lines)
M			mercurial/changegroup.py (3 lines)
M			mercurial/changelog.py (3 lines)
M			mercurial/cmdutil.py (13 lines)
M			mercurial/commands.py (26 lines)
M			mercurial/commit.py (42 lines)
M			mercurial/context.py (58 lines)
M			mercurial/copies.py (7 lines)
M			mercurial/debugcommands.py (13 lines)
M			mercurial/dirstate.py (31 lines)
M			mercurial/discovery.py (7 lines)
M			mercurial/exchange.py (9 lines)
M			mercurial/exchangev2.py (15 lines)
M			mercurial/filelog.py (7 lines)
M			mercurial/filemerge.py (3 lines)
M			mercurial/hg.py (15 lines)
M			mercurial/hgweb/webutil.py (12 lines)
M			mercurial/interfaces/dirstate.py (4 lines)
M			mercurial/localrepo.py (25 lines)
M			mercurial/logcmdutil.py (17 lines)
M			mercurial/manifest.py (11 lines)
M			mercurial/merge.py (21 lines)
M			mercurial/mergestate.py (12 lines)
M			mercurial/metadata.py (7 lines)
M			mercurial/obsolete.py (13 lines)
M			mercurial/patch.py (6 lines)
M			mercurial/phases.py (7 lines)
M			mercurial/pure/parsers.py (11 lines)
M			mercurial/revlog.py (59 lines)
M			mercurial/scmutil.py (8 lines)
M			mercurial/setdiscovery.py (19 lines)
M			mercurial/shelve.py (7 lines)
M			mercurial/sparse.py (9 lines)
M			mercurial/strip.py (5 lines)
M			mercurial/subrepo.py (3 lines)
M			mercurial/tagmerge.py (7 lines)
M			mercurial/tags.py (25 lines)
M			mercurial/templatefuncs.py (7 lines)
M			mercurial/templatekw.py (9 lines)
M			mercurial/testing/storage.py (259 lines)
M			mercurial/treediscovery.py (19 lines)
M			mercurial/util.py (1 line)
M			mercurial/utils/storageutil.py (8 lines)
M			mercurial/verify.py (17 lines)
M			mercurial/wireprotov1server.py (7 lines)
M			mercurial/wireprotov2server.py (7 lines)
M			tests/drawdag.py (5 lines)
M			tests/simplestorerepo.py (29 lines)
M			tests/test-annotate.t (8 lines)
M			tests/test-commit.t (12 lines)
M			tests/test-fastannotate-hg.t (8 lines)
M			tests/test-filelog.py (9 lines)
M			tests/test-parseindex2.py (8 lines)
M			tests/test-remotefilelog-datapack.py (40 lines)
M			tests/test-remotefilelog-histpack.py (49 lines)
M			tests/test-revlog-raw.py (9 lines)
M			tests/testlib/ext-sidedata.py (7 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23876		Nov 30 2020, 6:23 AM	★	★
Diff 2	24306		Dec 16 2020, 8:12 AM	★	★
Diff 3	26621		Mar 28 2021, 8:55 PM	★	★
Diff 4	26629		Mar 29 2021, 8:42 PM	★	★
Diff 5	27131		Apr 20 2021, 11:35 AM	★	★
Diff 6	27133		Apr 20 2021, 12:22 PM	★	★
Diff 7	27134	rHG07b9ebea3ce8d32950a4c5c242efa25b584bbe1f	Mar 28 2021, 7:52 PM	★	★
Diff 8	27148		Apr 20 2021, 1:49 PM	★	★
Diff 9	27171		Apr 27 2021, 7:42 PM	★	★

node: replace nullid and friends with nodeconstants classClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 27171

hgext/absorb.py

hgext/convert/git.py

hgext/convert/hg.py

hgext/git/dirstate.py

hgext/git/gitlog.py

hgext/git/gitutil.py

hgext/git/index.py

hgext/gpg.py

hgext/hgk.py

hgext/journal.py

hgext/largefiles/basestore.py

hgext/largefiles/lfcommands.py

hgext/largefiles/lfutil.py

hgext/lfs/wrapper.py

hgext/mq.py

hgext/narrow/narrowbundle2.py

hgext/narrow/narrowcommands.py

hgext/phabricator.py

hgext/remotefilelog/contentstore.py

hgext/remotefilelog/datapack.py

hgext/remotefilelog/debugcommands.py

hgext/remotefilelog/fileserverclient.py

hgext/remotefilelog/historypack.py

hgext/remotefilelog/metadatastore.py

hgext/remotefilelog/remotefilectx.py

hgext/remotefilelog/remotefilelog.py

hgext/remotefilelog/remotefilelogserver.py

hgext/remotefilelog/repack.py

hgext/remotefilelog/shallowbundle.py

hgext/remotefilelog/shallowrepo.py

hgext/sqlitestore.py

hgext/transplant.py

hgext/uncommit.py

mercurial/bookmarks.py

mercurial/branchmap.py

mercurial/bundle2.py

mercurial/bundlerepo.py

mercurial/changegroup.py

mercurial/changelog.py

mercurial/cmdutil.py

mercurial/commands.py

mercurial/commit.py

mercurial/context.py

mercurial/copies.py

mercurial/debugcommands.py

mercurial/dirstate.py

mercurial/discovery.py

mercurial/exchange.py

mercurial/exchangev2.py

mercurial/filelog.py

mercurial/filemerge.py

mercurial/hg.py

mercurial/hgweb/webutil.py

mercurial/interfaces/dirstate.py

mercurial/localrepo.py

mercurial/logcmdutil.py

mercurial/manifest.py

mercurial/merge.py

mercurial/mergestate.py

mercurial/metadata.py

mercurial/obsolete.py

mercurial/patch.py

mercurial/phases.py

mercurial/pure/parsers.py

mercurial/revlog.py

mercurial/scmutil.py

mercurial/setdiscovery.py

mercurial/shelve.py

mercurial/sparse.py

mercurial/strip.py

mercurial/subrepo.py

mercurial/tagmerge.py

mercurial/tags.py

mercurial/templatefuncs.py

node: replace nullid and friends with nodeconstants class
ClosedPublic
Actions

Revision Contents
Changeset List