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

Razvan Cojocaru - - Load All Authors

File last commit:

r22276:b13b99d3 default


                r22285:85bded43

default

Download file

             test-config.t
        
                    85 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-config.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      hide outer repo

        $ hg init

      Invalid syntax: no value

        $ cat > .hg/hgrc << EOF

        > novaluekey

        > EOF

        $ hg showconfig

        hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey

        [255]

      Invalid syntax: no key

        $ cat > .hg/hgrc << EOF

        > =nokeyvalue

        > EOF

        $ hg showconfig

        hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue

        [255]

      Test hint about invalid syntax from leading white space

        $ cat > .hg/hgrc << EOF

        >  key=value

        > EOF

        $ hg showconfig

        hg: parse error at $TESTTMP/.hg/hgrc:1:  key=value

        unexpected leading whitespace

        [255]

        $ cat > .hg/hgrc << EOF

        >  [section]

        > key=value

        > EOF

        $ hg showconfig

        hg: parse error at $TESTTMP/.hg/hgrc:1:  [section]

        unexpected leading whitespace

        [255]

      Reset hgrc

        $ echo > .hg/hgrc

      Test case sensitive configuration

        $ echo '[Section]' >> $HGRCPATH

        $ echo 'KeY = Case Sensitive' >> $HGRCPATH

        $ echo 'key = lower case' >> $HGRCPATH

        $ hg showconfig Section

        Section.KeY=Case Sensitive

        Section.key=lower case

      Test "%unset"

        $ cat >> $HGRCPATH <<EOF

        > [unsettest]

        > local-hgrcpath = should be unset (HGRCPATH)

        > %unset local-hgrcpath

        > 

        > global = should be unset (HGRCPATH)

        > 

        > both = should be unset (HGRCPATH)

        > 

        > set-after-unset = should be unset (HGRCPATH)

        > EOF

        $ cat >> .hg/hgrc <<EOF

        > [unsettest]

        > local-hgrc = should be unset (.hg/hgrc)

        > %unset local-hgrc

        > 

        > %unset global

        > 

        > both = should be unset (.hg/hgrc)

        > %unset both

        > 

        > set-after-unset = should be unset (.hg/hgrc)

        > %unset set-after-unset

        > set-after-unset = should be set (.hg/hgrc)

        > EOF

        $ hg showconfig unsettest

        unsettest.set-after-unset=should be set (.hg/hgrc)

	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

				hide outer repo
				$ hg init

				Invalid syntax: no value

				$ cat > .hg/hgrc << EOF
				> novaluekey
				> EOF
				$ hg showconfig
				hg: parse error at $TESTTMP/.hg/hgrc:1: novaluekey
				[255]

				Invalid syntax: no key

				$ cat > .hg/hgrc << EOF
				> =nokeyvalue
				> EOF
				$ hg showconfig
				hg: parse error at $TESTTMP/.hg/hgrc:1: =nokeyvalue
				[255]

				Test hint about invalid syntax from leading white space

				$ cat > .hg/hgrc << EOF
				> key=value
				> EOF
				$ hg showconfig
				hg: parse error at $TESTTMP/.hg/hgrc:1: key=value
				unexpected leading whitespace
				[255]

				$ cat > .hg/hgrc << EOF
				> [section]
				> key=value
				> EOF
				$ hg showconfig
				hg: parse error at $TESTTMP/.hg/hgrc:1: [section]
				unexpected leading whitespace
				[255]

				Reset hgrc

				$ echo > .hg/hgrc

				Test case sensitive configuration

				$ echo '[Section]' >> $HGRCPATH
				$ echo 'KeY = Case Sensitive' >> $HGRCPATH
				$ echo 'key = lower case' >> $HGRCPATH

				$ hg showconfig Section
				Section.KeY=Case Sensitive
				Section.key=lower case

				Test "%unset"

				$ cat >> $HGRCPATH <<EOF
				> [unsettest]
				> local-hgrcpath = should be unset (HGRCPATH)
				> %unset local-hgrcpath
				>
				> global = should be unset (HGRCPATH)
				>
				> both = should be unset (HGRCPATH)
				>
				> set-after-unset = should be unset (HGRCPATH)
				> EOF

				$ cat >> .hg/hgrc <<EOF
				> [unsettest]
				> local-hgrc = should be unset (.hg/hgrc)
				> %unset local-hgrc
				>
				> %unset global
				>
				> both = should be unset (.hg/hgrc)
				> %unset both
				>
				> set-after-unset = should be unset (.hg/hgrc)
				> %unset set-after-unset
				> set-after-unset = should be set (.hg/hgrc)
				> EOF

				$ hg showconfig unsettest
				unsettest.set-after-unset=should be set (.hg/hgrc)