Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-branch.out @ 4188:dd0d9bd91e0a
dirstate.statwalk: explicitly test for ignored directories
This removes a hack where we appended '/' to a dirname so that:
- it would not appear on the "dc" dict
- it would always be matched by the match function
This was a contorted way of checking if the directory was matched by
some hgignore pattern, and it would still fail with some uses of
--include/--exclude patterns.
Things would still work fine if we removed the check altogether and
just appended things to "work" directly, but then we would end up
walking ignored directories too, which could be quite a bit of work.
This allows further simplification of the match function returned by
util._matcher, and fixes walking the working directory with a
--include pattern that matches only the end of a name.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 10 Mar 2007 23:00:54 -0300 |
parents | b28d3e0f9a8c |
children |
line wrap: on
line source
adding a adding b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved the --branches option is deprecated, please use 'hg branches' instead changeset: 0:b544c4ac4389 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0 the --branch option is deprecated, please use 'hg branch' instead Using head f4ac749470f2 for branch foo 2 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 1:f4ac749470f2 tag: foo tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 2 files updated, 0 files merged, 0 files removed, 0 files unresolved adding c the --branch option is deprecated, please use 'hg branch' instead Using head f4ac749470f2 for branch foo 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) the --branches option is deprecated, please use 'hg branches' instead changeset: 2:1505d56ee00e tag: tip parent: 0:b544c4ac4389 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.0 changeset: 1:f4ac749470f2 tag: foo branch: foo user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 2 files updated, 0 files merged, 1 files removed, 0 files unresolved adding d the --branch option is deprecated, please use 'hg branch' instead Using head f4ac749470f2 for branch foo 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) the --branches option is deprecated, please use 'hg branches' instead changeset: 3:53b72df12ae5 tag: tip parent: 0:b544c4ac4389 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 0.0 changeset: 1:f4ac749470f2 tag: foo branch: foo user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1