Mercurial > hg
annotate tests/test-websub.t @ 24790:baa11dde8c0e
match: add a subclass for dirstate normalizing of the matched patterns
This class is only needed on case insensitive filesystems, and only
for wdir context matches. It allows the user to not match the case of
the items in the filesystem- especially for naming directories, which
dirstate doesn't handle[1]. Making dirstate handle mismatched
directory cases is too expensive[2].
Since dirstate doesn't apply to committed csets, this is only created by
overriding basectx.match() in workingctx, and only on icasefs. The default
arguments have been dropped, because the ctx must be passed to the matcher in
order to function.
For operations that can apply to both wdir and some other context, this ends up
normalizing the filename to the case as it exists in the filesystem, and using
that case for the lookup in the other context. See the diff example in the
test.
Previously, given a directory with an inexact case:
- add worked as expected
- diff, forget and status would silently ignore the request
- files would exit with 1
- commit, revert and remove would fail (even when the commands leading up to
them worked):
$ hg ci -m "AbCDef" capsdir1/capsdir
abort: CapsDir1/CapsDir: no match under directory!
$ hg revert -r '.^' capsdir1/capsdir
capsdir1\capsdir: no such file in rev 64dae27060b7
$ hg remove capsdir1/capsdir
not removing capsdir1\capsdir: no tracked files
[1]
Globs are normalized, so that the -I and -X don't need to be specified with a
case match. Without that, the second last remove (with -X) removes the files,
leaving nothing for the last remove. However, specifying the files as
'glob:**.Txt' does not work. Perhaps this requires 're.IGNORECASE'?
There are only a handful of places that create matchers directly, instead of
being routed through the context.match() method. Some may benefit from changing
over to using ctx.match() as a factory function:
revset.checkstatus()
revset.contains()
revset.filelog()
revset._matchfiles()
localrepository._loadfilter()
ignore.ignore()
fileset.subrepo()
filemerge._picktool()
overrides.addlargefiles()
lfcommands.lfconvert()
kwtemplate.__init__()
eolfile.__init__()
eolfile.checkrev()
acl.buildmatch()
Currently, a toplevel subrepo can be named with an inexact case. However, the
path auditor gets in the way of naming _anything_ in the subrepo if the top
level case doesn't match. That is trickier to handle, because there's the user
provided case, the case in the filesystem, and the case stored in .hgsub. This
can be fixed next cycle.
--- a/tests/test-subrepo-deep-nested-change.t
+++ b/tests/test-subrepo-deep-nested-change.t
@@ -170,8 +170,15 @@
R sub1/sub2/test.txt
$ hg update -Cq
$ touch sub1/sub2/folder/bar
+#if icasefs
+ $ hg addremove Sub1/sub2
+ abort: path 'Sub1\sub2' is inside nested repo 'Sub1'
+ [255]
+ $ hg -q addremove sub1/sub2
+#else
$ hg addremove sub1/sub2
adding sub1/sub2/folder/bar (glob)
+#endif
$ hg status -S
A sub1/sub2/folder/bar
? foo/bar/abc
The narrowmatcher class may need to be tweaked when that is fixed.
[1] http://www.selenic.com/pipermail/mercurial-devel/2015-April/068183.html
[2] http://www.selenic.com/pipermail/mercurial-devel/2015-April/068191.html
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 12 Apr 2015 01:39:21 -0400 |
parents | 7a9cbb315d84 |
children | 4d2b9b304ad0 |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
18629
diff
changeset
|
1 #require serve |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
12126
diff
changeset
|
2 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
3 $ hg init test |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
4 $ cd test |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
5 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
6 $ cat > .hg/hgrc <<EOF |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
7 > [extensions] |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
8 > # this is only necessary to check that the mapping from |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
9 > # interhg to websub works |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
10 > interhg = |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
11 > |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
12 > [websub] |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
13 > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>| |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
14 > |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
15 > [interhg] |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
16 > # check that we maintain some interhg backwards compatibility... |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
17 > # yes, 'x' is a weird delimiter... |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
18 > markbugs = sxbugx<i class="\x">bug</i>x |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
19 > EOF |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
20 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
21 $ touch foo |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
22 $ hg add foo |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
23 $ hg commit -d '1 0' -m 'Issue123: fixed the bug!' |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
24 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
25 $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
26 $ cat hg.pid >> $DAEMON_PIDS |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
27 |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
28 log |
10473
634b0e7561ec
test-interhg: test the extension
Martin Geisler <mg@lazybytes.net>
parents:
diff
changeset
|
29 |
18629
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
30 $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT "rev/tip" | grep bts |
013fcd112f13
extensions: obsolete and remove interhg extension
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17017
diff
changeset
|
31 <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div> |
12126
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
32 errors |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
33 |
779098953457
tests: unify test-interhg
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10473
diff
changeset
|
34 $ cat errors.log |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
35 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15446
diff
changeset
|
36 $ cd .. |