upstream/mercurial-mirror Files · tests/test-dispatch.t

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Matt Mackall - - Load All Authors

File last commit:

r22117:c1d93edc default


                r23524:a1a7c94d

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