view tests/test-convert-hg-startrev @ 7177:09ed32b79656

mq: Fix --qrefresh --short to work with --exclude and --include

pmezard expects
	hg qref -s -X b
to apply the -X to the list of files in the patch, and thus remove b from the
patch.
That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it
wasn't...

mpm says
	(17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ?
	(17:22:54) pmezard_: kiilerix1: and --include too
	(17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar
so mpm expects
	hg qref -s -X b *
to apply the -X to the list of files in the working directory, and thus don't
include b in the patch

This patch tries to make both usecases work by creating a matchfn which uses
the include/excludes but not the filelist.

#!/bin/sh

echo '[extensions]' >> $HGRCPATH
echo 'hgext.graphlog =' >> $HGRCPATH
echo 'hgext.convert =' >> $HGRCPATH

glog()
{
    hg -R "$1" glog --template '#rev# "#desc#" files: #files#\n'
}

hg init source
cd source

echo a > a
echo b > b
hg ci -d '0 0' -qAm '0: add a b'
echo c > c
hg ci -d '1 0' -qAm '1: add c'
hg copy a e
echo b >> b
hg ci -d '2 0' -qAm '2: copy e from a, change b'
hg up -C 0
echo a >> a
hg ci -d '3 0' -qAm '3: change a'
hg merge
hg copy b d
hg ci -d '4 0' -qAm '4: merge 2 and 3, copy d from b'
echo a >> a
hg ci -d '5 0' -qAm '5: change a'
cd ..

echo % convert from null revision
hg convert --config convert.hg.startrev=null source empty
glog empty

echo % convert from zero revision
hg convert --config convert.hg.startrev=0 source full
glog full

echo % convert from merge parent
hg convert --config convert.hg.startrev=1 source conv1
glog conv1
cd conv1
echo % check copy preservation
hg log --follow --copies e
echo % check copy removal on missing parent
hg log --follow --copies d
hg cat -r tip a b
hg -q verify
cd ..

echo % convert from merge
hg convert --config convert.hg.startrev=4 source conv4
glog conv4
cd conv4
hg up -C
hg cat -r tip a b
hg -q verify
cd ..