comparison tests/test-mq-pull-from-bundle @ 5664:da72b4d24797

Fix income/pull with bundle and -R (issue 820).

Uses ui.setconfig() to tell bundlerepo where the main repo is. This is
needed for when the --repository option is used.

Adds tests to test-bundle and a new test script
test-mq-pull-from-bundle, which plays out the situation that initially
made me detect this bug

(hg -R .hg/patches pull ../bundle.hg).

5664:da72b4d24797

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
echo "[defaults]" >> $HGRCPATH
echo "log = --template \"{rev}: {desc}\\n\"" >> $HGRCPATH
echo "heads = --template \"{rev}: {desc}\\n\"" >> $HGRCPATH
echo "incoming = --template \"{rev}: {desc}\\n\"" >> $HGRCPATH

echo "====== .hgrc"
cat $HGRCPATH

echo "====== Setup main"
hg init base
cd base
echo "One" > one
hg add
hg ci -m "main: one added."
echo "++" >> one
hg ci -m "main: one updated."

echo "====== Bundle main"
hg bundle --base=null ../main.hg
cd ..

echo "====== Incoming to fresh repo"
hg init fresh
echo ">> hg -R fresh incoming main.hg"
hg -R fresh incoming main.hg
echo ">> hg -R fresh incoming bundle:fresh+main.hg"
hg -R fresh incoming bundle:fresh+main.hg


echo "====== Setup queue"
cd base
hg qinit -c
hg qnew -m "patch: two added." two.patch
echo two > two
hg add
hg qrefresh
hg qcommit -m "queue: two.patch added."
hg qpop -a

echo "====== Bundle queue"
hg -R .hg/patches bundle --base=null ../queue.hgq
cd ..


echo "====== Clone base"
hg clone base copy
cd copy
hg qinit -c

echo "====== Incoming queue bundle"
echo ">> hg -R .hg/patches incoming ../queue.hgq"
hg -R .hg/patches incoming ../queue.hgq

echo "====== Pull queue bundle"
echo ">> hg -R .hg/patches pull --update ../queue.hgq"
hg -R .hg/patches pull --update ../queue.hgq
echo ">> hg -R .hg/patches heads"
hg -R .hg/patches heads
echo ">> hg -R .hg/patches log"
hg -R .hg/patches log
echo ">> hg qseries"
hg qseries
cd ..


echo "====== Clone base again"
hg clone base copy2
cd copy2
hg qinit -c

echo "====== Unbundle queue bundle"
echo ">> hg -R .hg/patches unbundle --update ../queue.hgq"
hg -R .hg/patches unbundle --update ../queue.hgq
echo ">> hg -R .hg/patches heads"
hg -R .hg/patches heads
echo ">> hg -R .hg/patches log"
hg -R .hg/patches log
echo ">> hg qseries"
hg qseries
cd ..