| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Thu, 15 Apr 2010 15:35:06 +0200 | |
| changeset 10919 | 435615a676b0 |
| parent 10223 | 51421ab573de |
| permissions | -rw-r--r-- |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 |
hg status in repo root: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
2 |
[0;35;1;4m? a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
3 |
[0;35;1;4m? a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
4 |
[0;35;1;4m? b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
5 |
[0;35;1;4m? b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
6 |
[0;35;1;4m? b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
7 |
[0;35;1;4m? in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
8 |
hg status . in repo root: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
9 |
[0;35;1;4m? a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
10 |
[0;35;1;4m? a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
11 |
[0;35;1;4m? b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
12 |
[0;35;1;4m? b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
13 |
[0;35;1;4m? b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
14 |
[0;35;1;4m? in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
15 |
hg status in a: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
16 |
[0;35;1;4m? a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
17 |
[0;35;1;4m? a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
18 |
[0;35;1;4m? b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
19 |
[0;35;1;4m? b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
20 |
[0;35;1;4m? b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
21 |
[0;35;1;4m? in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
22 |
hg status . in a: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
23 |
[0;35;1;4m? 1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
24 |
[0;35;1;4m? in_a[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
25 |
hg status .. in a: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
26 |
[0;35;1;4m? 1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
27 |
[0;35;1;4m? in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
28 |
[0;35;1;4m? ../b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
29 |
[0;35;1;4m? ../b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
30 |
[0;35;1;4m? ../b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
31 |
[0;35;1;4m? ../in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
32 |
hg status in b: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
33 |
[0;35;1;4m? a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
34 |
[0;35;1;4m? a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
35 |
[0;35;1;4m? b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
36 |
[0;35;1;4m? b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
37 |
[0;35;1;4m? b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
38 |
[0;35;1;4m? in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
39 |
hg status . in b: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
40 |
[0;35;1;4m? 1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
41 |
[0;35;1;4m? 2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
42 |
[0;35;1;4m? in_b[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
43 |
hg status .. in b: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
44 |
[0;35;1;4m? ../a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
45 |
[0;35;1;4m? ../a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
46 |
[0;35;1;4m? 1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
47 |
[0;35;1;4m? 2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
48 |
[0;35;1;4m? in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
49 |
[0;35;1;4m? ../in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
50 |
hg status in a/1: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
51 |
[0;35;1;4m? a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
52 |
[0;35;1;4m? a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
53 |
[0;35;1;4m? b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
54 |
[0;35;1;4m? b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
55 |
[0;35;1;4m? b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
56 |
[0;35;1;4m? in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
57 |
hg status . in a/1: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
58 |
[0;35;1;4m? in_a_1[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
59 |
hg status .. in a/1: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
60 |
[0;35;1;4m? in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
61 |
[0;35;1;4m? ../in_a[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
62 |
hg status in b/1: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
63 |
[0;35;1;4m? a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
64 |
[0;35;1;4m? a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
65 |
[0;35;1;4m? b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
66 |
[0;35;1;4m? b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
67 |
[0;35;1;4m? b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
68 |
[0;35;1;4m? in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
69 |
hg status . in b/1: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
70 |
[0;35;1;4m? in_b_1[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
71 |
hg status .. in b/1: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
72 |
[0;35;1;4m? in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
73 |
[0;35;1;4m? ../2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
74 |
[0;35;1;4m? ../in_b[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
75 |
hg status in b/2: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
76 |
[0;35;1;4m? a/1/in_a_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
77 |
[0;35;1;4m? a/in_a[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
78 |
[0;35;1;4m? b/1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
79 |
[0;35;1;4m? b/2/in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
80 |
[0;35;1;4m? b/in_b[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
81 |
[0;35;1;4m? in_root[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
82 |
hg status . in b/2: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
83 |
[0;35;1;4m? in_b_2[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
84 |
hg status .. in b/2: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
85 |
[0;35;1;4m? ../1/in_b_1[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
86 |
[0;35;1;4m? in_b_2[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
87 |
[0;35;1;4m? ../in_b[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
88 |
adding .hgignore |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
89 |
adding deleted |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
90 |
adding modified |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
91 |
adding removed |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
92 |
hg status: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
93 |
[0;32;1mA added[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
94 |
[0;31;1mR removed[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
95 |
[0;36;1;4m! deleted[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
96 |
[0;35;1;4m? unknown[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
97 |
hg status modified added removed deleted unknown never-existed ignored: |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
98 |
never-existed: No such file or directory |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
99 |
[0;32;1mA added[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
100 |
[0;31;1mR removed[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
101 |
[0;36;1;4m! deleted[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
102 |
[0;35;1;4m? unknown[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
103 |
hg status -C: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
104 |
[0;32;1mA added[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
105 |
[0;32;1mA copied[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
106 |
[0;0m modified[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
107 |
[0;31;1mR removed[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
108 |
[0;36;1;4m! deleted[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
109 |
[0;35;1;4m? unknown[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
110 |
hg status -A: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
111 |
[0;32;1mA added[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
112 |
[0;32;1mA copied[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
113 |
[0;0m modified[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
114 |
[0;31;1mR removed[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
115 |
[0;36;1;4m! deleted[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
116 |
[0;35;1;4m? unknown[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
117 |
[0;30;1mI ignored[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
118 |
[0;0mC .hgignore[0m |
|
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
119 |
[0;0mC modified[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
120 |
hg status ignoreddir/file: |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
121 |
hg status -i ignoreddir/file: |
|
7459
3fb5c142a9f0
color: replace effect-specific reset control codes with general purpose one
Brodie Rao <me+hg@dackz.net>
parents:
7458
diff
changeset
|
122 |
[0;30;1mI ignoreddir/file[0m |
|
7458
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
123 |
adding .hgignore |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
124 |
adding deleted |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
125 |
adding modified |
|
03dd55115985
color: Add tests for colorized diff and status output.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
126 |
adding removed |
|
8945
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
127 |
% test unknown color |
|
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
128 |
ignoring unknown color/effect 'periwinkle' (configured in color.status.modified) |
|
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
129 |
M modified |
|
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
130 |
[0;32;1mA added[0m |
|
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
131 |
[0;32;1mA copied[0m |
|
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
132 |
[0;31;1mR removed[0m |
|
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
133 |
[0;36;1;4m! deleted[0m |
|
7b3d837ca60e
color: don't blow up if configured with unknown color (just warn).
Greg Ward <greg-hg@gerg.ca>
parents:
7459
diff
changeset
|
134 |
[0;35;1;4m? unknown[0m |
|
10223
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
135 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
136 |
created new head |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
137 |
merging a |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
138 |
warning: conflicts during merge. |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
139 |
merging a failed! |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
140 |
merging b |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
141 |
warning: conflicts during merge. |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
142 |
merging b failed! |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
143 |
0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
144 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
145 |
hg resolve with one unresolved, one resolved: |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
146 |
[0;31;1mU a[0m |
|
51421ab573de
color: colorize output of hg resolve -l
Georg Brandl <georg@python.org>
parents:
8945
diff
changeset
|
147 |
[0;32;1mR b[0m |