Mercurial > hg
view tests/test-purge.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 | 55c71226eceb |
children | b777dd8f7836 |
line wrap: on
line source
% init % setup % delete an empty directory empty_dir Removing directory empty_dir directory r1 % delete an untracked directory untracked_dir/untracked_file1 untracked_dir/untracked_file2 Removing file untracked_dir/untracked_file1 Removing file untracked_dir/untracked_file2 Removing directory untracked_dir directory r1 % delete an untracked file untracked_file Removing file untracked_file directory r1 % delete an untracked file in a tracked directory directory/untracked_file Removing file directory/untracked_file directory r1 % delete nested directories untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 % delete nested directories from a subdir untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 % delete only part of the tree untracked_directory/nested_directory Removing directory untracked_directory/nested_directory Removing directory untracked_directory directory r1 directory/untracked_file % skip ignored files if --all not specified directory ignored r1 ignored Removing file ignored directory r1 % abort with missing files until we support name mangling filesystems untracked_file ! r1 ? untracked_file untracked_file Removing file untracked_file ! r1 % tracked file in ignored directory (issue621) untracked_file Removing file untracked_file % skip excluded files directory excluded_file r1 % skip files in excluded dirs directory excluded_dir r1 file % skip excluded empty dirs directory excluded_dir r1 % skip patterns