view tests/svn/tags.svndump @ 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 965b11c1bd82
children
line wrap: on
line source

SVN-fs-dump-format-version: 2

UUID: a9c3b03d-cffa-4248-8023-ecf4b2bdf5d5

Revision-number: 0
Prop-content-length: 56
Content-length: 56

K 8
svn:date
V 27
2009-04-29T19:26:51.708679Z
PROPS-END

Revision-number: 1
Prop-content-length: 112
Content-length: 112

K 7
svn:log
V 10
init projA
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:52.115023Z
PROPS-END

Node-path: branches
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: tags
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: trunk
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: unrelated
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Revision-number: 2
Prop-content-length: 105
Content-length: 105

K 7
svn:log
V 4
adda
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:53.109819Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 2
Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
Content-length: 12

PROPS-END
a


Revision-number: 3
Prop-content-length: 108
Content-length: 108

K 7
svn:log
V 7
changea
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:54.073017Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 4
Text-content-md5: 0d227f1abf8c2932d342e9b99cc957eb
Text-content-sha1: d7c8127a20a396cff08af086a1c695b0636f0c29
Content-length: 4

a
a


Revision-number: 4
Prop-content-length: 109
Content-length: 109

K 7
svn:log
V 8
changea2
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:55.076032Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 6
Text-content-md5: 7d4ebf8f298d22fc349a91725b00af1c
Text-content-sha1: 92f31bc48f52339253fce6cad9f2f0c95b302f7e
Content-length: 6

a
a
a


Revision-number: 5
Prop-content-length: 117
Content-length: 117

K 7
svn:log
V 15
unrelatedchange
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:26:56.095784Z
PROPS-END

Node-path: unrelated/dummy
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 2
Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b
Content-length: 12

PROPS-END
a


Revision-number: 6
Prop-content-length: 131
Content-length: 131

K 7
svn:log
V 29
tagging trunk.v1 trunk.badtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:00.074864Z
PROPS-END

Node-path: tags/trunk.badtag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 5
Node-copyfrom-path: trunk


Node-path: tags/trunk.v1
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 5
Node-copyfrom-path: trunk


Revision-number: 7
Prop-content-length: 109
Content-length: 109

K 7
svn:log
V 8
changea3
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:01.073910Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 8
Text-content-md5: d12178e74d8774e34361e0a08d1fd2b7
Text-content-sha1: cce0b2a263066e26610df9082b7b3c810f71262e
Content-length: 8

a
a
a
a


Revision-number: 8
Prop-content-length: 118
Content-length: 118

K 7
svn:log
V 16
fix trunk.badtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:04.073542Z
PROPS-END

Node-path: tags/trunk.goodtag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 7
Node-copyfrom-path: tags/trunk.badtag


Node-path: tags/trunk.badtag
Node-action: delete


Revision-number: 9
Prop-content-length: 108
Content-length: 108

K 7
svn:log
V 7
changea
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:05.095204Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: change
Text-content-length: 10
Text-content-md5: 3f65cbdca1b64c2f8f574fccae24f3a4
Text-content-sha1: 5c077263421de2abff9dbe867921bc6810811aa2
Content-length: 10

a
a
a
a
a


Revision-number: 10
Prop-content-length: 115
Content-length: 115

K 7
svn:log
V 13
removegoodtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:06.089193Z
PROPS-END

Node-path: tags/trunk.goodtag
Node-action: delete


Revision-number: 11
Prop-content-length: 117
Content-length: 117

K 7
svn:log
V 15
recreategoodtag
K 10
svn:author
V 7
pmezard
K 8
svn:date
V 27
2009-04-29T19:27:09.070471Z
PROPS-END

Node-path: tags/trunk.goodtag
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 10
Node-copyfrom-path: trunk