tests/test-hgcia.t
author Matt Harbison <matt_harbison@yahoo.com>
Sun, 12 Apr 2015 01:39:21 -0400
changeset 24790 baa11dde8c0e
parent 16913 f2719b387380
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     1
Test the CIA extension
7438
b80b944836ec Add hgcia to hgext
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
     2
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     3
  $ cat >> $HGRCPATH <<EOF
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     4
  > [extensions]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     5
  > hgcia=
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     6
  > 
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     7
  > [hooks]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     8
  > changegroup.cia = python:hgext.hgcia.hook
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
     9
  > 
14314
c322890b03e6 hgcia: Handle URL like in notify (issue2406)
Cédric Krier <ced@b2ck.com>
parents: 12429
diff changeset
    10
  > [web]
c322890b03e6 hgcia: Handle URL like in notify (issue2406)
Cédric Krier <ced@b2ck.com>
parents: 12429
diff changeset
    11
  > baseurl = http://hgserver/
c322890b03e6 hgcia: Handle URL like in notify (issue2406)
Cédric Krier <ced@b2ck.com>
parents: 12429
diff changeset
    12
  > 
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    13
  > [cia]
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    14
  > user = testuser
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    15
  > project = testproject
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    16
  > test = True
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    17
  > EOF
7438
b80b944836ec Add hgcia to hgext
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
    18
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    19
  $ hg init src
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    20
  $ hg init cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    21
  $ cd src
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    22
  $ echo foo > foo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    23
  $ hg ci -Amfoo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    24
  adding foo
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    25
  $ hg push ../cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    26
  pushing to ../cia
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    27
  searching for changes
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    28
  adding changesets
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    29
  adding manifests
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    30
  adding file changes
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    31
  added 1 changesets with 1 changes to 1 files
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    32
  
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    33
  <message>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    34
    <generator>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    35
      <name>Mercurial (hgcia)</name>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    36
      <version>0.1</version>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    37
      <url>http://hg.kublai.com/mercurial/hgcia</url>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    38
      <user>testuser</user>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    39
    </generator>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    40
    <source>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    41
  <project>testproject</project>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    42
  <branch>default</branch>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    43
  </source>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    44
    <body>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    45
      <commit>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    46
        <author>test</author>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    47
        <version>0:e63c23eaa88a</version>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    48
        <log>foo</log>
14850
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    49
        <url>http://hgserver/rev/e63c23eaa88a</url>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    50
        <files><file uri="http://hgserver/file/e63c23eaa88a/foo" action="add">foo</file></files>
12429
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    51
      </commit>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    52
    </body>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    53
    <timestamp>0</timestamp>
01c6be8361df tests: unify test-hgcia
Matt Mackall <mpm@selenic.com>
parents: 7438
diff changeset
    54
  </message>
14850
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    55
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    56
  $ cat >> $HGRCPATH <<EOF
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    57
  > strip = 0
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    58
  > EOF
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    59
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    60
  $ echo bar > bar
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    61
  $ hg ci -Ambar
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    62
  adding bar
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    63
  $ hg push ../cia
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    64
  pushing to ../cia
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    65
  searching for changes
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    66
  adding changesets
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    67
  adding manifests
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    68
  adding file changes
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    69
  added 1 changesets with 1 changes to 1 files
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    70
  
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    71
  <message>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    72
    <generator>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    73
      <name>Mercurial (hgcia)</name>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    74
      <version>0.1</version>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    75
      <url>http://hg.kublai.com/mercurial/hgcia</url>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    76
      <user>testuser</user>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    77
    </generator>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    78
    <source>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    79
  <project>testproject</project>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    80
  <branch>default</branch>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    81
  </source>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    82
    <body>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    83
      <commit>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    84
        <author>test</author>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    85
        <version>1:c0c7cf58edc5</version>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    86
        <log>bar</log>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    87
        <url>http://hgserver/$TESTTMP/cia/rev/c0c7cf58edc5</url>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    88
        <files><file uri="http://hgserver/$TESTTMP/cia/file/c0c7cf58edc5/bar" action="add">bar</file></files>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    89
      </commit>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    90
    </body>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    91
    <timestamp>0</timestamp>
a95242af945c hgcia: Set default value of strip to -1 (issue2891)
Cédric Krier <ced@b2ck.com>
parents: 14314
diff changeset
    92
  </message>
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14850
diff changeset
    93
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14850
diff changeset
    94
  $ cd ..