view tests/test-convert-p4-filetypes @ 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" p4 execbit symlink || exit 80

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

echo % create p4 depot
P4ROOT=`pwd`/depot; export P4ROOT
P4AUDIT=$P4ROOT/audit; export P4AUDIT
P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
P4LOG=$P4ROOT/log; export P4LOG
P4PORT=localhost:16661; export P4PORT
P4DEBUG=1; export P4DEBUG
P4CHARSET=utf8; export P4CHARSET

echo % start the p4 server
[ ! -d $P4ROOT ] && mkdir $P4ROOT
p4d -f -J off -xi >$P4ROOT/stdout 2>$P4ROOT/stderr
p4d -f -J off >$P4ROOT/stdout 2>$P4ROOT/stderr &
trap "echo % stop the p4 server ; p4 admin stop" EXIT

# wait for the server to initialize
while ! p4 ; do
   sleep 1
done >/dev/null 2>/dev/null

echo % create a client spec
P4CLIENT=hg-p4-import; export P4CLIENT
DEPOTPATH=//depot/test-mercurial-import/...
p4 client -o | sed '/^View:/,$ d' >p4client
echo View: >>p4client
echo " $DEPOTPATH //$P4CLIENT/..." >>p4client
p4 client -i <p4client

echo % populate the depot
TYPES="text binary symlink"
TYPES="$TYPES text+m text+w text+x text+k text+kx text+ko text+l text+C text+D text+F text+S text+S2"
TYPES="$TYPES binary+k binary+x binary+kx symlink+k"
TYPES="$TYPES ctext cxtext ktext kxtext ltext tempobj ubinary uxbinary xbinary xltext xtempobj xtext"
# not testing these
#TYPES="$TYPES apple resource unicode utf16 uresource xunicode xutf16"
for T in $TYPES ; do
   T2=`echo $T | tr [:upper:] [:lower:]`
   case $T in
      apple)
	 ;;
      symlink*)
         echo "this is target $T" >target_$T2
         ln -s target_$T file_$T2
         p4 add target_$T2
         p4 add -t $T file_$T2
         ;;
      binary*)
	 python -c "file('file_$T2', 'wb').write('this is $T')"
         p4 add -t $T file_$T2
         ;;
      *)
         echo "this is $T" >file_$T2
         p4 add -t $T file_$T2
         ;;
   esac
done
p4 submit -d initial

echo % test keyword expansion
p4 edit file_* target_*
for T in $TYPES ; do
   T2=`echo $T | tr [:upper:] [:lower:]`
   echo '$Id$'       >>file_$T2
   echo '$Header$'   >>file_$T2
   echo '$Date$'     >>file_$T2
   echo '$DateTime$' >>file_$T2
   echo '$Change$'   >>file_$T2
   echo '$File$'     >>file_$T2
   echo '$Revision$' >>file_$T2
   echo '$Header$$Header$Header$' >>file_$T2
done

ln -s 'target_$Header$' crazy_symlink+k
p4 add -t symlink+k crazy_symlink+k

p4 submit -d keywords

echo % check keywords in p4
grep -H Header file_*

echo % convert
hg convert -s p4 $DEPOTPATH dst
hg -R dst log --template 'rev={rev} desc="{desc}" tags="{tags}" files="{files}"\n'g

echo % revision 0
hg -R dst update 0
head dst/file_* | cat -v

echo
echo % revision 1
hg -R dst update 1
head dst/file_* | cat -v
echo
echo % crazy_symlink
readlink crazy_symlink+k
readlink dst/crazy_symlink+k