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

mq: use dirstateguard instead of dirstate.invalidate (qrefresh)...

mq: use dirstateguard instead of dirstate.invalidate (qrefresh) Before this patch, "mq.queue.refresh()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during a failure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch also removes "beginparentchage()" and "endparentchange()", because "dirstateguard" makes them useless. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

Yuya Nishihara - - Load All Authors

File last commit:

r24720:c560d8c6 default


                r24997:12f3c714

default

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