Mercurial > hg
view tests/test-hgignore @ 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 | 31abcae33b4f |
children |
line wrap: on
line source
#!/bin/sh hg init # Test issue 562: .hgignore requires newline at end touch foo touch bar touch baz cat > makeignore.py <<EOF f = open(".hgignore", "w") f.write("ignore\n") f.write("foo\n") # No EOL here f.write("bar") f.close() EOF python makeignore.py echo % should display baz only hg status rm foo bar baz .hgignore makeignore.py touch a.o touch a.c touch syntax mkdir dir touch dir/a.o touch dir/b.o touch dir/c.o hg add dir/a.o hg commit -m 0 hg add dir/b.o echo "--" ; hg status echo "*.o" > .hgignore echo "--" ; hg status 2>&1 | sed -e 's/abort: .*\.hgignore:/abort: .hgignore:/' echo ".*\.o" > .hgignore echo "--" ; hg status # Check it does not ignore the current directory '.' echo "^\." > .hgignore echo "--" ; hg status echo "glob:**.o" > .hgignore echo "--" ; hg status echo "glob:*.o" > .hgignore echo "--" ; hg status echo "syntax: glob" > .hgignore echo "re:.*\.o" >> .hgignore echo "--" ; hg status echo "syntax: invalid" > .hgignore echo "--" ; hg status 2>&1 | sed -e 's/.*\.hgignore:/.hgignore:/' echo "syntax: glob" > .hgignore echo "*.o" >> .hgignore echo "--" ; hg status echo "relglob:syntax*" > .hgignore echo "--" ; hg status echo "relglob:*" > .hgignore echo "--" ; hg status cd dir echo "--" ; hg status .