This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8481

pullbundles: use unfiltered repo for head/base matching
ClosedPublic

Authored by joerg.sonnenberger on Apr 24 2020, 2:20 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG3d5fb6cab832: pullbundles: use unfiltered repo for head/base matching
rHGe2432e2ae5c4: pullbundles: use unfiltered repo for head/base matching
Summary

The unfiltered view works even when changeset transistion from draft to
hidden phase. The normal visibility is already ensured by discovery as
invisible heads would have been filtered out before. Skipping the
filtering has a positive impact on performance, too.

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 accepted this revision.Apr 28 2020, 4:23 AM
marmoute added a subscriber: marmoute.

seems fine

joerg.sonnenberger added a commit: rHGe2432e2ae5c4: pullbundles: use unfiltered repo for head/base matching.May 7 2020, 11:02 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe2432e2ae5c4: pullbundles: use unfiltered repo for head/base matching (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21282

mercurial/wireprotov1server.py

manifest = repo.vfs.tryread(b'pullbundles.manifest') manifest = repo.vfs.tryread(b'pullbundles.manifest')
if not manifest: if not manifest:
return None return None
res = exchange.parseclonebundlesmanifest(repo, manifest) res = exchange.parseclonebundlesmanifest(repo, manifest)
res = exchange.filterclonebundleentries(repo, res) res = exchange.filterclonebundleentries(repo, res)
if not res: if not res:
return None return None
cl = repo.changelog cl = repo.unfiltered().changelog
heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True) heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True)
common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True) common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True)
compformats = clientcompressionsupport(proto) compformats = clientcompressionsupport(proto)
for entry in res: for entry in res:
comp = entry.get(b'COMPRESSION') comp = entry.get(b'COMPRESSION')
altcomp = util.compengines._bundlenames.get(comp) altcomp = util.compengines._bundlenames.get(comp)
if comp and comp not in compformats and altcomp not in compformats: if comp and comp not in compformats and altcomp not in compformats:
continue continue

tests/test-pull-bundle.t

$ cd .. $ cd ..
Test pullbundle functionality Test pullbundle functionality
$ cd repo $ cd repo
$ cat <<EOF > .hg/hgrc $ cat <<EOF > .hg/hgrc
> [server] > [server]
> pullbundle = True > pullbundle = True
> [experimental]
> evolution = True
> [extensions] > [extensions]
> blackbox = > blackbox =
> EOF > EOF
$ hg bundle --base null -r 0 .hg/0.hg $ hg bundle --base null -r 0 .hg/0.hg
1 changesets found 1 changesets found
$ hg bundle --base 0 -r 1 .hg/1.hg $ hg bundle --base 0 -r 1 .hg/1.hg
1 changesets found 1 changesets found
$ hg bundle --base 1 -r 2 .hg/2.hg $ hg bundle --base 1 -r 2 .hg/2.hg
abort: 00changelog.i@ed1b79f46b9a: no node! abort: 00changelog.i@ed1b79f46b9a: no node!
[255] [255]
$ cd .. $ cd ..
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log
Test processing when nodes used in the pullbundle.manifest end up being hidden
$ hg --repo repo debugobsolete ed1b79f46b9a29f5a6efa59cf12fcfca43bead5a
1 new obsolescence markers
obsoleted 1 changesets
$ hg serve --repo repo --config server.view=visible -p $HGPORT -d --pid-file=hg.pid -E errors.log
$ cat hg.pid >> $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT repo-obs
requesting all changes
adding changesets
adding manifests
adding file changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
new changesets bbd179dfa0a7:effea6de0384
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ killdaemons.py