view tests/test-convert-bzr-ghosts @ 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

. "$TESTDIR/bzr-definitions"

cat > ghostcreator.py <<EOF
import sys
from bzrlib import workingtree
wt = workingtree.WorkingTree.open('.')

message, ghostrev = sys.argv[1:]
wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])
wt.commit(message)
EOF

echo % ghost revisions
mkdir test-ghost-revisions
cd test-ghost-revisions
bzr init -q source
cd source
echo content > somefile
bzr add -q somefile
bzr commit -q -m 'Initial layout setup'
echo morecontent >> somefile
python ../../ghostcreator.py 'Commit with ghost revision' ghostrev
cd ..
hg convert source source-hg
glog -R source-hg