annotate tests/test-ro-message @ 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 e506c14382fd
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1355
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
1 #!/bin/sh
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
2 HG=hg
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
3 "$HG" init
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
4 mkdir b
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
5 echo 'Bouncy' >b/bouncy
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
6 echo 'tricycle' >b/vehicle
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
7 "$HG" add b/bouncy
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
8 "$HG" add b/vehicle
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
9 "$HG" commit -m 'Adding bouncy'
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
10 echo 'bouncy' >>b/bouncy
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
11 "$HG" commit -m 'Making it bouncier'
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
12 "$HG" update -C 0
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
13 echo 'stationary' >>b/vehicle
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
14 "$HG" commit -m 'Clarifying the vehicle.'
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
15 "$HG" update -C 1
9116fe491b06 Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff changeset
16 chmod a-w b/vehicle
2283
e506c14382fd deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1738
diff changeset
17 "$HG" merge 2 2>&1 | sed 's|^\(.*[ ]\).*/\([^/]*/[^/]*/[^/]*\)$|\1\2|g'