Show More
@@ -2084,7 +2084,9 b' def debugknown(ui, repopath, *ids, **opt' | |||||
2084 | flags = repo.known([bin(s) for s in ids]) |
|
2084 | flags = repo.known([bin(s) for s in ids]) | |
2085 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) |
|
2085 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) | |
2086 |
|
2086 | |||
2087 |
@command('debugobsolete', |
|
2087 | @command('debugobsolete', | |
|
2088 | [('', 'flags', 0, _('markers flag')), | |||
|
2089 | ] + commitopts2, | |||
2088 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) |
|
2090 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) | |
2089 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): |
|
2091 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): | |
2090 | """create arbitrary obsolete marker""" |
|
2092 | """create arbitrary obsolete marker""" | |
@@ -2111,8 +2113,8 b' def debugobsolete(ui, repo, precursor=No' | |||||
2111 | try: |
|
2113 | try: | |
2112 | tr = repo.transaction('debugobsolete') |
|
2114 | tr = repo.transaction('debugobsolete') | |
2113 | try: |
|
2115 | try: | |
2114 |
repo.obsstore.create(tr, parsenodeid(precursor), succs, |
|
2116 | repo.obsstore.create(tr, parsenodeid(precursor), succs, | |
2115 | metadata) |
|
2117 | opts['flags'], metadata) | |
2116 | tr.close() |
|
2118 | tr.close() | |
2117 | finally: |
|
2119 | finally: | |
2118 | tr.release() |
|
2120 | tr.release() |
@@ -237,7 +237,7 b' Show all commands + options' | |||||
237 | debugindexdot: |
|
237 | debugindexdot: | |
238 | debuginstall: |
|
238 | debuginstall: | |
239 | debugknown: |
|
239 | debugknown: | |
240 | debugobsolete: date, user |
|
240 | debugobsolete: flags, date, user | |
241 | debugpushkey: |
|
241 | debugpushkey: | |
242 | debugpvec: |
|
242 | debugpvec: | |
243 | debugrebuildstate: rev |
|
243 | debugrebuildstate: rev |
@@ -69,11 +69,11 b' Killing a single changeset with replacem' | |||||
69 | $ mkcommit new_c |
|
69 | $ mkcommit new_c | |
70 | created new head |
|
70 | created new head | |
71 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
71 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
72 | $ hg debugobsolete `getid original_c` `getid new_c` -d '56 12' |
|
72 | $ hg debugobsolete --flag 12 `getid original_c` `getid new_c` -d '56 12' | |
73 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
73 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
74 | 2:245bde4270cd add original_c |
|
74 | 2:245bde4270cd add original_c | |
75 | $ hg debugobsolete |
|
75 | $ hg debugobsolete | |
76 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
76 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
77 |
|
77 | |||
78 | do it again (it read the obsstore before adding new changeset) |
|
78 | do it again (it read the obsstore before adding new changeset) | |
79 |
|
79 | |||
@@ -83,7 +83,7 b' do it again (it read the obsstore before' | |||||
83 | created new head |
|
83 | created new head | |
84 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
|
84 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | |
85 | $ hg debugobsolete |
|
85 | $ hg debugobsolete | |
86 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
86 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
87 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
87 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
88 |
|
88 | |||
89 | Register two markers with a missing node |
|
89 | Register two markers with a missing node | |
@@ -95,7 +95,7 b' Register two markers with a missing node' | |||||
95 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
|
95 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | |
96 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
|
96 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | |
97 | $ hg debugobsolete |
|
97 | $ hg debugobsolete | |
98 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
98 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
99 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
99 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
100 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
100 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
101 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
101 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
@@ -193,7 +193,7 b' Try to pull markers' | |||||
193 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
193 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
194 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
194 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
195 | $ hg debugobsolete |
|
195 | $ hg debugobsolete | |
196 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
196 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
197 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
197 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
198 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
198 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
199 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
199 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
@@ -202,7 +202,7 b' Rollback//Transaction support' | |||||
202 |
|
202 | |||
203 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
203 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
204 | $ hg debugobsolete |
|
204 | $ hg debugobsolete | |
205 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
205 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
206 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
206 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
207 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
207 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
208 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
208 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
@@ -212,7 +212,7 b' Rollback//Transaction support' | |||||
212 | $ hg rollback |
|
212 | $ hg rollback | |
213 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
213 | repository tip rolled back to revision 3 (undo debugobsolete) | |
214 | $ hg debugobsolete |
|
214 | $ hg debugobsolete | |
215 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
215 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
216 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
216 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
217 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
217 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
218 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
218 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
@@ -230,7 +230,7 b' Try to pull markers' | |||||
230 | adding file changes |
|
230 | adding file changes | |
231 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
231 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
232 | $ hg -R tmpd debugobsolete |
|
232 | $ hg -R tmpd debugobsolete | |
233 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
233 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
234 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
234 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
235 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
235 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
236 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
236 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
@@ -287,7 +287,7 b' clone support' | |||||
287 | summary: add a |
|
287 | summary: add a | |
288 |
|
288 | |||
289 | $ hg -R clone-dest debugobsolete |
|
289 | $ hg -R clone-dest debugobsolete | |
290 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
290 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
291 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
291 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
292 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
292 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
293 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
293 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
@@ -311,7 +311,7 b' On pull' | |||||
311 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
311 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
312 | $ hg debugobsolete |
|
312 | $ hg debugobsolete | |
313 | 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'} |
|
313 | 2448244824482448244824482448244824482448 1339133913391339133913391339133913391339 0 {'date': '1339 0', 'user': 'test'} | |
314 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
314 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
315 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
315 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
316 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
316 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
317 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
317 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} | |
@@ -325,7 +325,7 b' On push' | |||||
325 | no changes found |
|
325 | no changes found | |
326 | [1] |
|
326 | [1] | |
327 | $ hg -R ../tmpc debugobsolete |
|
327 | $ hg -R ../tmpc debugobsolete | |
328 |
245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f |
|
328 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C {'date': '56 12', 'user': 'test'} | |
329 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} |
|
329 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 {'date': '1337 0', 'user': 'test'} | |
330 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} |
|
330 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 {'date': '1338 0', 'user': 'test'} | |
331 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
|
331 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 {'date': '1339 0', 'user': 'test'} |
General Comments 0
You need to be logged in to leave comments.
Login now