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

Mads Kiilerich - - Load All Authors

File last commit:

r18506:ef60083b stable


                r22285:85bded43

default

Download file

             test-audit-path.t
        
                    92 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-audit-path.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

      audit of .hg

        $ hg add .hg/00changelog.i

        abort: path contains illegal component: .hg/00changelog.i (glob)

        [255]

      #if symlink

      Symlinks

        $ mkdir a

        $ echo a > a/a

        $ hg ci -Ama

        adding a/a

        $ ln -s a b

        $ echo b > a/b

        $ hg add b/b

        abort: path 'b/b' traverses symbolic link 'b' (glob)

        [255]

        $ hg add b

      should still fail - maybe

        $ hg add b/b

        abort: path 'b/b' traverses symbolic link 'b' (glob)

        [255]

      #endif

      unbundle tampered bundle

        $ hg init target

        $ cd target

        $ hg unbundle "$TESTDIR/bundles/tampered.hg"

        adding changesets

        adding manifests

        adding file changes

        added 5 changesets with 6 changes to 6 files (+4 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

      attack .hg/test

        $ hg manifest -r0

        .hg/test

        $ hg update -Cr0

        abort: path contains illegal component: .hg/test (glob)

        [255]

      attack foo/.hg/test

        $ hg manifest -r1

        foo/.hg/test

        $ hg update -Cr1

        abort: path 'foo/.hg/test' is inside nested repo 'foo' (glob)

        [255]

      attack back/test where back symlinks to ..

        $ hg manifest -r2

        back

        back/test

      #if symlink

        $ hg update -Cr2

        abort: path 'back/test' traverses symbolic link 'back'

        [255]

      #else

      ('back' will be a file and cause some other system specific error)

        $ hg update -Cr2

        abort: * (glob)

        [255]

      #endif

      attack ../test

        $ hg manifest -r3

        ../test

        $ hg update -Cr3

        abort: path contains illegal component: ../test (glob)

        [255]

      attack /tmp/test

        $ hg manifest -r4

        /tmp/test

        $ hg update -Cr4

        abort: path contains illegal component: /tmp/test (glob)

        [255]

        $ 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

				$ hg init

				audit of .hg

				$ hg add .hg/00changelog.i
				abort: path contains illegal component: .hg/00changelog.i (glob)
				[255]

				#if symlink

				Symlinks

				$ mkdir a
				$ echo a > a/a
				$ hg ci -Ama
				adding a/a
				$ ln -s a b
				$ echo b > a/b
				$ hg add b/b
				abort: path 'b/b' traverses symbolic link 'b' (glob)
				[255]
				$ hg add b

				should still fail - maybe

				$ hg add b/b
				abort: path 'b/b' traverses symbolic link 'b' (glob)
				[255]

				#endif


				unbundle tampered bundle

				$ hg init target
				$ cd target
				$ hg unbundle "$TESTDIR/bundles/tampered.hg"
				adding changesets
				adding manifests
				adding file changes
				added 5 changesets with 6 changes to 6 files (+4 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)

				attack .hg/test

				$ hg manifest -r0
				.hg/test
				$ hg update -Cr0
				abort: path contains illegal component: .hg/test (glob)
				[255]

				attack foo/.hg/test

				$ hg manifest -r1
				foo/.hg/test
				$ hg update -Cr1
				abort: path 'foo/.hg/test' is inside nested repo 'foo' (glob)
				[255]

				attack back/test where back symlinks to ..

				$ hg manifest -r2
				back
				back/test
				#if symlink
				$ hg update -Cr2
				abort: path 'back/test' traverses symbolic link 'back'
				[255]
				#else
				('back' will be a file and cause some other system specific error)
				$ hg update -Cr2
				abort: * (glob)
				[255]
				#endif

				attack ../test

				$ hg manifest -r3
				../test
				$ hg update -Cr3
				abort: path contains illegal component: ../test (glob)
				[255]

				attack /tmp/test

				$ hg manifest -r4
				/tmp/test
				$ hg update -Cr4
				abort: path contains illegal component: /tmp/test (glob)
				[255]

				$ cd ..