Mercurial > hg
view tests/test-remove @ 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 | 7cb9af02e250 |
children | 1f665246dab3 |
line wrap: on
line source
#!/bin/sh remove() { hg rm $@ hg st # do not use ls -R, which recurses in .hg subdirs on Mac OS X 10.5 find . -name .hg -prune -o -type f -print | sort hg up -C } hg init a cd a echo a > foo echo % file not managed remove foo hg add foo hg commit -m1 # the table cases echo % 00 state added, options none echo b > bar hg add bar remove bar echo % 01 state clean, options none remove foo echo % 02 state modified, options none echo b >> foo remove foo echo % 03 state missing, options none rm foo remove foo echo % 10 state added, options -f echo b > bar hg add bar remove -f bar rm bar echo % 11 state clean, options -f remove -f foo echo % 12 state modified, options -f echo b >> foo remove -f foo echo % 13 state missing, options -f rm foo remove -f foo echo % 20 state added, options -A echo b > bar hg add bar remove -A bar echo % 21 state clean, options -A remove -A foo echo % 22 state modified, options -A echo b >> foo remove -A foo echo % 23 state missing, options -A rm foo remove -A foo echo % 30 state added, options -Af echo b > bar hg add bar remove -Af bar rm bar echo % 31 state clean, options -Af remove -Af foo echo % 32 state modified, options -Af echo b >> foo remove -Af foo echo % 33 state missing, options -Af rm foo remove -Af foo # test some directory stuff mkdir test echo a > test/foo echo b > test/bar hg ci -Am2 echo % dir, options none rm test/bar remove test echo % dir, options -f rm test/bar remove -f test echo % dir, options -A rm test/bar remove -A test echo % dir, options -Af rm test/bar remove -Af test