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

Pierre-Yves David - - Load All Authors

File last commit:

r30152:d65e2461 default


                r32255:7e35d31b

default

Download file

             test-dispatch.t
        
                    62 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-dispatch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test command parsing and dispatch

        $ hg init a

        $ cd a

      Redundant options used to crash (issue436):

        $ hg -v log -v

        $ hg -v log -v x

        $ echo a > a

        $ hg ci -Ama

        adding a

      Missing arg:

        $ hg cat

        hg cat: invalid arguments

        hg cat [OPTION]... FILE...

        output the current or given revision of files

        options ([+] can be repeated):

         -o --output FORMAT       print output to file with formatted name

         -r --rev REV             print the given revision

            --decode              apply any matching decode filter

         -I --include PATTERN [+] include names matching the given patterns

         -X --exclude PATTERN [+] exclude names matching the given patterns

        (use 'hg cat -h' to show more help)

        [255]

      [defaults]

        $ hg cat a

        a

        $ cat >> $HGRCPATH <<EOF

        > [defaults]

        > cat = -r null

        > EOF

        $ hg cat a

        a: no such file in rev 000000000000

        [1]

        $ cd "$TESTTMP"

      OSError "No such file or directory" / "The system cannot find the path

      specified" should include filename even when it is empty

        $ hg -R a archive ''

        abort: *: '' (glob)

        [255]

      #if no-outer-repo

      No repo:

        $ hg cat

        abort: no repository found in '$TESTTMP' (.hg not found)!

        [255]

      #endif

	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

				test command parsing and dispatch

				$ hg init a
				$ cd a

				Redundant options used to crash (issue436):
				$ hg -v log -v
				$ hg -v log -v x

				$ echo a > a
				$ hg ci -Ama
				adding a

				Missing arg:

				$ hg cat
				hg cat: invalid arguments
				hg cat [OPTION]... FILE...

				output the current or given revision of files

				options ([+] can be repeated):

				-o --output FORMAT print output to file with formatted name
				-r --rev REV print the given revision
				--decode apply any matching decode filter
				-I --include PATTERN [+] include names matching the given patterns
				-X --exclude PATTERN [+] exclude names matching the given patterns

				(use 'hg cat -h' to show more help)
				[255]

				[defaults]

				$ hg cat a
				a
				$ cat >> $HGRCPATH <<EOF
				> [defaults]
				> cat = -r null
				> EOF
				$ hg cat a
				a: no such file in rev 000000000000
				[1]

				$ cd "$TESTTMP"

				OSError "No such file or directory" / "The system cannot find the path
				specified" should include filename even when it is empty

				$ hg -R a archive ''
				abort: *: '' (glob)
				[255]

				#if no-outer-repo

				No repo:

				$ hg cat
				abort: no repository found in '$TESTTMP' (.hg not found)!
				[255]

				#endif