view tests/test-convert-authormap @ 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 <[e-mail]>

#!/bin/sh

cat >> $HGRCPATH <<EOF
[extensions]
convert=
EOF

# Prepare orig repo
hg init orig
cd orig
echo foo > foo
HGUSER='user name' hg ci -qAm 'foo'
cd ..

# Explicit --authors
cat > authormap.txt <<EOF
user name = Long User Name

# comment
this line is ignored
EOF

hg convert --authors authormap.txt orig new
echo $?
cat new/.hg/authormap

hg -Rnew log
rm -rf new

# Implicit .hg/authormap
hg init new
mv authormap.txt new/.hg/authormap

hg convert orig new
echo $?

hg -Rnew log