upstream/mercurial-mirror Files · tests/test-casecollision.t

localrepo: make journal.dirstate contain in-memory changes before transaction...

localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see for detail) and prevents from certainly reproducing the issue.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r25878:800e090e

stable

Download file

             test-casecollision.t
        
                    69 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-casecollision.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require no-icasefs

        Kevin Gessner
    
add: notify when adding a file that would cause a case-folding collision...

              r14068
            
      test file addition with colliding case

        $ hg init repo1

        $ cd repo1

        $ echo a > a

        $ echo A > A

        $ hg add a

        $ hg st

        A a

        ? A

        $ hg add --config ui.portablefilenames=abort A

        abort: possible case-folding collision for A

        [255]

        $ hg st

        A a

        ? A

        $ hg add A

        warning: possible case-folding collision for A

        $ hg st

        A A

        A a

        $ hg forget A

        $ hg st

        A a

        ? A

        $ hg add --config ui.portablefilenames=no A

        $ hg st

        A A

        A a

        Joshua Redstone
    
casecollision: add tests...

              r17096
            
        $ mkdir b

        $ touch b/c b/D

        $ hg add b

        adding b/D

        adding b/c

        $ touch b/d b/C

        $ hg add b/C

        warning: possible case-folding collision for b/C

        $ hg add b/d

        warning: possible case-folding collision for b/d

        $ touch b/a1 b/a2

        $ hg add b

        adding b/a1

        adding b/a2

        $ touch b/A2 b/a1.1

        $ hg add b/a1.1 b/A2

        warning: possible case-folding collision for b/A2

        $ touch b/f b/F

        $ hg add b/f b/F

        warning: possible case-folding collision for b/f

        $ touch g G

        $ hg add g G

        warning: possible case-folding collision for g

        $ mkdir h H

        $ touch h/x H/x

        $ hg add h/x H/x

        warning: possible case-folding collision for h/x

        $ touch h/s H/s

        $ hg add h/s

        $ hg add H/s

        warning: possible case-folding collision for H/s

        Adrian Buehlmann
    
test-casecollision.t: add test for case changing rename

              r14178
            
      case changing rename must not warn or abort

        $ echo c > c

        $ hg ci -qAmx

        $ hg mv c C

        Kevin Gessner
    
add: notify when adding a file that would cause a case-folding collision...

              r14068
            
        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Matt Mackall tests: replace exit 80 with #require	r22046	#require no-icasefs
Kevin Gessner add: notify when adding a file that would cause a case-folding collision...	r14068
		test file addition with colliding case

		$ hg init repo1
		$ cd repo1
		$ echo a > a
		$ echo A > A
		$ hg add a
		$ hg st
		A a
		? A
		$ hg add --config ui.portablefilenames=abort A
		abort: possible case-folding collision for A
		[255]
		$ hg st
		A a
		? A
		$ hg add A
		warning: possible case-folding collision for A
		$ hg st
		A A
		A a
		$ hg forget A
		$ hg st
		A a
		? A
		$ hg add --config ui.portablefilenames=no A
		$ hg st
		A A
		A a
Joshua Redstone casecollision: add tests...	r17096	$ mkdir b
		$ touch b/c b/D
		$ hg add b
		adding b/D
		adding b/c
		$ touch b/d b/C
		$ hg add b/C
		warning: possible case-folding collision for b/C
		$ hg add b/d
		warning: possible case-folding collision for b/d
		$ touch b/a1 b/a2
		$ hg add b
		adding b/a1
		adding b/a2
		$ touch b/A2 b/a1.1
		$ hg add b/a1.1 b/A2
		warning: possible case-folding collision for b/A2
		$ touch b/f b/F
		$ hg add b/f b/F
		warning: possible case-folding collision for b/f
		$ touch g G
		$ hg add g G
		warning: possible case-folding collision for g
		$ mkdir h H
		$ touch h/x H/x
		$ hg add h/x H/x
		warning: possible case-folding collision for h/x
		$ touch h/s H/s
		$ hg add h/s
		$ hg add H/s
		warning: possible case-folding collision for H/s
Adrian Buehlmann test-casecollision.t: add test for case changing rename	r14178
		case changing rename must not warn or abort

		$ echo c > c
		$ hg ci -qAmx
		$ hg mv c C
Kevin Gessner add: notify when adding a file that would cause a case-folding collision...	r14068	$ cd ..