view tests/test-custom-filters @ 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

hg init

cat > .hg/hgrc <<EOF
[extensions]
prefixfilter = prefix.py
[encode]
*.txt = stripprefix: Copyright 2046, The Masters
[decode]
*.txt = insertprefix: Copyright 2046, The Masters
EOF

cat > prefix.py <<EOF
from mercurial import util
def stripprefix(s, cmd, filename, **kwargs):
    header = '%s\n' % cmd
    if s[:len(header)] != header:
        raise util.Abort('missing header "%s" in %s' % (cmd, filename))
    return s[len(header):]
def insertprefix(s, cmd):
    return '%s\n%s' % (cmd, s)
def reposetup(ui, repo):
    repo.adddatafilter('stripprefix:', stripprefix)
    repo.adddatafilter('insertprefix:', insertprefix)
EOF

cat > .hgignore <<EOF
.hgignore
prefix.py
prefix.pyc
EOF

cat > stuff.txt <<EOF
Copyright 2046, The Masters
Some stuff to ponder very carefully.
EOF
hg add stuff.txt
hg ci -m stuff

echo '% Repository data:'
hg cat stuff.txt

echo '% Fresh checkout:'
rm stuff.txt
hg up -C
cat stuff.txt
echo >> stuff.txt <<EOF
Very very carefully.
EOF
hg stat

cat > morestuff.txt <<EOF
Unauthorized material subject to destruction.
EOF

echo '% Problem encoding:'
hg add morestuff.txt
hg ci -m morestuff
hg stat