##// END OF EJS Templates
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 573bec4ab7ba 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.

File last commit:

r17910:c8709ff5 default
r18006:0c10cf81 2.4.1 stable
Show More
test-eolfilename.t
76 lines | 1.5 KiB | text/troff | Tads3Lexer
/ tests / test-eolfilename.t
Matt Mackall
tests: unify test-eolfilename
r12425 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
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
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \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)
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..