Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-copy2.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 | f4dece0f7016 |
children | de612b5f8d59 |
rev | line source |
---|---|
1117 | 1 # should show copy |
1127
19b048da4da9
Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
2 copy: foo -> bar |
1117 | 3 # shouldn't show copy |
4 # should match | |
5 rev offset length base linkrev nodeid p1 p2 | |
6 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
3659 | 7 bar renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd |
1117 | 8 # should not be renamed |
3659 | 9 bar not renamed |
1117 | 10 # should show copy |
1127
19b048da4da9
Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
11 copy: foo -> bar |
1117 | 12 # should show no parents for tip |
13 rev offset length base linkrev nodeid p1 p2 | |
14 0 0 69 0 1 6ca237634e1f 000000000000 000000000000 | |
15 1 69 6 1 2 7a1ff8e75f5b 6ca237634e1f 000000000000 | |
16 2 75 82 1 3 243dfe60f3d9 000000000000 000000000000 | |
17 # should match | |
18 rev offset length base linkrev nodeid p1 p2 | |
19 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
20 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 | |
3659 | 21 bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 |
1117 | 22 # should show no copies |