This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1266

treemanifest: remove sendflat config
ClosedPublic

Authored by durham on Oct 30 2017, 11:29 AM.
Tags
None
Subscribers
None

Details

Reviewers
phillco
Group Reviewers
Restricted Project
Commits
rFBHGX4d0aeb4cb85f: treemanifest: remove sendflat config
Summary

Previously the sendflat config decided if we should send flat manifests or not.
To reduce the number of config permutations we have to handle, let's change the
code to always send the flat manifests, if it exists.

Diff Detail

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

Event Timeline

durham created this revision.Oct 30 2017, 11:29 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 30 2017, 11:29 AM
phillco accepted this revision.Nov 1 2017, 12:19 PM
This revision is now accepted and ready to land.Nov 1 2017, 12:19 PM
Closed by commit rFBHGX4d0aeb4cb85f: treemanifest: remove sendflat config (authored by durham). · Explain WhyNov 2 2017, 3:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3220

remotefilelog/shallowbundle.py

for i in xrange(len(nodelist) - 1): for i in xrange(len(nodelist) - 1):
prev, curr = nodelist[i], nodelist[i + 1] prev, curr = nodelist[i], nodelist[i + 1]
linknode = lookup(curr) linknode = lookup(curr)
for c in self.nodechunk(rlog, curr, prev, linknode): for c in self.nodechunk(rlog, curr, prev, linknode):
yield c yield c
yield self.close() yield self.close()
def _cansendflat(repo, mfnodes):
if not util.safehasattr(repo.manifestlog, '_revlog'):
return False
revlog = repo.manifestlog._revlog
for mfnode in mfnodes:
if mfnode not in revlog.nodemap:
return False
return True
@shallowutil.interposeclass(changegroup, 'cg1packer') @shallowutil.interposeclass(changegroup, 'cg1packer')
class shallowcg1packer(changegroup.cg1packer): class shallowcg1packer(changegroup.cg1packer):
def generate(self, commonrevs, clnodes, fastpathlinkrev, source): def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
if "remotefilelog" in self._repo.requirements: if "remotefilelog" in self._repo.requirements:
fastpathlinkrev = False fastpathlinkrev = False
return super(shallowcg1packer, self).generate(commonrevs, clnodes, return super(shallowcg1packer, self).generate(commonrevs, clnodes,
fastpathlinkrev, source) fastpathlinkrev, source)
{ manifest root node -> link node } { manifest root node -> link node }
- `fnodes` is a mapping of { filepath -> { node -> clnode } } - `fnodes` is a mapping of { filepath -> { node -> clnode } }
If fastpathlinkrev is false, we are responsible for populating If fastpathlinkrev is false, we are responsible for populating
fnodes. fnodes.
- `args` and `kwargs` are extra arguments that will be passed to the - `args` and `kwargs` are extra arguments that will be passed to the
core generatemanifests method, whose length depends on the core generatemanifests method, whose length depends on the
version of core Hg. version of core Hg.
""" """
sendflat = self._repo.ui.configbool('treemanifest', 'sendflat', if _cansendflat(self._repo, mfs.keys()):
True)
if sendflat:
# In this code path, generating the manifests populates fnodes for # In this code path, generating the manifests populates fnodes for
# us. # us.
chunks = super(shallowcg1packer, self).generatemanifests( chunks = super(shallowcg1packer, self).generatemanifests(
commonrevs, commonrevs,
clrevorder, clrevorder,
fastpathlinkrev, fastpathlinkrev,
mfs, mfs,
fnodes, fnodes,
clrevorder, clrevorder,
fastpathlinkrev, fastpathlinkrev,
mfs, mfs,
fnodes, fnodes,
*args, **kwargs) *args, **kwargs)
for chunk in chunks: for chunk in chunks:
yield chunk yield chunk
sendflat = self._repo.ui.configbool('treemanifest', 'sendflat',
True)
# If we're not sending flat manifests, then the subclass # If we're not sending flat manifests, then the subclass
# generatemanifests call did not add the appropriate closing chunk # generatemanifests call did not add the appropriate closing chunk
# for a changegroup3. # for a changegroup3.
if not sendflat: if not _cansendflat(self._repo, mfs.keys()):
yield self._manifestsdone() yield self._manifestsdone()
# Unused except in older versions of Mercurial # Unused except in older versions of Mercurial
def getchangegroup(orig, repo, source, outgoing, bundlecaps=None, version='01'): def getchangegroup(orig, repo, source, outgoing, bundlecaps=None, version='01'):
def origmakechangegroup(repo, outgoing, version, source): def origmakechangegroup(repo, outgoing, version, source):
return orig(repo, source, outgoing, bundlecaps=bundlecaps, return orig(repo, source, outgoing, bundlecaps=bundlecaps,
version=version) version=version)

tests/test-treemanifest-server.t

remote: +++ hg log -r 15486e46ccf6947fbb0a0209e6ce479e7f87ffae -T '{file_adds}' remote: +++ hg log -r 15486e46ccf6947fbb0a0209e6ce479e7f87ffae -T '{file_adds}'
remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]] remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]]
remote: ++ exit 1 remote: ++ exit 1
remote: prepushrebase.myhook hook exited with status 1 remote: prepushrebase.myhook hook exited with status 1
abort: push failed on remote abort: push failed on remote
[255] [255]
Test pushing only trees with commit hooks Test pushing only trees with commit hooks
$ cat >> .hg/hgrc <<EOF TODO: change this to create a treeonly commit and try to push it
> [treemanifest]
> sendflat=False
> EOF
$ hg push --to mybook $ hg push --to mybook
pushing to ssh://user@dummy/master pushing to ssh://user@dummy/master
searching for changes searching for changes
remote: +++ hg log -r 15486e46ccf6947fbb0a0209e6ce479e7f87ffae -T '{file_adds}' remote: +++ hg log -r 15486e46ccf6947fbb0a0209e6ce479e7f87ffae -T '{file_adds}'
remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]] remote: ++ [[ subdir2/z == \s\u\b\d\i\r\2\/\z ]]
remote: ++ exit 1 remote: ++ exit 1
remote: prepushrebase.myhook hook exited with status 1 remote: prepushrebase.myhook hook exited with status 1
abort: push failed on remote abort: push failed on remote

tests/test-treemanifest-treeonly.t

-r--r--r-- 211 3c68632603fbc30bd6ee720bd43c0f0940930cc8.datapack -r--r--r-- 211 3c68632603fbc30bd6ee720bd43c0f0940930cc8.datapack
-r--r--r-- 1196 54389aae9b0f11d9cc4e33901e6de68bad129e73.histidx -r--r--r-- 1196 54389aae9b0f11d9cc4e33901e6de68bad129e73.histidx
-r--r--r-- 183 54389aae9b0f11d9cc4e33901e6de68bad129e73.histpack -r--r--r-- 183 54389aae9b0f11d9cc4e33901e6de68bad129e73.histpack
Transition to tree-only client Transition to tree-only client
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [treemanifest] > [treemanifest]
> treeonly=True > treeonly=True
> sendflat=False
> EOF > EOF
Make a local tree-only draft commit Make a local tree-only draft commit
$ ls_l .hg/store/packs/manifests | wc -l $ ls_l .hg/store/packs/manifests | wc -l
\s*4 (re) \s*4 (re)
$ echo t >> subdir/x $ echo t >> subdir/x
$ hg commit -qm "tree only commit" $ hg commit -qm "tree only commit"
1 trees fetched over * (glob) 1 trees fetched over * (glob)

treemanifest/__init__.py

Setting `treemanifest.repackstartrev` and `treemanifest.repackendrev` causes `hg Setting `treemanifest.repackstartrev` and `treemanifest.repackendrev` causes `hg
repack --incremental` to only repack the revlog entries in the given range. The repack --incremental` to only repack the revlog entries in the given range. The
default values are 0 and len(changelog) - 1, respectively. default values are 0 and len(changelog) - 1, respectively.
[treemanifest] [treemanifest]
repackstartrev = 0 repackstartrev = 0
repackendrev = 1000 repackendrev = 1000
Setting `treemanifest.sendflat` to False will stop flat manifests from being
sent as part of changegroups during push. It defaults to True.
[treemanifest]
sendflat = True
Setting `treemanifest.treeonly` to True will force all manifest reads to use the Setting `treemanifest.treeonly` to True will force all manifest reads to use the
tree format. This is useful in the final stages of a migration to treemanifest tree format. This is useful in the final stages of a migration to treemanifest
to prevent accesses of flat manifests. to prevent accesses of flat manifests.
[treemanifest] [treemanifest]
treeonly = True treeonly = True
""" """
category = part.params.get('category', '') category = part.params.get('category', '')
if category != PACK_CATEGORY: if category != PACK_CATEGORY:
raise error.Abort(_("invalid treegroup pack category: %s") % raise error.Abort(_("invalid treegroup pack category: %s") %
category) category)
# Treemanifest servers don't accept tree directly. They must go through # Treemanifest servers don't accept tree directly. They must go through
# pushrebase, which uses it's own part type and handler. # pushrebase, which uses it's own part type and handler.
if op.repo.svfs.treemanifestserver: if repo.svfs.treemanifestserver:
return return
if part.params.get('cache', 'False') == 'True': if part.params.get('cache', 'False') == 'True':
packpath = shallowutil.getcachepackpath(repo, PACK_CATEGORY) packpath = shallowutil.getcachepackpath(repo, PACK_CATEGORY)
else: else:
packpath = shallowutil.getlocalpackpath(repo.svfs.vfs.base, packpath = shallowutil.getlocalpackpath(repo.svfs.vfs.base,
PACK_CATEGORY) PACK_CATEGORY)
receivedhistory, receiveddata = wirepack.receivepack(repo.ui, part, receivedhistory, receiveddata = wirepack.receivepack(repo.ui, part,