Mercurial > hg
view tests/test-hgwebdir.out @ 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 | 2c370f08c486 |
children | 268c582bd42a |
line wrap: on
line source
adding a adding b adding c % should give a 404 - file does not exist 404 Not Found error: bork@8580ff50825a: not found in manifest % should succeed 200 Script output follows /a/ /b/ 200 Script output follows a 200 Script output follows b % should give a 404 - repo is not published 404 Not Found error: repository c not found % should succeed, slashy names 200 Script output follows /b/ /t/a/ 200 Script output follows /t/a/ 200 Script output follows /t/a/ 200 Script output follows <?xml version="1.0" encoding="ascii"?> <feed xmlns="http://127.0.0.1/2005/Atom"> <!-- Changelog --> <id>http://127.0.0.1/t/a/</id> <link rel="self" href="http://127.0.0.1/t/a/atom-log"/> <link rel="alternate" href="http://127.0.0.1/t/a/"/> <title>t/a Changelog</title> <updated>1970-01-01T00:00:01+00:00</updated> <entry> <title>a</title> <id>http://127.0.0.1/mercurial/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/> <author> <name>test</name> <email>test</email> </author> <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> <div xmlns="http://127.0.0.1/1999/xhtml"> <pre xml:space="preserve">a</pre> </div> </content> </entry> </feed> 200 Script output follows <?xml version="1.0" encoding="ascii"?> <feed xmlns="http://127.0.0.1/2005/Atom"> <!-- Changelog --> <id>http://127.0.0.1/t/a/</id> <link rel="self" href="http://127.0.0.1/t/a/atom-log"/> <link rel="alternate" href="http://127.0.0.1/t/a/"/> <title>t/a Changelog</title> <updated>1970-01-01T00:00:01+00:00</updated> <entry> <title>a</title> <id>http://127.0.0.1/mercurial/#changeset-8580ff50825a50c8f716709acdf8de0deddcd6ab</id> <link href="http://127.0.0.1/t/a/rev/8580ff50825a50c8f716709acdf8de0deddcd6ab"/> <author> <name>test</name> <email>test</email> </author> <updated>1970-01-01T00:00:01+00:00</updated> <published>1970-01-01T00:00:01+00:00</published> <content type="xhtml"> <div xmlns="http://127.0.0.1/1999/xhtml"> <pre xml:space="preserve">a</pre> </div> </content> </entry> </feed> 200 Script output follows a % should succeed 200 Script output follows /a/ /b/ /c/ 200 Script output follows a 200 Script output follows b 200 Script output follows c % paths errors 1 % paths errors 2 % collections errors