upstream/mercurial-mirror Files · tests/test-eolfilename.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-eolfilename.t
        
                    78 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eolfilename.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require eol-in-paths

        Matt Mackall
    
tests: unify test-eolfilename

              r12425
            
        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      http://mercurial.selenic.com/bts/issue352

        Matt Mackall
    
tests: unify test-eolfilename

              r12425
            
      test issue352

        $ hg init foo

        $ cd foo

        $ A=`printf 'he\rllo'`

        $ echo foo > "$A"

        $ hg add

        Mads Kiilerich
    
run-tests: allow test output lines to be terminated with \r in addition to \n...

              r17742
            
        adding he\r (no-eol) (esc)

        llo

        Matt Mackall
    
tests: unify test-eolfilename

              r12425
            
        abort: '\n' and '\r' disallowed in filenames: 'he\rllo'

        [255]

        $ hg ci -A -m m

        Mads Kiilerich
    
run-tests: allow test output lines to be terminated with \r in addition to \n...

              r17742
            
        adding he\r (no-eol) (esc)

        llo

        Matt Mackall
    
tests: unify test-eolfilename

              r12425
            
        abort: '\n' and '\r' disallowed in filenames: 'he\rllo'

        [255]

        $ rm "$A"

        $ echo foo > "hell

        > o"

        $ hg add

        adding hell

        o

        abort: '\n' and '\r' disallowed in filenames: 'hell\no'

        [255]

        $ hg ci -A -m m

        adding hell

        o

        abort: '\n' and '\r' disallowed in filenames: 'hell\no'

        [255]

        $ echo foo > "$A"

        $ hg debugwalk

        Mads Kiilerich
    
run-tests: allow test output lines to be terminated with \r in addition to \n...

              r17742
            
        f  he\r (no-eol) (esc)

        llo  he\r (no-eol) (esc)

        llo

        Matt Mackall
    
tests: unify test-eolfilename

              r12425
            
        f  hell

        o  hell

        o

        Adrian Buehlmann
    
copy: do not copy file if name is disallowed anyway

              r13945
            
        $ echo bla > quickfox

        $ hg add quickfox

        $ hg ci -m 2

        $ A=`printf 'quick\rfox'`

        $ hg cp quickfox "$A"

        abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'

        [255]

        $ hg mv quickfox "$A"

        abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'

        [255]

        Matt Mackall
    
tests: unify test-eolfilename

              r12425
            
      http://mercurial.selenic.com/bts/issue2036

        $ cd ..

      test issue2039

        $ hg init bar

        $ cd bar

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

              r23172
            
        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > color =

        > [color]

        > mode = ansi

        > EOF

        Matt Mackall
    
tests: unify test-eolfilename

              r12425
            
        $ A=`printf 'foo\nbar'`

        $ B=`printf 'foo\nbar.baz'`

        $ touch "$A"

        $ touch "$B"

        $ hg status --color=always

        Matt Mackall
    
status: use condwrite to avoid zero-width format string hack

              r17910
            
        \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;35;1;4mbar\x1b[0m (esc)

        Matt Mackall
    
status: use condwrite to avoid zero-width format string hack

              r17910
            
        \x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)

        Mads Kiilerich
    
tests: use (esc) for all non-ASCII test output

              r12942
            
        \x1b[0;35;1;4mbar.baz\x1b[0m (esc)

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: replace exit 80 with #require	r22046	#require eol-in-paths
Matt Mackall tests: unify test-eolfilename	r12425
Matt Mackall tests: replace exit 80 with #require	r22046	http://mercurial.selenic.com/bts/issue352
Matt Mackall tests: unify test-eolfilename	r12425
		test issue352

		$ hg init foo
		$ cd foo
		$ A=`printf 'he\rllo'`
		$ echo foo > "$A"
		$ hg add
Mads Kiilerich run-tests: allow test output lines to be terminated with \r in addition to \n...	r17742	adding he\r (no-eol) (esc)
		llo
Matt Mackall tests: unify test-eolfilename	r12425	abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
		[255]
		$ hg ci -A -m m
Mads Kiilerich run-tests: allow test output lines to be terminated with \r in addition to \n...	r17742	adding he\r (no-eol) (esc)
		llo
Matt Mackall tests: unify test-eolfilename	r12425	abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
		[255]
		$ rm "$A"
		$ echo foo > "hell
		> o"
		$ hg add
		adding hell
		o
		abort: '\n' and '\r' disallowed in filenames: 'hell\no'
		[255]
		$ hg ci -A -m m
		adding hell
		o
		abort: '\n' and '\r' disallowed in filenames: 'hell\no'
		[255]
		$ echo foo > "$A"
		$ hg debugwalk
Mads Kiilerich run-tests: allow test output lines to be terminated with \r in addition to \n...	r17742	f he\r (no-eol) (esc)
		llo he\r (no-eol) (esc)
		llo
Matt Mackall tests: unify test-eolfilename	r12425	f hell
		o hell
		o

Adrian Buehlmann copy: do not copy file if name is disallowed anyway	r13945	$ echo bla > quickfox
		$ hg add quickfox
		$ hg ci -m 2
		$ A=`printf 'quick\rfox'`
		$ hg cp quickfox "$A"
		abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
		[255]
		$ hg mv quickfox "$A"
		abort: '\n' and '\r' disallowed in filenames: 'quick\rfox'
		[255]

Matt Mackall tests: unify test-eolfilename	r12425	http://mercurial.selenic.com/bts/issue2036

		$ cd ..

		test issue2039

		$ hg init bar
		$ cd bar
Yuya Nishihara tests: write hgrc of more than two lines by using shell heredoc...	r23172	$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> color =
		> [color]
		> mode = ansi
		> EOF
Matt Mackall tests: unify test-eolfilename	r12425	$ A=`printf 'foo\nbar'`
		$ B=`printf 'foo\nbar.baz'`
		$ touch "$A"
		$ touch "$B"
		$ hg status --color=always
Matt Mackall status: use condwrite to avoid zero-width format string hack	r17910	\x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;35;1;4mbar\x1b[0m (esc)
Matt Mackall status: use condwrite to avoid zero-width format string hack	r17910	\x1b[0;35;1;4m? \x1b[0m\x1b[0;35;1;4mfoo\x1b[0m (esc)
Mads Kiilerich tests: use (esc) for all non-ASCII test output	r12942	\x1b[0;35;1;4mbar.baz\x1b[0m (esc)
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..