view tests/test-incoming-outgoing.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 0750f11152fe
children fece056bf240
line wrap: on
line source

adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 9 changesets, 9 total revisions
comparing with http://localhost/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with http://localhost/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

% limit to 2 changesets
comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

comparing with http://localhost/
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

comparing with test
changeset:   0:9cb21d99fe27
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     0

changeset:   1:d717f5dfad6a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     1

changeset:   2:c0d6b86da426
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     2

changeset:   3:dfacbd43b3fe
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     3

changeset:   4:1f3a964b6022
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     4

changeset:   5:c028bcc7a28a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     5

changeset:   6:a0c0095f3389
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     6

changeset:   7:d4be65f4e891
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     7

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

changeset:   8:92b83e334ef8
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     8

updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 14 changesets, 14 total revisions
comparing with test
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

changeset:   12:251354d0fdd3
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     12

changeset:   13:bdaadd969642
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     13

% limit to 3 changesets
comparing with test
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

comparing with http://localhost/
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11

changeset:   12:251354d0fdd3
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     12

changeset:   13:bdaadd969642
tag:         tip
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     13

comparing with http://localhost/
searching for changes
changeset:   9:3741c3ad1096
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     9

changeset:   10:de4143c8d9a5
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     10

changeset:   11:0e1c188b9a7a
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     11