Show More
@@ -58,8 +58,8 b' bookmark = \'{label("log.bookmark",' | |||
|
58 | 58 | user = '{label("log.user", |
|
59 | 59 | "user: {author}")}\n' |
|
60 | 60 | |
|
61 |
summary = '{label( |
|
|
62 |
|
|
|
61 | summary = '{if(desc|strip, "{label('log.summary', | |
|
62 | 'summary: {desc|firstline}')}\n")}' | |
|
63 | 63 | |
|
64 | 64 | ldate = '{label("log.date", |
|
65 | 65 | "date: {date|date}")}\n' |
@@ -67,7 +67,7 b' ldate = \'{label("log.date",' | |||
|
67 | 67 | extra = '{label("ui.debug log.extra", |
|
68 | 68 | "extra: {key}={value|stringescape}")}\n' |
|
69 | 69 | |
|
70 |
description = '{label( |
|
|
71 |
|
|
|
72 |
{label( |
|
|
73 |
|
|
|
70 | description = '{if(desc|strip, "{label('ui.note log.description', | |
|
71 | 'description:')} | |
|
72 | {label('ui.note log.description', | |
|
73 | '{desc|strip}')}\n\n")}' |
@@ -101,23 +101,52 b' following below omit it properly.' | |||
|
101 | 101 | $ hg add c |
|
102 | 102 | $ hg commit -qm ' ' |
|
103 | 103 | |
|
104 | Default style is like normal output. | |
|
104 | Default style is like normal output. Phases style should be the same | |
|
105 | as default style, except for extra phase lines. | |
|
105 | 106 | |
|
106 | 107 | $ hg log > log.out |
|
107 | 108 | $ hg log --style default > style.out |
|
108 | 109 | $ cmp log.out style.out || diff -u log.out style.out |
|
110 | $ hg log -T phases > phases.out | |
|
111 | $ diff -u log.out phases.out | grep "phase:" | |
|
112 | +phase: draft | |
|
113 | +phase: draft | |
|
114 | +phase: draft | |
|
115 | +phase: draft | |
|
116 | +phase: draft | |
|
117 | +phase: draft | |
|
118 | +phase: draft | |
|
119 | +phase: draft | |
|
120 | +phase: draft | |
|
121 | +phase: draft | |
|
109 | 122 | |
|
110 | 123 | $ hg log -v > log.out |
|
111 | 124 | $ hg log -v --style default > style.out |
|
112 | 125 | $ cmp log.out style.out || diff -u log.out style.out |
|
126 | $ hg log -v -T phases > phases.out | |
|
127 | $ diff -u log.out phases.out | grep phase: | |
|
128 | +phase: draft | |
|
129 | +phase: draft | |
|
130 | +phase: draft | |
|
131 | +phase: draft | |
|
132 | +phase: draft | |
|
133 | +phase: draft | |
|
134 | +phase: draft | |
|
135 | +phase: draft | |
|
136 | +phase: draft | |
|
137 | +phase: draft | |
|
113 | 138 | |
|
114 | 139 | $ hg log -q > log.out |
|
115 | 140 | $ hg log -q --style default > style.out |
|
116 | 141 | $ cmp log.out style.out || diff -u log.out style.out |
|
142 | $ hg log -q -T phases > phases.out | |
|
143 | $ cmp log.out phases.out || diff -u log.out phases.out | |
|
117 | 144 | |
|
118 | 145 | $ hg log --debug > log.out |
|
119 | 146 | $ hg log --debug --style default > style.out |
|
120 | 147 | $ cmp log.out style.out || diff -u log.out style.out |
|
148 | $ hg log --debug -T phases > phases.out | |
|
149 | $ cmp log.out phases.out || diff -u log.out phases.out | |
|
121 | 150 | |
|
122 | 151 | Default style should also preserve color information (issue2866): |
|
123 | 152 | |
@@ -130,15 +159,46 b' Default style should also preserve color' | |||
|
130 | 159 | $ hg --color=debug log > log.out |
|
131 | 160 | $ hg --color=debug log --style default > style.out |
|
132 | 161 | $ cmp log.out style.out || diff -u log.out style.out |
|
162 | $ hg --color=debug log -T phases > phases.out | |
|
163 | $ diff -u log.out phases.out | grep phase: | |
|
164 | +[log.phase|phase: draft] | |
|
165 | +[log.phase|phase: draft] | |
|
166 | +[log.phase|phase: draft] | |
|
167 | +[log.phase|phase: draft] | |
|
168 | +[log.phase|phase: draft] | |
|
169 | +[log.phase|phase: draft] | |
|
170 | +[log.phase|phase: draft] | |
|
171 | +[log.phase|phase: draft] | |
|
172 | +[log.phase|phase: draft] | |
|
173 | +[log.phase|phase: draft] | |
|
174 | ||
|
133 | 175 | $ hg --color=debug -v log > log.out |
|
134 | 176 | $ hg --color=debug -v log --style default > style.out |
|
135 | 177 | $ cmp log.out style.out || diff -u log.out style.out |
|
178 | $ hg --color=debug -v log -T phases > phases.out | |
|
179 | $ diff -u log.out phases.out | grep phase: | |
|
180 | +[log.phase|phase: draft] | |
|
181 | +[log.phase|phase: draft] | |
|
182 | +[log.phase|phase: draft] | |
|
183 | +[log.phase|phase: draft] | |
|
184 | +[log.phase|phase: draft] | |
|
185 | +[log.phase|phase: draft] | |
|
186 | +[log.phase|phase: draft] | |
|
187 | +[log.phase|phase: draft] | |
|
188 | +[log.phase|phase: draft] | |
|
189 | +[log.phase|phase: draft] | |
|
190 | ||
|
136 | 191 | $ hg --color=debug -q log > log.out |
|
137 | 192 | $ hg --color=debug -q log --style default > style.out |
|
138 | 193 | $ cmp log.out style.out || diff -u log.out style.out |
|
194 | $ hg --color=debug -q log -T phases > phases.out | |
|
195 | $ cmp log.out phases.out || diff -u log.out phases.out | |
|
196 | ||
|
139 | 197 | $ hg --color=debug --debug log > log.out |
|
140 | 198 | $ hg --color=debug --debug log --style default > style.out |
|
141 | 199 | $ cmp log.out style.out || diff -u log.out style.out |
|
200 | $ hg --color=debug --debug log -T phases > phases.out | |
|
201 | $ cmp log.out phases.out || diff -u log.out phases.out | |
|
142 | 202 | |
|
143 | 203 | $ mv $HGRCPATH-bak $HGRCPATH |
|
144 | 204 |
General Comments 0
You need to be logged in to leave comments.
Login now