view tests/test-convert-baz @ 15708:309e49491253

push: propagate --new-branch and --ssh options when pushing subrepos

Up until now the all the push command options were ignored when pushing
subrepos. In particular, the fact that the --new-branch command was not passed
down to subrepos made it not possible to push a repo when any of its
subrepos had a new branch, even if you used the --new-branch option of the push
command.

In addition the error message was confusing since it showed the following hint:
"--new-branch hint: use 'hg push --new-branch' to create new remote branches".
However using the --new_branch flag did not fix the problem, as it was ignored
when pushing subrepos.

This patch passes the --new-branch and --ssh flags to every subrepo that is
pushed.

Issues/Limitations:

- All subrepo types get these flags, but only the mercurial subrepos use them.
- It is no longer possible to _not_ pass down these flags to subrepos when
pushing:
   * An alternative would be to introduce a --subrepos flag that should be
used to pass down these flags to the subrepos.
   * If we did this, it could make sense to make the --force flag respect this
   new --subrepos flag as well for consistency's sake.
- Matt suggested that the ssh related flags could also be passed down to
subrepos during pull and clone. However it seems that it would be the "update"
command that would need to get those, since subrepos are only pulled on update.
In any case I'd prefer to leave that for a later patch.

#!/bin/sh

"$TESTDIR/hghave" baz || exit 80

baz my-id "mercurial <[e-mail]>"

echo "[extensions]" >> $HGRCPATH
echo "convert=" >> $HGRCPATH
echo 'graphlog =' >> $HGRCPATH

echo % create baz archive
baz make-archive baz@mercurial--convert hg-test-convert-baz

echo % initialize baz repo
mkdir baz-repo
cd baz-repo/
baz init-tree baz@mercurial--convert/baz--test--0
baz import

echo % create initial files
echo 'this is a file' > a
baz add a
mkdir src
baz add src
cd src
dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
baz add b
# HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead"
baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v '^tar'

echo % create link file and modify a
ln -s ../a a-link
baz add a-link
echo 'this a modification to a' >> ../a
baz commit -s "added link to a and modify a"

echo % create second link and modify b
ln -s ../a a-link-2
baz add a-link-2
dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null
baz commit -s "added second link and modify b"

echo % b file to link and a-link-2 to regular file
rm -f a-link-2
echo 'this is now a regular file' > a-link-2
ln -sf ../a b
baz commit -s "file to link and link to file test"

echo % move a-link-2 file and src directory
cd ..
baz mv src/a-link-2 c
baz mv src test
baz commit -s "move and rename a-link-2 file and src directory"

echo % move and add the moved file again
echo e > e
baz add e
baz commit -s "add e"
baz mv e f
echo ee > e
baz add e
baz commit -s "move e and recreate it again"
cd ..

echo % converting baz repo to Mercurial
hg convert baz-repo baz-repo-hg

baz register-archive -d baz@mercurial--convert

glog()
{
    hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
}

echo % show graph log
glog -R baz-repo-hg
hg up -q -R baz-repo-hg
hg -R baz-repo-hg manifest --debug
hg -R baz-repo-hg log -r 5 -r 7 -C --debug | grep copies