##// END OF EJS Templates
filemerge: add internal merge tool to dump files forcibly...
filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

File last commit:

r26420:2fc86d92 default
r32255:7e35d31b default
Show More
test-eolfilename.t
78 lines | 1.5 KiB | text/troff | Tads3Lexer
/ tests / test-eolfilename.t
Matt Mackall
tests: replace exit 80 with #require
r22046 #require eol-in-paths
Matt Mackall
tests: unify test-eolfilename
r12425
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/352
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
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/2036
Matt Mackall
tests: unify test-eolfilename
r12425
$ 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 ..