This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9810

persistent-nodemap: also exchange the nodemap data over the wire
ClosedPublic

Authored by marmoute on Jan 17 2021, 2:29 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG7c1367c0b5bc: persistent-nodemap: also exchange the nodemap data over the wire
Summary

It appears that 2 bytes are never equals to 3 bytes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jan 17 2021, 2:29 PM
baymax updated this revision to Diff 25088.Jan 17 2021, 3:46 PM

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

mharbison72 accepted this revision.Jan 17 2021, 5:05 PM
This revision is now accepted and ready to land.Jan 17 2021, 5:05 PM
indygreg added a subscriber: indygreg.Jan 24 2021, 3:33 PM
indygreg added inline comments.
mercurial/store.py
394–396

This could be f.endswith((b'.i', b'.d', b'.n', b'.nd')), which is easier to read IMO. I also suspect it might be slightly more efficient.

marmoute added inline comments.Jan 25 2021, 10:34 AM
mercurial/store.py
394–396

Ho right, I'll send a follow up

Revision Contents
Changeset List

PathPackages
Mmercurial/store.py (6 lines)
Mtests/test-persistent-nodemap.t (2 lines)

Diff 25092

mercurial/store.py

b'00changelog.i', b'00changelog.i',
b'phaseroots', b'phaseroots',
b'obsstore', b'obsstore',
b'requires', b'requires',
] ]
def isrevlog(f, kind, st): def isrevlog(f, kind, st):
return kind == stat.S_IFREG and f[-2:] in (b'.i', b'.d', b'.n', b'.nd') if kind != stat.S_IFREG:
return False
if f[-2:] in (b'.i', b'.d', b'.n'):
return True
return f[-3:] == b'.nd'
indygregUnsubmitted
Not Done

This could be f.endswith((b'.i', b'.d', b'.n', b'.nd')), which is easier to read IMO. I also suspect it might be slightly more efficient.

indygreg: This could be `f.endswith((b'.i', b'.d', b'.n', b'.nd'))`, which is easier to read IMO. I also…
marmouteAuthorUnsubmitted
Done

Ho right, I'll send a follow up

marmoute: Ho right, I'll send a follow up
class basicstore(object): class basicstore(object):
'''base class for local repository stores''' '''base class for local repository stores'''
def __init__(self, path, vfstype): def __init__(self, path, vfstype):
vfs = vfstype(path) vfs = vfstype(path)
self.path = vfs.base self.path = vfs.base

tests/test-persistent-nodemap.t

------------ ------------
The persistent nodemap should exist after a streaming clone The persistent nodemap should exist after a streaming clone
$ hg clone -U --stream --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/test-repo stream-clone --debug | egrep '00(changelog|manifest)' $ hg clone -U --stream --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/test-repo stream-clone --debug | egrep '00(changelog|manifest)'
adding [s] 00manifest.n (70 bytes) adding [s] 00manifest.n (70 bytes)
adding [s] 00manifest.i (313 KB) adding [s] 00manifest.i (313 KB)
adding [s] 00manifest.d (452 KB) adding [s] 00manifest.d (452 KB)
adding [s] 00manifest-*.nd (118 KB) (glob)
adding [s] 00changelog.n (70 bytes) adding [s] 00changelog.n (70 bytes)
adding [s] 00changelog.i (313 KB) adding [s] 00changelog.i (313 KB)
adding [s] 00changelog.d (360 KB) adding [s] 00changelog.d (360 KB)
adding [s] 00changelog-*.nd (118 KB) (glob)
$ ls -1 stream-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)' $ ls -1 stream-clone/.hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)'
00changelog-*.nd (glob) 00changelog-*.nd (glob)
00changelog.n 00changelog.n
00manifest-*.nd (glob) 00manifest-*.nd (glob)
00manifest.n 00manifest.n
$ hg -R stream-clone debugnodemap --metadata $ hg -R stream-clone debugnodemap --metadata
uid: * (glob) uid: * (glob)
tip-rev: 5005 tip-rev: 5005
tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
data-length: 121088 data-length: 121088
data-unused: 0 data-unused: 0
data-unused: 0.000% data-unused: 0.000%