This is an archive of the discontinued Mercurial Phabricator instance.

Differential D571

tree: adds test for pushing a treeonly manifest to a hybrid server
ClosedPublic

Authored by durham on Aug 30 2017, 2:00 PM.
Tags
None
Subscribers
None

Details

Reviewers
simonfar
Group Reviewers
Restricted Project
Commits
rFBHGX0ac32153393a: tree: adds test for pushing a treeonly manifest to a hybrid server
Summary

This adds a test that pushes a treeonly commit from a treeonly client to a
hybrid server, and verifies the result is written to the server flat and tree
manifests. Also tests that hooks can access the tree data.

This also changes the server to read the treemanifest if a tree was provided in
the bundle. Previously the server would only read trees if the forcereceivetrees
flag was on, which meant we couldn't accept flat and trees at the same time,
which made migrating harder.

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.Aug 30 2017, 2:00 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptAug 30 2017, 2:00 PM
simonfar accepted this revision.Aug 31 2017, 7:33 AM
This revision is now accepted and ready to land.Aug 31 2017, 7:33 AM
Closed by commit rFBHGX0ac32153393a: tree: adds test for pushing a treeonly manifest to a hybrid server (authored by durham). · Explain WhyAug 31 2017, 2:31 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 1498

hgext3rd/pushrebase.py

conflicts = findconflictsfast() conflicts = findconflictsfast()
if conflicts: if conflicts:
raise error.Abort(_('conflicting changes in:\n%s') % raise error.Abort(_('conflicting changes in:\n%s') %
''.join(' %s\n' % f for f in sorted(conflicts))) ''.join(' %s\n' % f for f in sorted(conflicts)))
return revs, oldonto return revs, oldonto
def _graft(repo, rev, mapping, lastdestnode): def _graft(op, rev, mapping, lastdestnode):
'''duplicate changeset "rev" with parents from "mapping"''' '''duplicate changeset "rev" with parents from "mapping"'''
repo = op.repo
oldp1 = rev.p1().node() oldp1 = rev.p1().node()
oldp2 = rev.p2().node() oldp2 = rev.p2().node()
newp1 = mapping.get(oldp1, oldp1) newp1 = mapping.get(oldp1, oldp1)
newp2 = mapping.get(oldp2, oldp2) newp2 = mapping.get(oldp2, oldp2)
if not repo.ui.configbool("pushrebase", "forcetreereceive"): if (not op.records[treepackrecords] and
not repo.ui.configbool("pushrebase", "forcetreereceive")):
m = rev.manifest() m = rev.manifest()
else: else:
store = rev._repo.manifestlog.datastore store = rev._repo.manifestlog.datastore
import cstore import cstore
m = cstore.treemanifest(store, rev.manifestnode()) m = cstore.treemanifest(store, rev.manifestnode())
if store.getmissing([('', rev.manifestnode())]): if store.getmissing([('', rev.manifestnode())]):
raise error.Abort(_('error: pushes must contain tree manifests ' raise error.Abort(_('error: pushes must contain tree manifests '
'when the server has ' 'when the server has '
path) path)
prelockrebaseargs['hook_packpaths'] = ':'.join(op.records[treepackrecords]) prelockrebaseargs['hook_packpaths'] = ':'.join(op.records[treepackrecords])
op.repo.hook("prepushrebase", throw=True, **prelockrebaseargs) op.repo.hook("prepushrebase", throw=True, **prelockrebaseargs)
def prefetchcaches(op, params, bundle): def prefetchcaches(op, params, bundle):
bundlerepocache = {} bundlerepocache = {}
# No need to cache trees from the bundle since they are already fast # No need to cache trees from the bundle since they are already fast
if not op.repo.ui.configbool("pushrebase", "forcetreereceive"): if not op.records[treepackrecords]:
# We will need the bundle revs after the lock is taken, so let's # We will need the bundle revs after the lock is taken, so let's
# precache all the bundle rev manifests. # precache all the bundle rev manifests.
bundlectxs = list(bundle.set('bundle()')) bundlectxs = list(bundle.set('bundle()'))
manifestcachesize = op.repo.ui.configint('format', manifestcachesize = op.repo.ui.configint('format',
'manifestcachesize') or 10 'manifestcachesize') or 10
if len(bundlectxs) < manifestcachesize: if len(bundlectxs) < manifestcachesize:
for ctx in bundlectxs: for ctx in bundlectxs:
bundlerepocache[ctx.manifestnode()] = ctx.manifestctx().read() bundlerepocache[ctx.manifestnode()] = ctx.manifestctx().read()
replacements = {} replacements = {}
added = [] added = []
# Seed the mapping with oldonto->onto # Seed the mapping with oldonto->onto
mapping[oldonto.node()] = onto.node() mapping[oldonto.node()] = onto.node()
lastdestnode = None lastdestnode = None
for rev in revs: for rev in revs:
newrev = _graft(op.repo, rev, mapping, lastdestnode) newrev = _graft(op, rev, mapping, lastdestnode)
new = op.repo[newrev] new = op.repo[newrev]
oldnode = rev.node() oldnode = rev.node()
newnode = new.node() newnode = new.node()
replacements[oldnode] = newnode replacements[oldnode] = newnode
mapping[oldnode] = newnode mapping[oldnode] = newnode
added.append(newnode) added.append(newnode)

tests/test-treemanifest-treeonly.t

Create flat manifest client Create flat manifest client
$ cd .. $ cd ..
$ hgcloneshallow ssh://user@dummy/master client -q $ hgcloneshallow ssh://user@dummy/master client -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over * (glob)
$ cd client $ cd client
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [extensions] > [extensions]
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> pushrebase=$TESTDIR/../hgext3rd/pushrebase.py
> EOF > EOF
Make a flat-only draft commit Make a flat-only draft commit
$ echo f >> subdir/x $ echo f >> subdir/x
$ hg commit -qm "flat only commit" $ hg commit -qm "flat only commit"
$ hg up '.^' $ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
o modify y o modify y
| y | 1 + | y | 1 +
| 1 files changed, 1 insertions(+), 0 deletions(-) | 1 files changed, 1 insertions(+), 0 deletions(-)
| |
o hybrid flat+tree commit o hybrid flat+tree commit
| subdir/x | 1 + | subdir/x | 1 +
~ 1 files changed, 1 insertions(+), 0 deletions(-) ~ 1 files changed, 1 insertions(+), 0 deletions(-)
Test pushing to a hybrid server w/ pushrebase w/ hooks
$ cat >> $TESTTMP/filehook.sh <<EOF
> set -xe
> [[ \$(hg log -r \$HG_NODE -T '{file_adds}') == 'y' ]] && exit 1
> echo \$(hg log -r \$HG_NODE -T '{file_adds}')
> exit 2
> EOF
$ chmod a+x $TESTTMP/filehook.sh
$ cat >> ../master/.hg/hgrc <<EOF
> [hooks]
> prepushrebase.fail=$TESTTMP/filehook.sh
> EOF
$ hg push -r 2 --to master
pushing to ssh://user@dummy/master
searching for changes
remote: +++ hg log -r 7ec3c5c54734448e59a0694af54c51578ee4d4de -T '{file_adds}'
remote: ++ [[ y == \y ]]
remote: ++ exit 1
remote: prepushrebase.fail hook exited with status 1
abort: push failed on remote
[255]
Test pushing to a hybrid server w/ pushrebase w/o hooks
$ cat >> ../master/.hg/hgrc <<EOF
> [hooks]
> prepushrebase.fail=true
> EOF
$ hg push -r 2 --to master
pushing to ssh://user@dummy/master
searching for changes
remote: pushing 1 changeset:
remote: 7ec3c5c54734 add y
remote: 1 new changeset from the server will be downloaded
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
$ cd ../master
- Verify the received tree was written down as a flat
$ hg debugindex -m
rev offset length delta linkrev nodeid p1 p2
0 0 51 -1 0 85b359fdb09e 000000000000 000000000000
1 51 51 -1 1 d9920715ba88 85b359fdb09e 000000000000
2 102 55 1 2 83b03df1c9d6 d9920715ba88 000000000000
$ hg debugindex .hg/store/00manifesttree.i
rev offset length delta linkrev nodeid p1 p2
0 0 50 -1 0 85b359fdb09e 000000000000 000000000000
1 50 50 -1 1 d9920715ba88 85b359fdb09e 000000000000
2 100 55 1 2 83b03df1c9d6 d9920715ba88 000000000000
- Verify the manifest data is accessible
$ hg log -r tip --stat
changeset: 2:4f84204095e0
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add y
y | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
TODO TODO
# Access the pre-tree commit
# log -T "{manifest}" #TODO: edit templatekw.showmanifest # log -T "{manifest}" #TODO: edit templatekw.showmanifest