Mercurial > hg
view tests/test-notify @ 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 | fb1d7a42663c |
children | 44b3f7bbe2f3 |
line wrap: on
line source
#!/bin/sh cat <<EOF >> $HGRCPATH [extensions] notify= [hooks] incoming.notify = python:hgext.notify.hook [notify] sources = pull diffstat = False [usersubs] foo@bar = * [reposubs] * = baz EOF hg help notify hg init a echo a > a/a echo % commit hg --traceback --cwd a commit -Ama -d '0 0' echo % clone hg --traceback clone a b echo a >> a/a echo % commit hg --traceback --cwd a commit -Amb -d '1 0' # on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line cat <<EOF >> $HGRCPATH [notify] maxsubject = 200 EOF # the python call below wraps continuation lines, which appear on Mac OS X 10.5 because # of the very long subject line echo '% pull (minimal config)' hg --traceback --cwd b pull ../a 2>&1 | python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' | sed -e 's/\(Message-Id:\).*/\1/' \ -e 's/changeset \([0-9a-f]* *\)in .*test-notif/changeset \1in test-notif/' \ -e 's/^details: .*test-notify/details: test-notify/' \ -e 's/^Date:.*/Date:/' cat <<EOF >> $HGRCPATH [notify] config = $HGTMP/.notify.conf domain = test.com strip = 3 template = Subject: {desc|firstline|strip}\nFrom: {author}\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip} [web] baseurl = http://test/ EOF echo % fail for config file is missing hg --cwd b rollback hg --cwd b pull ../a 2>&1 | grep 'unable to open.*\.notify\.conf' > /dev/null && echo pull failed touch "$HGTMP/.notify.conf" echo % pull hg --cwd b rollback hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \ -e 's/^Date:.*/Date:/' cat << EOF >> $HGRCPATH [hooks] incoming.notify = python:hgext.notify.hook [notify] sources = pull diffstat = True EOF echo % pull hg --cwd b rollback hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \ -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \ -e 's/^Date:.*/Date:/'