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

subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...

subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) Color extension achieves colorization by overriding the class of "ui" object just before command execution. Before this patch, "diff()" of abstractsubrepo and classes derived from it has no "ui" argument, so "diff()" of hgsubrepo uses "self._repo.ui" to invoke "cmdutil.diffordiffstat()". For separation of configuration between repositories, revision changed the initialization source of "self._repo.ui" from "ui"(overridden) to "baseui"(plain) of parent repository. And this caused break of colorization. This patch adds "ui" argument to "diff()" of abstractsubrepo and classes derived from it to pass "ui" object of caller side.

Matt Mackall - - Load All Authors

File last commit:

r17910:c8709ff5 default


                r18006:0c10cf81

2.4.1 stable

Download file

             test-eolfilename.t
        
                    76 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eolfilename.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

        $ "$TESTDIR/hghave" eol-in-paths || exit 80

      test issue352

        $ hg init foo

        $ cd foo

        $ A=`printf 'he\rllo'`

        $ echo foo > "$A"

        $ hg add

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

        llo

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

        [255]

        $ hg ci -A -m m

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

        llo

        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

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

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

        llo

        f  hell

        o  hell

        o

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

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

        $ cd ..

      test issue2039

        $ hg init bar

        $ cd bar

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "color=" >> $HGRCPATH

        $ echo "[color]" >> $HGRCPATH

        $ echo "mode = ansi" >> $HGRCPATH

        $ A=`printf 'foo\nbar'`

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

        $ touch "$A"

        $ touch "$B"

        $ hg status --color=always

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

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

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

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

        $ 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

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

				$ "$TESTDIR/hghave" eol-in-paths \|\| exit 80

				test issue352

				$ hg init foo
				$ cd foo
				$ A=`printf 'he\rllo'`
				$ echo foo > "$A"
				$ hg add
				adding he\r (no-eol) (esc)
				llo
				abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
				[255]
				$ hg ci -A -m m
				adding he\r (no-eol) (esc)
				llo
				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
				f he\r (no-eol) (esc)
				llo he\r (no-eol) (esc)
				llo
				f hell
				o hell
				o

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

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

				$ cd ..

				test issue2039

				$ hg init bar
				$ cd bar
				$ echo "[extensions]" >> $HGRCPATH
				$ echo "color=" >> $HGRCPATH
				$ echo "[color]" >> $HGRCPATH
				$ echo "mode = ansi" >> $HGRCPATH
				$ A=`printf 'foo\nbar'`
				$ B=`printf 'foo\nbar.baz'`
				$ touch "$A"
				$ touch "$B"
				$ hg status --color=always
				\x1b[0;35;1;4m? foo\x1b[0m (esc)
				\x1b[0;35;1;4mbar\x1b[0m (esc)
				\x1b[0;35;1;4m? foo\x1b[0m (esc)
				\x1b[0;35;1;4mbar.baz\x1b[0m (esc)

				$ cd ..