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

Yuya Nishihara - - Load All Authors

File last commit:

r23172:e955549c default


                r23524:a1a7c94d

default

Download file

             test-bad-extension.t
        
                    17 lines
            
             | 453 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bad-extension.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-bad-extension

              r11858
            
        $ echo 'raise Exception("bit bucket overflow")' > badext.py

        $ abspath=`pwd`/badext.py

        Yuya Nishihara
    
tests: write hgrc of more than two lines by using shell heredoc...

              r23172
            
        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > gpg =

        > hgext.gpg =

        > badext = $abspath

        > badext2 =

        > EOF

        Martin Geisler
    
tests: unify test-bad-extension

              r11858
            
        $ hg -q help help

        Mads Kiilerich
    
tests: remove redundant globs...

              r12640
            
        *** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow

        Brodie Rao
    
tests: require regexes in unified tests to be marked with " (re)"...

              r12375
            
        *** failed to import extension badext2: No module named badext2

        Martin Geisler
    
help: add -c/--command flag to only show command help (issue2799)

              r14286
            
        hg help [-ec] [TOPIC]

        Martin Geisler
    
tests: unify test-bad-extension

              r11858
            
        show help for a given topic or a help overview

	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

Martin Geisler tests: unify test-bad-extension	r11858	$ echo 'raise Exception("bit bucket overflow")' > badext.py
		$ abspath=`pwd`/badext.py

Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> gpg =
		> hgext.gpg =
		> badext = $abspath
		> badext2 =
		> EOF
Martin Geisler tests: unify test-bad-extension	r11858
		$ hg -q help help
Mads Kiilerich tests: remove redundant globs...	r12640	*** failed to import extension badext from $TESTTMP/badext.py: bit bucket overflow
Brodie Rao tests: require regexes in unified tests to be marked with " (re)"...	r12375	*** failed to import extension badext2: No module named badext2
Martin Geisler help: add -c/--command flag to only show command help (issue2799)	r14286	hg help [-ec] [TOPIC]
Martin Geisler tests: unify test-bad-extension	r11858
		show help for a given topic or a help overview