Mercurial > hg
view tests/test-abort-checkin @ 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 | 193e0f8d9a47 |
children |
line wrap: on
line source
#!/bin/sh cat > abortcommit.py <<EOF from mercurial import util def hook(**args): raise util.Abort("no commits allowed") def reposetup(ui, repo): repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook) EOF abspath=`pwd`/abortcommit.py echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo "abortcommit = $abspath" >> $HGRCPATH hg init foo cd foo echo foo > foo hg add foo # mq may keep a reference to the repository so __del__ will not be called # and .hg/journal.dirstate will not be deleted: hg ci -m foo hg ci -m foo exit 0