Mercurial > hg
view tests/test-patch @ 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.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 19 Oct 2008 16:31:24 +0200 |
parents | 0de7e6e27fe4 |
children |
line wrap: on
line source
#!/bin/sh cat > patchtool.py <<EOF import sys print 'Using custom patch' if '--binary' in sys.argv: print '--binary found !' EOF echo "[ui]" >> $HGRCPATH echo "patch=python ../patchtool.py" >> $HGRCPATH hg init a cd a echo a > a hg commit -Ama -d '1 0' echo b >> a hg commit -Amb -d '2 0' cd .. # This test check that: # - custom patch commands with arguments actually works # - patch code does not try to add weird arguments like # --binary when custom patch commands are used. For instance # --binary is added by default under win32. echo % check custom patch options are honored hg --cwd a export -o ../a.diff tip hg clone -r 0 a b hg --cwd b import -v ../a.diff