upstream/mercurial-mirror Files · tests/test-cat.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.

Yuya Nishihara - - Load All Authors

File last commit:

r24720:c560d8c6 default


                r25878:800e090e

stable

Download file

             test-cat.t
        
                    70 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-cat.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo 0 > a

        $ echo 0 > b

        $ hg ci -A -m m

        adding a

        adding b

        $ hg rm a

        $ hg cat a

        0

        $ hg cat --decode a # more tests in test-encode

        0

        $ echo 1 > b

        $ hg ci -m m

        $ echo 2 > b

        $ hg cat -r 0 a

        0

        $ hg cat -r 0 b

        0

        $ hg cat -r 1 a

        a: no such file in rev 7040230c159c

        [1]

        $ hg cat -r 1 b

        1

      Test multiple files

        $ echo 3 > c

        $ hg ci -Am addmore c

        $ hg cat b c

        1

        3

        $ hg cat .

        1

        3

        $ hg cat . c

        1

        3

      Test fileset

        $ hg cat 'set:not(b) or a'

        3

        $ hg cat 'set:c or b'

        1

        3

        $ mkdir tmp

        $ hg cat --output tmp/HH_%H c

        $ hg cat --output tmp/RR_%R c

        $ hg cat --output tmp/h_%h c

        $ hg cat --output tmp/r_%r c

        $ hg cat --output tmp/%s_s c

        $ hg cat --output tmp/%d%%_d c

        $ hg cat --output tmp/%p_p c

        $ hg log -r . --template "{rev}: {node|short}\n"

        2: 45116003780e

        $ find tmp -type f | sort

        tmp/.%_d

        tmp/HH_45116003780e3678b333fb2c99fa7d559c8457e9

        tmp/RR_2

        tmp/c_p

        tmp/c_s

        tmp/h_45116003780e

        tmp/r_2

      Test working directory

        $ echo b-wdir > b

        $ hg cat -r 'wdir()' b

        b-wdir

	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

				$ hg init
				$ echo 0 > a
				$ echo 0 > b
				$ hg ci -A -m m
				adding a
				adding b
				$ hg rm a
				$ hg cat a
				0
				$ hg cat --decode a # more tests in test-encode
				0
				$ echo 1 > b
				$ hg ci -m m
				$ echo 2 > b
				$ hg cat -r 0 a
				0
				$ hg cat -r 0 b
				0
				$ hg cat -r 1 a
				a: no such file in rev 7040230c159c
				[1]
				$ hg cat -r 1 b
				1

				Test multiple files

				$ echo 3 > c
				$ hg ci -Am addmore c
				$ hg cat b c
				1
				3
				$ hg cat .
				1
				3
				$ hg cat . c
				1
				3

				Test fileset

				$ hg cat 'set:not(b) or a'
				3
				$ hg cat 'set:c or b'
				1
				3

				$ mkdir tmp
				$ hg cat --output tmp/HH_%H c
				$ hg cat --output tmp/RR_%R c
				$ hg cat --output tmp/h_%h c
				$ hg cat --output tmp/r_%r c
				$ hg cat --output tmp/%s_s c
				$ hg cat --output tmp/%d%%_d c
				$ hg cat --output tmp/%p_p c
				$ hg log -r . --template "{rev}: {node\|short}\n"
				2: 45116003780e
				$ find tmp -type f \| sort
				tmp/.%_d
				tmp/HH_45116003780e3678b333fb2c99fa7d559c8457e9
				tmp/RR_2
				tmp/c_p
				tmp/c_s
				tmp/h_45116003780e
				tmp/r_2

				Test working directory

				$ echo b-wdir > b
				$ hg cat -r 'wdir()' b
				b-wdir