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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Harbison - - Load All Authors

File last commit:

r21078:50107a4b default


                r22285:85bded43

default

Download file

             test-cat.t
        
                    53 lines
            
             | 914 B
            
                | 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 fileset

        $ echo 3 > c

        $ hg ci -Am addmore c

        $ 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

	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 fileset

				$ echo 3 > c
				$ hg ci -Am addmore c
				$ 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