Mercurial > hg
view tests/test-convert-svn-move @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | 73a4ed3bfef8 |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" svn svn-bindings || exit 80 fix_path() { tr '\\' / } echo "[extensions]" >> $HGRCPATH echo "convert = " >> $HGRCPATH echo "hgext.graphlog =" >> $HGRCPATH svnadmin create svn-repo cat "$TESTDIR/svn/move.svndump" | svnadmin load svn-repo > /dev/null svnpath=`pwd | fix_path` # SVN wants all paths to start with a slash. Unfortunately, # Windows ones don't. Handle that. expr "$svnpath" : "\/" > /dev/null if [ $? -ne 0 ]; then svnpath="/$svnpath" fi svnurl="file://$svnpath/svn-repo" echo % convert trunk and branches hg convert --datesort "$svnurl"/subproject A-hg cd A-hg hg glog --template '{rev} {desc|firstline} files: {files}\n' echo '% check move copy records' hg st --rev 12:13 --copies echo '% check branches' hg branches | sed 's/:.*/:/' cd .. mkdir test-replace cd test-replace svnadmin create svn-repo cat "$TESTDIR/svn/replace.svndump" | svnadmin load svn-repo > /dev/null echo '% convert files being replaced by directories' hg convert svn-repo hg-repo cd hg-repo echo '% manifest before' hg -v manifest -r 1 echo '% manifest after clobber1' hg -v manifest -r 2 echo '% manifest after clobber2' hg -v manifest -r 3 echo '% try updating' hg up -qC default cd .. echo '% test convert progress bar' echo "progress=" >> $HGRCPATH echo "[progress]" >> $HGRCPATH echo "assume-tty=1" >> $HGRCPATH echo "delay=0" >> $HGRCPATH echo "refresh=0" >> $HGRCPATH cat > filtercr.py <<EOF import sys, re for line in sys.stdin: line = re.sub(r'\r+[^\n]', lambda m: '\n' + m.group()[-1:], line) sys.stdout.write(line) EOF hg convert svn-repo hg-progress 2>&1 | python filtercr.py