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

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22285:85bded43

default

Download file

             test-eolfilename.t
        
                    76 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

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "color=" >> $HGRCPATH

        Danek Duvall
    
color: add support for terminfo-based attributes and color...

              r13987
            
        $ echo "[color]" >> $HGRCPATH

        $ echo "mode = ansi" >> $HGRCPATH

        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
		$ echo "[extensions]" >> $HGRCPATH
		$ echo "color=" >> $HGRCPATH
Danek Duvall color: add support for terminfo-based attributes and color...	r13987	$ echo "[color]" >> $HGRCPATH
		$ echo "mode = ansi" >> $HGRCPATH
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 ..