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

Martin Geisler - - Load All Authors

File last commit:

r20117:aa9385f9 default


                r22285:85bded43

default

Download file

             test-revset-outgoing.t
        
                    91 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revset-outgoing.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [alias]

        > tlog = log --template "{rev}:{node|short}: '{desc}' {branches}\n"

        > tglog = tlog -G

        > tout = out --template "{rev}:{node|short}: '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Aqm0

        $ echo foo >> a

        $ hg ci -Aqm1

        $ hg up -q 0

        $ hg branch stable

        marked working directory as branch stable

        (branches are permanent and global, did you want a bookmark?)

        $ echo bar >> a

        $ hg ci -qm2

        $ hg tglog

        @  2:7bee6c3bea3a: '2' stable

        |

        | o  1:3560197d8331: '1'

        |/

        o  0:f7b1eb17ad24: '0'

        $ cd ..

        $ hg clone -q a#stable b

        $ cd b

        $ cat .hg/hgrc

        [paths]

        default = $TESTTMP/a#stable (glob)

        $ echo red >> a

        $ hg ci -qm3

        $ hg up -q default

        $ echo blue >> a

        $ hg ci -qm4

        $ hg tglog

        @  3:f0461977a3db: '4'

        |

        | o  2:1d4099801a4e: '3' stable

        | |

        | o  1:7bee6c3bea3a: '2' stable

        |/

        o  0:f7b1eb17ad24: '0'

        $ hg tout

        comparing with $TESTTMP/a (glob)

        searching for changes

        2:1d4099801a4e: '3' stable

        $ hg tlog -r 'outgoing()'

        2:1d4099801a4e: '3' stable

        $ hg tout ../a#default

        comparing with ../a

        searching for changes

        3:f0461977a3db: '4' 

        $ hg tlog -r 'outgoing("../a#default")'

        3:f0461977a3db: '4' 

        $ echo "green = ../a#default" >> .hg/hgrc

        $ cat .hg/hgrc

        [paths]

        default = $TESTTMP/a#stable (glob)

        green = ../a#default

        $ hg tout green

        comparing with $TESTTMP/a (glob)

        searching for changes

        3:f0461977a3db: '4' 

        $ hg tlog -r 'outgoing("green")'

        3:f0461977a3db: '4' 

        $ 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

				$ cat >> $HGRCPATH <<EOF
				> [alias]
				> tlog = log --template "{rev}:{node\|short}: '{desc}' {branches}\n"
				> tglog = tlog -G
				> tout = out --template "{rev}:{node\|short}: '{desc}' {branches}\n"
				> EOF

				$ hg init a
				$ cd a

				$ echo a > a
				$ hg ci -Aqm0

				$ echo foo >> a
				$ hg ci -Aqm1

				$ hg up -q 0

				$ hg branch stable
				marked working directory as branch stable
				(branches are permanent and global, did you want a bookmark?)
				$ echo bar >> a
				$ hg ci -qm2

				$ hg tglog
				@ 2:7bee6c3bea3a: '2' stable
				\|
				\| o 1:3560197d8331: '1'
				\|/
				o 0:f7b1eb17ad24: '0'


				$ cd ..

				$ hg clone -q a#stable b

				$ cd b
				$ cat .hg/hgrc
				[paths]
				default = $TESTTMP/a#stable (glob)

				$ echo red >> a
				$ hg ci -qm3

				$ hg up -q default

				$ echo blue >> a
				$ hg ci -qm4

				$ hg tglog
				@ 3:f0461977a3db: '4'
				\|
				\| o 2:1d4099801a4e: '3' stable
				\| \|
				\| o 1:7bee6c3bea3a: '2' stable
				\|/
				o 0:f7b1eb17ad24: '0'


				$ hg tout
				comparing with $TESTTMP/a (glob)
				searching for changes
				2:1d4099801a4e: '3' stable

				$ hg tlog -r 'outgoing()'
				2:1d4099801a4e: '3' stable

				$ hg tout ../a#default
				comparing with ../a
				searching for changes
				3:f0461977a3db: '4'

				$ hg tlog -r 'outgoing("../a#default")'
				3:f0461977a3db: '4'

				$ echo "green = ../a#default" >> .hg/hgrc

				$ cat .hg/hgrc
				[paths]
				default = $TESTTMP/a#stable (glob)
				green = ../a#default

				$ hg tout green
				comparing with $TESTTMP/a (glob)
				searching for changes
				3:f0461977a3db: '4'

				$ hg tlog -r 'outgoing("green")'
				3:f0461977a3db: '4'

				$ cd ..