Show More
@@ -672,6 +672,9 b' class changeset_printer(object):' | |||||
672 | for tag in self.repo.nodetags(changenode): |
|
672 | for tag in self.repo.nodetags(changenode): | |
673 | self.ui.write(_("tag: %s\n") % tag, |
|
673 | self.ui.write(_("tag: %s\n") % tag, | |
674 | label='log.tag') |
|
674 | label='log.tag') | |
|
675 | if self.ui.debugflag and ctx.phase(): | |||
|
676 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), | |||
|
677 | label='log.phase') | |||
675 | for parent in parents: |
|
678 | for parent in parents: | |
676 | self.ui.write(_("parent: %d:%s\n") % parent, |
|
679 | self.ui.write(_("parent: %d:%s\n") % parent, | |
677 | label='log.parent') |
|
680 | label='log.parent') |
@@ -1,7 +1,7 b'' | |||||
1 | changeset = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' |
|
1 | changeset = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' | |
2 | changeset_quiet = '{rev}:{node|short}\n' |
|
2 | changeset_quiet = '{rev}:{node|short}\n' | |
3 | changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n' |
|
3 | changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n' | |
4 | changeset_debug = 'changeset: {rev}:{node}\n{branches}{bookmarks}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n' |
|
4 | changeset_debug = 'changeset: {rev}:{node}\n{branches}{bookmarks}{tags}phase: {phase}\n{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n' | |
5 | start_files = 'files: ' |
|
5 | start_files = 'files: ' | |
6 | file = ' {file}' |
|
6 | file = ' {file}' | |
7 | end_files = '\n' |
|
7 | end_files = '\n' |
@@ -72,6 +72,7 b' Look for extra:source' | |||||
72 | $ hg log --debug -r tip |
|
72 | $ hg log --debug -r tip | |
73 | changeset: 7:d2e44c99fd3f31c176ea4efb9eca9f6306c81756 |
|
73 | changeset: 7:d2e44c99fd3f31c176ea4efb9eca9f6306c81756 | |
74 | tag: tip |
|
74 | tag: tip | |
|
75 | phase: draft | |||
75 | parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e |
|
76 | parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e | |
76 | parent: -1:0000000000000000000000000000000000000000 |
|
77 | parent: -1:0000000000000000000000000000000000000000 | |
77 | manifest: 7:5d59766436fd8fbcd38e7bebef0f6eaf3eebe637 |
|
78 | manifest: 7:5d59766436fd8fbcd38e7bebef0f6eaf3eebe637 | |
@@ -222,6 +223,7 b' Graft again onto another branch should p' | |||||
222 | $ hg log --debug -r tip |
|
223 | $ hg log --debug -r tip | |
223 | changeset: 13:39bb1d13572759bd1e6fc874fed1b12ece047a18 |
|
224 | changeset: 13:39bb1d13572759bd1e6fc874fed1b12ece047a18 | |
224 | tag: tip |
|
225 | tag: tip | |
|
226 | phase: draft | |||
225 | parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f |
|
227 | parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f | |
226 | parent: -1:0000000000000000000000000000000000000000 |
|
228 | parent: -1:0000000000000000000000000000000000000000 | |
227 | manifest: 13:0780e055d8f4cd12eadd5a2719481648f336f7a9 |
|
229 | manifest: 13:0780e055d8f4cd12eadd5a2719481648f336f7a9 |
@@ -130,6 +130,7 b' Test for invalid branch cache:' | |||||
130 | changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 |
|
130 | changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 | |
131 | branch: foo |
|
131 | branch: foo | |
132 | tag: tip |
|
132 | tag: tip | |
|
133 | phase: draft | |||
133 | parent: 1:6c0e42da283a56b5edc5b4fadb491365ec7f5fa8 |
|
134 | parent: 1:6c0e42da283a56b5edc5b4fadb491365ec7f5fa8 | |
134 | parent: -1:0000000000000000000000000000000000000000 |
|
135 | parent: -1:0000000000000000000000000000000000000000 | |
135 | manifest: 1:8c342a37dfba0b3d3ce073562a00d8a813c54ffe |
|
136 | manifest: 1:8c342a37dfba0b3d3ce073562a00d8a813c54ffe |
@@ -190,6 +190,113 b' Test revset' | |||||
190 | 5 2 H |
|
190 | 5 2 H | |
191 | 7 2 merge B' and E |
|
191 | 7 2 merge B' and E | |
192 |
|
192 | |||
|
193 | test that phase are displayed in log at debug level | |||
|
194 | ||||
|
195 | $ hg log --debug | |||
|
196 | changeset: 7:17a481b3bccb796c0521ae97903d81c52bfee4af | |||
|
197 | tag: tip | |||
|
198 | phase: secret | |||
|
199 | parent: 6:cf9fe039dfd67e829edf6522a45de057b5c86519 | |||
|
200 | parent: 4:a603bfb5a83e312131cebcd05353c217d4d21dde | |||
|
201 | manifest: 7:5e724ffacba267b2ab726c91fc8b650710deaaa8 | |||
|
202 | user: test | |||
|
203 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
204 | files+: C D E | |||
|
205 | extra: branch=default | |||
|
206 | description: | |||
|
207 | merge B' and E | |||
|
208 | ||||
|
209 | ||||
|
210 | changeset: 6:cf9fe039dfd67e829edf6522a45de057b5c86519 | |||
|
211 | phase: draft | |||
|
212 | parent: 1:27547f69f25460a52fff66ad004e58da7ad3fb56 | |||
|
213 | parent: -1:0000000000000000000000000000000000000000 | |||
|
214 | manifest: 6:ab8bfef2392903058bf4ebb9e7746e8d7026b27a | |||
|
215 | user: test | |||
|
216 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
217 | files+: B' | |||
|
218 | extra: branch=default | |||
|
219 | description: | |||
|
220 | B' | |||
|
221 | ||||
|
222 | ||||
|
223 | changeset: 5:a030c6be5127abc010fcbff1851536552e6951a8 | |||
|
224 | phase: secret | |||
|
225 | parent: 4:a603bfb5a83e312131cebcd05353c217d4d21dde | |||
|
226 | parent: -1:0000000000000000000000000000000000000000 | |||
|
227 | manifest: 5:5c710aa854874fe3d5fa7192e77bdb314cc08b5a | |||
|
228 | user: test | |||
|
229 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
230 | files+: H | |||
|
231 | extra: branch=default | |||
|
232 | description: | |||
|
233 | H | |||
|
234 | ||||
|
235 | ||||
|
236 | changeset: 4:a603bfb5a83e312131cebcd05353c217d4d21dde | |||
|
237 | phase: secret | |||
|
238 | parent: 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e | |||
|
239 | parent: -1:0000000000000000000000000000000000000000 | |||
|
240 | manifest: 4:7173fd1c27119750b959e3a0f47ed78abe75d6dc | |||
|
241 | user: test | |||
|
242 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
243 | files+: E | |||
|
244 | extra: branch=default | |||
|
245 | description: | |||
|
246 | E | |||
|
247 | ||||
|
248 | ||||
|
249 | changeset: 3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e | |||
|
250 | phase: draft | |||
|
251 | parent: 2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757 | |||
|
252 | parent: -1:0000000000000000000000000000000000000000 | |||
|
253 | manifest: 3:6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c | |||
|
254 | user: test | |||
|
255 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
256 | files+: D | |||
|
257 | extra: branch=default | |||
|
258 | description: | |||
|
259 | D | |||
|
260 | ||||
|
261 | ||||
|
262 | changeset: 2:f838bfaca5c7226600ebcfd84f3c3c13a28d3757 | |||
|
263 | phase: draft | |||
|
264 | parent: 1:27547f69f25460a52fff66ad004e58da7ad3fb56 | |||
|
265 | parent: -1:0000000000000000000000000000000000000000 | |||
|
266 | manifest: 2:66a5a01817fdf5239c273802b5b7618d051c89e4 | |||
|
267 | user: test | |||
|
268 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
269 | files+: C | |||
|
270 | extra: branch=default | |||
|
271 | description: | |||
|
272 | C | |||
|
273 | ||||
|
274 | ||||
|
275 | changeset: 1:27547f69f25460a52fff66ad004e58da7ad3fb56 | |||
|
276 | parent: 0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256 | |||
|
277 | parent: -1:0000000000000000000000000000000000000000 | |||
|
278 | manifest: 1:cb5cbbc1bfbf24cc34b9e8c16914e9caa2d2a7fd | |||
|
279 | user: test | |||
|
280 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
281 | files+: B | |||
|
282 | extra: branch=default | |||
|
283 | description: | |||
|
284 | B | |||
|
285 | ||||
|
286 | ||||
|
287 | changeset: 0:4a2df7238c3b48766b5e22fafbb8a2f506ec8256 | |||
|
288 | parent: -1:0000000000000000000000000000000000000000 | |||
|
289 | parent: -1:0000000000000000000000000000000000000000 | |||
|
290 | manifest: 0:007d8c9d88841325f5c6b06371b35b4e8a2b1a83 | |||
|
291 | user: test | |||
|
292 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
293 | files+: A | |||
|
294 | extra: branch=default | |||
|
295 | description: | |||
|
296 | A | |||
|
297 | ||||
|
298 | ||||
|
299 | ||||
193 | Test phase command |
|
300 | Test phase command | |
194 | =================== |
|
301 | =================== | |
195 |
|
302 |
General Comments 0
You need to be logged in to leave comments.
Login now