Mercurial > hg
view tests/test-relink @ 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 | 750b7a4f01f6 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "relink=" >> $HGRCPATH fix_path() { tr '\\' / } cat > arelinked.py <<EOF import sys, os from mercurial import util path1, path2 = sys.argv[1:3] if util.samefile(path1, path2): print '%s == %s' % (path1, path2) else: print '%s != %s' % (path1, path2) EOF echo '% create source repository' hg init repo cd repo echo '[ui]' > .hg/hgrc echo 'username= A. Foo <a.foo@bar.com>' >> .hg/hgrc echo a > a echo b > b hg ci -Am addfile echo a >> a echo a >> b hg ci -Am changefiles # Test files are read in binary mode python -c "file('.hg/store/data/dummy.i', 'wb').write('a\r\nb\n')" cd .. echo '% clone and pull to break links' hg clone --pull -r0 repo clone cd clone echo '[ui]' >> .hg/hgrc echo 'username= A. Baz <a.baz@bar.com>' >> .hg/hgrc hg pull -q echo b >> b hg ci -m changeb python -c "file('.hg/store/data/dummy.i', 'wb').write('a\nb\r\n')" echo '% relink' hg relink --debug | sed 's:relinking.*store:relinking .hg/store:g' \ | fix_path cd .. echo '% check hardlinks' python arelinked.py repo/.hg/store/data/a.i clone/.hg/store/data/a.i python arelinked.py repo/.hg/store/data/b.i clone/.hg/store/data/b.i