upstream/mercurial-mirror Files · tests/test-subrepo-paths.t

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Simon Heimberg - - Load All Authors

File last commit:

r19380:ee07f9d1 default


                r22287:f3ac9677

default

Download file

             test-subrepo-paths.t
        
                    61 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-paths.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init outer

        $ cd outer

        $ echo '[paths]' >> .hg/hgrc

        $ echo 'default = http://example.net/' >> .hg/hgrc

      hg debugsub with no remapping

        $ echo 'sub = libfoo' > .hgsub

        $ hg add .hgsub

        $ hg debugsub

        path sub

         source   libfoo

         revision 

      hg debugsub with remapping

        $ echo '[subpaths]' >> .hg/hgrc

        $ printf 'http://example.net/lib(.*) = C:\\libs\\\\1-lib\\\n' >> .hg/hgrc

        $ hg debugsub

        path sub

         source   C:\libs\foo-lib\

         revision 

      test cumulative remapping, the $HGRCPATH file is loaded first

        $ echo '[subpaths]' >> $HGRCPATH

        $ echo 'libfoo = libbar' >> $HGRCPATH

        $ hg debugsub

        path sub

         source   C:\libs\bar-lib\

         revision 

      test absolute source path -- testing with a URL is important since

      standard os.path.join wont treat that as an absolute path

        $ echo 'abs = http://example.net/abs' > .hgsub

        $ hg debugsub

        path abs

         source   http://example.net/abs

         revision 

        $ echo 'abs = /abs' > .hgsub

        $ hg debugsub

        path abs

         source   /abs

         revision 

      test bad subpaths pattern

        $ cat > .hg/hgrc <<EOF

        > [subpaths]

        > .* = \1

        > EOF

        $ hg debugsub

        abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (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 outer
				$ cd outer

				$ echo '[paths]' >> .hg/hgrc
				$ echo 'default = http://example.net/' >> .hg/hgrc

				hg debugsub with no remapping

				$ echo 'sub = libfoo' > .hgsub
				$ hg add .hgsub

				$ hg debugsub
				path sub
				source libfoo
				revision

				hg debugsub with remapping

				$ echo '[subpaths]' >> .hg/hgrc
				$ printf 'http://example.net/lib(.*) = C:\\libs\\\\1-lib\\\n' >> .hg/hgrc

				$ hg debugsub
				path sub
				source C:\libs\foo-lib\
				revision

				test cumulative remapping, the $HGRCPATH file is loaded first

				$ echo '[subpaths]' >> $HGRCPATH
				$ echo 'libfoo = libbar' >> $HGRCPATH
				$ hg debugsub
				path sub
				source C:\libs\bar-lib\
				revision

				test absolute source path -- testing with a URL is important since
				standard os.path.join wont treat that as an absolute path

				$ echo 'abs = http://example.net/abs' > .hgsub
				$ hg debugsub
				path abs
				source http://example.net/abs
				revision

				$ echo 'abs = /abs' > .hgsub
				$ hg debugsub
				path abs
				source /abs
				revision

				test bad subpaths pattern

				$ cat > .hg/hgrc <<EOF
				> [subpaths]
				> .* = \1
				> EOF
				$ hg debugsub
				abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
				[255]

				$ cd ..