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

Matt Mackall - - Load All Authors

File last commit:

r12346:3b165c12 default


                r32255:7e35d31b

default

Download file

             test-username-newline.t
        
                    25 lines
            
             | 503 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-username-newline.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ touch a

        $ unset HGUSER

        $ echo "[ui]" >> .hg/hgrc

        $ echo "username= foo" >> .hg/hgrc

        $ echo "          bar1" >> .hg/hgrc

        $ hg ci -Am m

        adding a

        abort: username 'foo\nbar1' contains a newline

        [255]

        $ rm .hg/hgrc

        $ HGUSER=`(echo foo; echo bar2)` hg ci -Am m

        abort: username 'foo\nbar2' contains a newline

        [255]

        $ hg ci -Am m -u "`(echo foo; echo bar3)`"

        transaction abort!

        rollback completed

        abort: username 'foo\nbar3' contains a newline!

        [255]

	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
				$ touch a

				$ unset HGUSER
				$ echo "[ui]" >> .hg/hgrc
				$ echo "username= foo" >> .hg/hgrc
				$ echo " bar1" >> .hg/hgrc

				$ hg ci -Am m
				adding a
				abort: username 'foo\nbar1' contains a newline

				[255]
				$ rm .hg/hgrc

				$ HGUSER=`(echo foo; echo bar2)` hg ci -Am m
				abort: username 'foo\nbar2' contains a newline

				[255]
				$ hg ci -Am m -u "`(echo foo; echo bar3)`"
				transaction abort!
				rollback completed
				abort: username 'foo\nbar3' contains a newline!
				[255]