view tests/test-mq-safety @ 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.

#!/bin/sh

echo '[extensions]' >> $HGRCPATH
echo 'mq =' >> $HGRCPATH

hg init repo
cd repo

echo foo > foo
hg ci -qAm 'add a file'

hg qinit

hg qnew foo
echo foo >> foo
hg qrefresh -m 'append foo'

hg qnew bar
echo bar >> foo
hg qrefresh -m 'append bar'

echo '% try to commit on top of a patch'
echo quux >> foo
hg ci -m 'append quux'

# cheat a bit...
mv .hg/patches .hg/patches2
hg ci -m 'append quux'
mv .hg/patches2 .hg/patches

echo '% qpop/qrefresh on the wrong revision'
hg qpop
hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/'
hg qrefresh

hg up -C qtip
echo '% qpop'
hg qpop

echo '% qrefresh'
hg qrefresh

echo '% tip:'
hg tip --template '{rev} {desc}\n'

echo '% qpush warning branchheads'
cd ..
hg init branchy
cd branchy
echo q > q
hg add q
hg qnew -f qp
hg qpop
echo a > a
hg ci -Ama
hg up null
hg branch b
echo c > c
hg ci -Amc
hg merge default
hg ci -mmerge
hg up default
hg log
hg qpush