hg-stable: tests/test-diff-color.t@6b7e60fb0b38 (annotated)

12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	1	Setup
7458 03dd55115985 color: Add tests for colorized diff and status output. Augie Fackler <durin42@gmail.com> parents: diff changeset	2
23172 e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	3	$ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	4	> [color]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	5	> mode = ansi
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	6	> [extensions]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	7	> color =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	8	> EOF
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	9	$ hg init repo
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	10	$ cd repo
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	11	$ cat > a <<EOF
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	12	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	13	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	14	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	15	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	16	> b
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	17	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	18	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	19	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	20	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	21	> EOF
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	22	$ hg ci -Am adda
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	23	adding a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	24	$ cat > a <<EOF
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	25	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	26	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	27	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	28	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	29	> dd
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	30	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	31	> a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	32	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	33	> c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	34	> EOF
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	35
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	36	default context
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	37
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	38	$ hg diff --nodates --color=always
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	39	\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	40	\x1b[0;31;1m--- a/a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	41	\x1b[0;32;1m+++ b/a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	42	\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	43	c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	44	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	45	a
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	46	\x1b[0;31m-b\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	47	\x1b[0;32m+dd\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	48	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	49	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	50	c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	51
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	52	--unified=2
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	53
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	54	$ hg diff --nodates -U 2 --color=always
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	55	\x1b[0;1mdiff -r cf9f4ba66af2 a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	56	\x1b[0;31;1m--- a/a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	57	\x1b[0;32;1m+++ b/a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	58	\x1b[0;35m@@ -3,5 +3,5 @@\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	59	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	60	a
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	61	\x1b[0;31m-b\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	62	\x1b[0;32m+dd\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	63	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	64	a
7458 03dd55115985 color: Add tests for colorized diff and status output. Augie Fackler <durin42@gmail.com> parents: diff changeset	65
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	66	diffstat
9579 c06e7581bbaa color: add test for record support Brodie Rao <me+hg@dackz.net> parents: 7458 diff changeset	67
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	68	$ hg diff --stat --color=always
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	69	a \| 2 \x1b[0;32m+\x1b[0m\x1b[0;31m-\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	70	1 files changed, 1 insertions(+), 1 deletions(-)
23172 e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	71	$ cat <<EOF >> $HGRCPATH
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	72	> record =
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	73	> [ui]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	74	> interactive = true
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	75	> [diff]
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	76	> git = True
e955549cd045 tests: write hgrc of more than two lines by using shell heredoc Yuya Nishihara <yuya@tcha.org> parents: 22589 diff changeset	77	> EOF
9641 9b99f158348a color: colorize diff --stat Brodie Rao <me+hg@dackz.net> parents: 9579 diff changeset	78
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16324 diff changeset	79	#if execbit
8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16324 diff changeset	80
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	81	record
9579 c06e7581bbaa color: add test for record support Brodie Rao <me+hg@dackz.net> parents: 7458 diff changeset	82
15442 db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system Mads Kiilerich <mads@kiilerich.com> parents: 15243 diff changeset	83	$ chmod +x a
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	84	$ hg record --color=always -m moda a <<EOF
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	85	> y
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	86	> y
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	87	> EOF
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	88	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	89	\x1b[0;36;1mold mode 100644\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	90	\x1b[0;36;1mnew mode 100755\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	91	1 hunks, 1 lines changed
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	92	\x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	93
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	94	\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	95	c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	96	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	97	a
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	98	\x1b[0;31m-b\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	99	\x1b[0;32m+dd\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	100	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	101	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	102	c
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	103	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	104
15243 1e9451476bf8 tests: cleanup of echo statements left over from test conversion Mads Kiilerich <mads@kiilerich.com> parents: 13987 diff changeset	105
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	106	$ echo "[extensions]" >> $HGRCPATH
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	107	$ echo "mq=" >> $HGRCPATH
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	108	$ hg rollback
13446 1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12942 diff changeset	109	repository tip rolled back to revision 0 (undo commit)
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 12942 diff changeset	110	working directory now based on revision 0
9711 d29bd00bbc50 color: wrap qrecord Martin Geisler <mg@lazybytes.net> parents: 9641 diff changeset	111
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	112	qrecord
9711 d29bd00bbc50 color: wrap qrecord Martin Geisler <mg@lazybytes.net> parents: 9641 diff changeset	113
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	114	$ hg qrecord --color=always -m moda patch <<EOF
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	115	> y
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	116	> y
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	117	> EOF
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	118	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	119	\x1b[0;36;1mold mode 100644\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	120	\x1b[0;36;1mnew mode 100755\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	121	1 hunks, 1 lines changed
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	122	\x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	123
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	124	\x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	125	c
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	126	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	127	a
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	128	\x1b[0;31m-b\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12415 diff changeset	129	\x1b[0;32m+dd\x1b[0m (esc)
12415 1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	130	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	131	a
1ff3fc4b6a66 tests: unify test-diff-color Matt Mackall <mpm@selenic.com> parents: 9711 diff changeset	132	c
22589 9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	133	\x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m y (esc)
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive Mads Kiilerich <madski@unity3d.com> parents: 22460 diff changeset	134
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16324 diff changeset	135
18006 0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	136	$ hg qpop -a
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	137	popping patch
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	138	patch queue now empty
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	139
16899 8149ff405c78 tests: convert some 'hghave execbit' to #if Mads Kiilerich <mads@kiilerich.com> parents: 16324 diff changeset	140	#endif
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16899 diff changeset	141
18006 0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	142	issue3712: test colorization of subrepo diff
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	143
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	144	$ hg init sub
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	145	$ echo b > sub/b
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	146	$ hg -R sub commit -Am 'create sub'
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	147	adding b
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	148	$ echo 'sub = sub' > .hgsub
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	149	$ hg add .hgsub
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	150	$ hg commit -m 'add subrepo sub'
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	151	$ echo aa >> a
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	152	$ echo bb >> sub/b
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	153
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	154	$ hg diff --color=always -S
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	155	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	156	\x1b[0;31;1m--- a/a\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	157	\x1b[0;32;1m+++ b/a\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	158	\x1b[0;35m@@ -7,3 +7,4 @@\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	159	a
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	160	c
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	161	c
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	162	\x1b[0;32m+aa\x1b[0m (esc)
18720 0ade08dcb3c3 tests: remove glob lines which unnecessary match / for \ on windows Simon Heimberg <simohe@besonet.ch> parents: 18157 diff changeset	163	\x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc)
18006 0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	164	\x1b[0;31;1m--- a/sub/b\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	165	\x1b[0;32;1m+++ b/sub/b\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	166	\x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	167	b
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	168	\x1b[0;32m+bb\x1b[0m (esc)
0c10cf819146 subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16913 diff changeset	169
22460 c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	170	test tabs
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	171
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	172	$ cat >> a <<EOF
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	173	> one tab
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	174	> two tabs
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	175	> end tab
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	176	> mid tab
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	177	> all tabs
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	178	> EOF
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	179	$ hg diff --nodates --color=always
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	180	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	181	\x1b[0;31;1m--- a/a\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	182	\x1b[0;32;1m+++ b/a\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	183	\x1b[0;35m@@ -7,3 +7,9 @@\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	184	a
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	185	c
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	186	c
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	187	\x1b[0;32m+aa\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	188	\x1b[0;32m+\x1b[0m \x1b[0;32mone tab\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	189	\x1b[0;32m+\x1b[0m \x1b[0;32mtwo tabs\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	190	\x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m \x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	191	\x1b[0;32m+mid\x1b[0m \x1b[0;32mtab\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	192	\x1b[0;32m+\x1b[0m \x1b[0;32mall\x1b[0m \x1b[0;32mtabs\x1b[0m\x1b[0;1;41m \x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	193	$ echo "[color]" >> $HGRCPATH
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	194	$ echo "diff.tab = bold magenta" >> $HGRCPATH
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	195	$ hg diff --nodates --color=always
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	196	\x1b[0;1mdiff --git a/a b/a\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	197	\x1b[0;31;1m--- a/a\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	198	\x1b[0;32;1m+++ b/a\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	199	\x1b[0;35m@@ -7,3 +7,9 @@\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	200	a
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	201	c
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	202	c
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	203	\x1b[0;32m+aa\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	204	\x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mone tab\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	205	\x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtwo tabs\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	206	\x1b[0;32m+end tab\x1b[0m\x1b[0;1;41m \x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	207	\x1b[0;32m+mid\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtab\x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	208	\x1b[0;32m+\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mall\x1b[0m\x1b[0;1;35m \x1b[0m\x1b[0;32mtabs\x1b[0m\x1b[0;1;41m \x1b[0m (esc)
c343557a8442 patch: enable diff.tab markup for the color extension Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 18720 diff changeset	209
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16899 diff changeset	210	$ cd ..

author	Pierre-Yves David <pierre-yves.david@fb.com>
	Tue, 28 Oct 2014 14:58:36 +0100
changeset 23222	6b7e60fb0b38
parent 23172	e955549cd045
child 27411	c84a07530040
permissions	-rw-r--r--