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

hglocate()
{
    echo "hg locate $@"
    hg locate "$@"
    ret=$?
    echo
    return $ret
}

mkdir t
cd t
hg init
echo 0 > a
echo 0 > b
echo 0 > t.h
mkdir t
echo 0 > t/x
echo 0 > t/b
echo 0 > t/e.h
mkdir dir.h
echo 0 > dir.h/foo
hg ci -A -m m -d "1000000 0"
touch nottracked
hglocate a && echo locate succeeded || echo locate failed
hglocate NONEXISTENT && echo locate succeeded || echo locate failed
hglocate
hg rm a
hg ci -m m -d "1000000 0"
hglocate a
hglocate NONEXISTENT
hglocate relpath:NONEXISTENT
hglocate
hglocate -r 0 a
hglocate -r 0 NONEXISTENT
hglocate -r 0 relpath:NONEXISTENT
hglocate -r 0
echo % -I/-X with relative path should work
cd t
hglocate
hglocate -I ../t
# test issue294
cd ..
rm -r t
hglocate 't/**'
mkdir otherdir
cd otherdir
hglocate b
hglocate '*.h'
hglocate path:t/x
hglocate 're:.*\.h$'
hglocate -r 0 b
hglocate -r 0 '*.h'
hglocate -r 0 path:t/x
hglocate -r 0 're:.*\.h$'