Mercurial > hg
view tests/test-mq-pull-from-bundle.t @ 44667:b561f3a68e41 stable
discovery: avoid wrongly saying there are nothing to pull
We can get in a situation where a revision passed through `hg pull --rev REV`
are available on the server, but not a descendant of the advertised server
heads.
For example the server could lying be during heads advertisement, to hide some
pull request. Or obsolete/hidden content could be explicitly pulled.
So in this case the lookup associated to `REV` returned successfully, but the
normal discovery will find all advertised heads already known locally. This flip
a special boolean `anyinc` that will prevent any fetch attempt, preventing `REV`
to be pulled over.
We add three line of code to detect this case and make sure a pull actually
happens.
My main target is to make some third party extensions happy (I expect the
associated test to move upstream with the extension). However this fix already
make some of the `infinitepush` test happier.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 06 Apr 2020 00:24:57 +0200 |
parents | 89630d0b3e23 |
children |
line wrap: on
line source
#require repobundlerepo $ cat <<EOF >> $HGRCPATH > [extensions] > mq= > [alias] > tlog = log --template "{rev}: {node|short} {desc}\\n" > theads = heads --template "{rev}: {desc}\\n" > tincoming = incoming --template "{rev}: {desc}\\n" > EOF Setup main: $ hg init base $ cd base $ echo "One" > one $ hg add adding one $ hg ci -m "main: one added" $ echo "++" >> one $ hg ci -m "main: one updated" Bundle main: $ hg bundle --base=null ../main.hg 2 changesets found $ cd .. Incoming to fresh repo: $ hg init fresh $ hg -R fresh tincoming main.hg comparing with main.hg 0: main: one added 1: main: one updated $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R fresh tincoming bundle:fresh+main.hg comparing with bundle:fresh+main.hg 0: main: one added 1: main: one updated Setup queue: $ cd base $ hg qinit -c $ hg qnew -m "patch: two added" two.patch $ echo two > two $ hg add adding two $ hg qrefresh $ hg qcommit -m "queue: two.patch added" $ hg qpop -a popping two.patch patch queue now empty Bundle queue: $ hg -R .hg/patches bundle --base=null ../queue.hgq 1 changesets found $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true $ cd .. Clone base: $ hg clone base copy updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy $ hg qinit -c Incoming queue bundle: $ hg -R .hg/patches tincoming ../queue.hgq comparing with ../queue.hgq 0: queue: two.patch added $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true Pull queue bundle: $ hg -R .hg/patches pull --update ../queue.hgq pulling from ../queue.hgq requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files new changesets d7553909353d (1 drafts) merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true $ hg -R .hg/patches theads 0: queue: two.patch added $ hg -R .hg/patches tlog 0: d7553909353d queue: two.patch added $ hg qseries two.patch $ cd .. Clone base again: $ hg clone base copy2 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd copy2 $ hg qinit -c Unbundle queue bundle: $ hg -R .hg/patches unbundle --update ../queue.hgq adding changesets adding manifests adding file changes added 1 changesets with 3 changes to 3 files new changesets d7553909353d (1 drafts) merging series 2 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg -R .hg/patches theads 0: queue: two.patch added $ hg -R .hg/patches tlog 0: d7553909353d queue: two.patch added $ hg qseries two.patch $ cd ..