mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
infinitepush: skip fastheadsdiscovery heuristic
Summary: remotenames extension has a heuristic that speeds up discovery. Unfortunately it may result in sending public commits to infinitepush server. This diff intentionally disables this heuristic for infinitepush backups. Test Plan: Run tests Reviewers: #fbhgext, mbthomas Reviewed By: #fbhgext, mbthomas Subscribers: durham Differential Revision: https://phab.mercurial-scm.org/D1505
This commit is contained in:
Stanislau Hlebik
parent
2964ab4f21
commit
909bea3df8
@ -754,10 +754,29 @@ def _sendbundle(bundler, other):
|
||||
except error.BundleValueError as exc:
|
||||
raise error.Abort(_('missing support for %s') % exc)
|
||||
|
||||
def findcommonoutgoing(repo, other, heads):
|
||||
def findcommonoutgoing(repo, ui, other, heads):
|
||||
if heads:
|
||||
nodes = map(repo.changelog.node, heads)
|
||||
return discovery.findcommonoutgoing(repo, other, onlyheads=nodes)
|
||||
# Avoid using remotenames fastheaddiscovery heuristic. It uses
|
||||
# remotenames file to quickly find commonoutgoing set, but it can
|
||||
# result in sending public commits to infinitepush servers.
|
||||
# For example:
|
||||
#
|
||||
# o draft
|
||||
# /
|
||||
# o C1
|
||||
# |
|
||||
# ...
|
||||
# |
|
||||
# o remote/master
|
||||
#
|
||||
# pushbackup in that case results in sending to the infinitepush server
|
||||
# all public commits from 'remote/master' to C1. It increases size of
|
||||
# the bundle + it may result in storing data about public commits
|
||||
# in infinitepush table.
|
||||
|
||||
with ui.configoverride({("remotenames", "fastheaddiscovery"): False}):
|
||||
nodes = map(repo.changelog.node, heads)
|
||||
return discovery.findcommonoutgoing(repo, other, onlyheads=nodes)
|
||||
else:
|
||||
return None
|
||||
|
||||
@ -782,7 +801,7 @@ def _getrevstobackup(repo, ui, other, headstobackup):
|
||||
headstobackup)
|
||||
|
||||
revs = list(repo[hexnode].rev() for hexnode in headstobackup)
|
||||
outgoing = findcommonoutgoing(repo, other, revs)
|
||||
outgoing = findcommonoutgoing(repo, ui, other, revs)
|
||||
nodeslimit = 1000
|
||||
if outgoing and len(outgoing.missing) > nodeslimit:
|
||||
# trying to push too many nodes usually means that there is a bug
|
||||
|
||||
119
tests/test-infinitepush-remotenames-public.t
Normal file
119
tests/test-infinitepush-remotenames-public.t
Normal file
@ -0,0 +1,119 @@
|
||||
Remotenames extension has a shortcut that makes heads discovery work faster.
|
||||
Unfortunately that may result in sending public commits to the server. This
|
||||
test covers the issue.
|
||||
|
||||
$ . $TESTDIR/require-ext.sh remotenames
|
||||
$ . $TESTDIR/library.sh
|
||||
$ . $TESTDIR/library-infinitepush.sh
|
||||
$ cat >> $HGRCPATH << EOF
|
||||
> [extensions]
|
||||
> infinitepush=$TESTDIR/../infinitepush
|
||||
> [infinitepush]
|
||||
> branchpattern=re:scratch/.+
|
||||
> [ui]
|
||||
> ssh = python "$TESTDIR/dummyssh"
|
||||
> EOF
|
||||
$ mkcommit() {
|
||||
> echo "$1" > "$1"
|
||||
> hg add "$1"
|
||||
> hg ci -m "$1"
|
||||
> }
|
||||
$ scratchnodes() {
|
||||
> for node in `find ../repo/.hg/scratchbranches/index/nodemap/* | sort`; do
|
||||
> echo ${node##*/}
|
||||
> done
|
||||
> }
|
||||
$ scratchbookmarks() {
|
||||
> for bookmark in `find ../repo/.hg/scratchbranches/index/bookmarkmap/* -type f | sort`; do
|
||||
> echo "${bookmark##*/bookmarkmap/} `cat $bookmark`"
|
||||
> done
|
||||
> }
|
||||
$ enableremotenames() {
|
||||
> printf '[extensions]\nremotenames=\n' >> .hg/hgrc
|
||||
> }
|
||||
|
||||
Setup server with a few commits and one remote bookmark. This remotebookmark
|
||||
may be used by remotenames extension in fastheaddiscovery heuristic
|
||||
$ hg init repo
|
||||
$ cd repo
|
||||
$ setupserver
|
||||
$ mkcommit first
|
||||
$ hg book remotebook
|
||||
$ hg up -q .
|
||||
$ mkcommit second
|
||||
$ mkcommit third
|
||||
$ mkcommit fourth
|
||||
$ cd ..
|
||||
|
||||
Create new client
|
||||
$ hg clone ssh://user@dummy/repo --config extensions.remotenames= client -q
|
||||
$ cd client
|
||||
$ enableremotenames
|
||||
|
||||
Create scratch commit and back it up.
|
||||
$ hg up -q -r 'desc(third)'
|
||||
$ mkcommit scratch
|
||||
created new head
|
||||
$ hg log -r . -T '{node}\n'
|
||||
ce87a066ebc28045311cd1272f5edc0ed80d5b1c
|
||||
$ hg log --graph -T '{desc}'
|
||||
@ scratch
|
||||
|
|
||||
| o fourth
|
||||
|/
|
||||
o third
|
||||
|
|
||||
o second
|
||||
|
|
||||
o first
|
||||
|
||||
$ hg pushbackup
|
||||
starting backup * (glob)
|
||||
searching for changes
|
||||
remote: pushing 1 commit:
|
||||
remote: ce87a066ebc2 scratch
|
||||
finished in * (glob)
|
||||
$ cd ..
|
||||
|
||||
Create second client
|
||||
$ hg clone ssh://user@dummy/repo --config extensions.remotenames= client2 -q
|
||||
$ cd client2
|
||||
$ enableremotenames
|
||||
|
||||
Pull to get remote names
|
||||
$ hg pull
|
||||
pulling from ssh://user@dummy/repo
|
||||
searching for changes
|
||||
no changes found
|
||||
$ hg book --remote
|
||||
default/remotebook 0:b75a450e74d5
|
||||
|
||||
Strip public commits from the repo, otherwise fastheaddiscovery heuristic will
|
||||
be skipped
|
||||
$ hg strip -q -r '1:'
|
||||
$ hg log --graph -T '{desc}'
|
||||
@ first
|
||||
|
||||
Download scratch commit. It also downloads a few public commits
|
||||
$ hg up -q ce87a066ebc28045311cd1272f5edc0ed80d5b1c
|
||||
'ce87a066ebc28045311cd1272f5edc0ed80d5b1c' does not exist locally - looking for it remotely...
|
||||
'ce87a066ebc28045311cd1272f5edc0ed80d5b1c' found remotely
|
||||
$ hg log --graph -T '{desc}'
|
||||
@ scratch
|
||||
|
|
||||
o third
|
||||
|
|
||||
o second
|
||||
|
|
||||
o first
|
||||
|
||||
$ hg book --remote
|
||||
default/remotebook 0:b75a450e74d5
|
||||
|
||||
Run pushbackup and make sure only scratch commit is backed up.
|
||||
$ hg pushbackup
|
||||
starting backup * (glob)
|
||||
searching for changes
|
||||
remote: pushing 1 commit:
|
||||
remote: ce87a066ebc2 scratch
|
||||
finished in * (glob)
|
||||
Loading…
Reference in New Issue
Block a user