Mercurial > hg
view tests/test-mq-qclone-http @ 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 | b193a6e59131 |
children | 7fc19b12cb6b |
line wrap: on
line source
#! /bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH mkdir webdir cd webdir hg init a hg --cwd a qinit -c echo a > a/a hg --cwd a ci -A -m a echo b > a/b hg --cwd a addremove hg --cwd a qnew -f b.patch hg --cwd a qcommit -m b.patch hg --cwd a log --template "{desc}\n" hg --cwd a/.hg/patches log --template "{desc}\n" root=`pwd` cd .. cat > collections.conf <<EOF [collections] $root=$root EOF hg serve -p $HGPORT -d --pid-file=hg.pid --webdir-conf collections.conf \ -A access-paths.log -E error-paths-1.log cat hg.pid >> $DAEMON_PIDS "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/?style=raw' hg qclone http://localhost:$HGPORT/a b hg --cwd b log --template "{desc}\n" hg --cwd b qpush -a hg --cwd b log --template "{desc}\n"