Show More
@@ -1203,6 +1203,9 b' def showmarker(ui, marker):' | |||||
1203 | ui.write(' ') |
|
1203 | ui.write(' ') | |
1204 | ui.write(hex(repl)) |
|
1204 | ui.write(hex(repl)) | |
1205 | ui.write(' %X ' % marker.flags()) |
|
1205 | ui.write(' %X ' % marker.flags()) | |
|
1206 | parents = marker.parentnodes() | |||
|
1207 | if parents is not None: | |||
|
1208 | ui.write('{%s} ' % ', '.join(hex(p) for p in parents)) | |||
1206 | ui.write('(%s) ' % util.datestr(marker.date())) |
|
1209 | ui.write('(%s) ' % util.datestr(marker.date())) | |
1207 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in |
|
1210 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in | |
1208 | sorted(marker.metadata().items()) |
|
1211 | sorted(marker.metadata().items()) |
@@ -90,7 +90,7 b' Enable obsolete' | |||||
90 | o 0:cb9a9f314b8b a |
|
90 | o 0:cb9a9f314b8b a | |
91 |
|
91 | |||
92 | $ hg debugobsolete |
|
92 | $ hg debugobsolete | |
93 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 (*) {'user': 'test'} (glob) |
|
93 | d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b} (*) {'user': 'test'} (glob) | |
94 | 177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (*) {'user': 'test'} (glob) |
|
94 | 177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (*) {'user': 'test'} (glob) | |
95 | 055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
|
95 | 055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) | |
96 | e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
|
96 | e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (*) {'user': 'test'} (glob) |
@@ -166,18 +166,18 b' set.' | |||||
166 | o 0:cd010b8cd998 A |
|
166 | o 0:cd010b8cd998 A | |
167 |
|
167 | |||
168 | $ hg debugobsolete |
|
168 | $ hg debugobsolete | |
169 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (*) {'user': 'test'} (glob) |
|
169 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
170 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
170 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
171 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (*) {'user': 'test'} (glob) |
|
171 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | |
172 |
|
172 | |||
173 |
|
173 | |||
174 | More complex case were part of the rebase set were already rebased |
|
174 | More complex case were part of the rebase set were already rebased | |
175 |
|
175 | |||
176 | $ hg rebase --rev 'desc(D)' --dest 'desc(H)' |
|
176 | $ hg rebase --rev 'desc(D)' --dest 'desc(H)' | |
177 | $ hg debugobsolete |
|
177 | $ hg debugobsolete | |
178 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (*) {'user': 'test'} (glob) |
|
178 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
179 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
179 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
180 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (*) {'user': 'test'} (glob) |
|
180 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | |
181 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) |
|
181 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) | |
182 | $ hg log -G |
|
182 | $ hg log -G | |
183 | @ 11:4596109a6a43 D |
|
183 | @ 11:4596109a6a43 D | |
@@ -200,12 +200,12 b' More complex case were part of the rebas' | |||||
200 |
|
200 | |||
201 | $ hg rebase --source 'desc(B)' --dest 'tip' |
|
201 | $ hg rebase --source 'desc(B)' --dest 'tip' | |
202 | $ hg debugobsolete |
|
202 | $ hg debugobsolete | |
203 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 (*) {'user': 'test'} (glob) |
|
203 | 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) | |
204 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) |
|
204 | 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (*) {'user': 'test'} (glob) | |
205 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 (*) {'user': 'test'} (glob) |
|
205 | 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (*) {'user': 'test'} (glob) | |
206 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) |
|
206 | 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) | |
207 | 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) |
|
207 | 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) | |
208 | 08483444fef91d6224f6655ee586a65d263ad34c 0 (*) {'user': 'test'} (glob) |
|
208 | 08483444fef91d6224f6655ee586a65d263ad34c 0 {8877864f1edb05d0e07dc4ba77b67a80a7b86672} (*) {'user': 'test'} (glob) | |
209 | 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) |
|
209 | 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) | |
210 | $ hg log --rev 'divergent()' |
|
210 | $ hg log --rev 'divergent()' | |
211 | $ hg log -G |
|
211 | $ hg log -G |
General Comments 0
You need to be logged in to leave comments.
Login now