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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Simon Heimberg - - Load All Authors

File last commit:

r19380:ee07f9d1 default


                r32255:7e35d31b

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 ..