Mercurial > hg
view tests/test-relink @ 11488:f786fc4b8764 stable 1.6
log: follow filenames through renames (issue647)
In commands.log a displayer was initialized from
cmdutil.show_changeset() with the initial matchfn (which designates
the specified files which only is correct in the highest revision in
the range). prep() is handed the correct list of files, but
displayer.show() didn't use that list but keept using the original
matchfn.
The matchfn argument to cmdutil.show_changeset() wasn't specified in
other places and is only used in .show(), so now we give the matchfn
as an optional parameter to .show().
We do however still have to detect --patch and --stat from opts in
show_changeset() and let it imply a matchall, but that can now be
overruled with the new .show() matchfn parameter.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 29 Jun 2010 12:12:34 +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