[PATCH] mq: Fix --qrefresh --short to work with --exclude and --include

Patrick Mézard pmezard at gmail.com
Sun Oct 19 15:22:25 CDT 2008


Mads Kiilerich a écrit :
> # HG changeset patch
> # User Mads Kiilerich <mads at kiilerich.com>
> # Date 1224426684 -7200
> # Node ID 739a30984e46fa97cae5c25471aa91ef43319795
> # Parent  fcea31a4f0b07aa82cc43a54a23f780c38cd51b6
> 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.

Pushed: http://hg.intevation.org/mercurial/crew/rev/09ed32b79656

Thanks for fixing this.

--
Patrick Mézard


More information about the Mercurial-devel mailing list