##// END OF EJS Templates
visibility: improve the message when accessing filtered obsolete rev...
Boris Feld -
r35612:265cd9e1 default
parent child Browse files
Show More
This diff has been collapsed as it changes many lines, (551 lines changed) Show them Hide them
@@ -0,0 +1,551 b''
1 This test file test the various messages when accessing obsolete
2 revisions.
3
4 Global setup
5 ============
6
7 $ . $TESTDIR/testlib/obsmarker-common.sh
8 $ cat >> $HGRCPATH <<EOF
9 > [ui]
10 > interactive = true
11 > [phases]
12 > publish=False
13 > [experimental]
14 > evolution.createmarkers = yes
15 > evolution.effect-flags = yes
16 > EOF
17
18 Test output on amended commit
19 =============================
20
21 Test setup
22 ----------
23
24 $ hg init $TESTTMP/local-amend
25 $ cd $TESTTMP/local-amend
26 $ mkcommit ROOT
27 $ mkcommit A0
28 $ echo 42 >> A0
29 $ hg commit --amend -m "A1
30 >
31 > Better commit message"
32 $ hg log --hidden -G
33 @ changeset: 2:4ae3a4151de9
34 | tag: tip
35 | parent: 0:ea207398892e
36 | user: test
37 | date: Thu Jan 01 00:00:00 1970 +0000
38 | summary: A1
39 |
40 | x changeset: 1:471f378eab4c
41 |/ user: test
42 | date: Thu Jan 01 00:00:00 1970 +0000
43 | obsolete: rewritten using amend as 2:4ae3a4151de9
44 | summary: A0
45 |
46 o changeset: 0:ea207398892e
47 user: test
48 date: Thu Jan 01 00:00:00 1970 +0000
49 summary: ROOT
50
51 Actual test
52 -----------
53 $ hg update 471f378eab4c
54 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
55 (use --hidden to access hidden revisions)
56 [255]
57 $ hg update --hidden "desc(A0)"
58 updating to a hidden changeset 471f378eab4c
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
60
61 Test output with pruned commit
62 ==============================
63
64 Test setup
65 ----------
66
67 $ hg init $TESTTMP/local-prune
68 $ cd $TESTTMP/local-prune
69 $ mkcommit ROOT
70 $ mkcommit A0 # 0
71 $ mkcommit B0 # 1
72 $ hg log --hidden -G
73 @ changeset: 2:0dec01379d3b
74 | tag: tip
75 | user: test
76 | date: Thu Jan 01 00:00:00 1970 +0000
77 | summary: B0
78 |
79 o changeset: 1:471f378eab4c
80 | user: test
81 | date: Thu Jan 01 00:00:00 1970 +0000
82 | summary: A0
83 |
84 o changeset: 0:ea207398892e
85 user: test
86 date: Thu Jan 01 00:00:00 1970 +0000
87 summary: ROOT
88
89 $ hg debugobsolete --record-parents `getid 'desc(B0)'`
90 obsoleted 1 changesets
91
92 $ hg log --hidden -G
93 @ changeset: 2:0dec01379d3b
94 | tag: tip
95 | user: test
96 | date: Thu Jan 01 00:00:00 1970 +0000
97 | obsolete: pruned
98 | summary: B0
99 |
100 o changeset: 1:471f378eab4c
101 | user: test
102 | date: Thu Jan 01 00:00:00 1970 +0000
103 | summary: A0
104 |
105 o changeset: 0:ea207398892e
106 user: test
107 date: Thu Jan 01 00:00:00 1970 +0000
108 summary: ROOT
109
110
111 Actual test
112 -----------
113 $ hg up 1
114 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
115 $ hg up 0dec01379d3b
116 abort: hidden revision '0dec01379d3b' is pruned!
117 (use --hidden to access hidden revisions)
118 [255]
119 $ hg up --hidden -r 'desc(B0)'
120 updating to a hidden changeset 0dec01379d3b
121 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
122
123 Test output with splitted commit
124 ================================
125
126 Test setup
127 ----------
128
129 $ hg init $TESTTMP/local-split
130 $ cd $TESTTMP/local-split
131 $ mkcommit ROOT
132 $ echo 42 >> a
133 $ echo 43 >> b
134 $ hg commit -A -m "A0"
135 adding a
136 adding b
137 $ hg log --hidden -G
138 @ changeset: 1:471597cad322
139 | tag: tip
140 | user: test
141 | date: Thu Jan 01 00:00:00 1970 +0000
142 | summary: A0
143 |
144 o changeset: 0:ea207398892e
145 user: test
146 date: Thu Jan 01 00:00:00 1970 +0000
147 summary: ROOT
148
149 # Simulate a split
150 $ hg up 0
151 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
152
153 $ echo 42 >> a
154 $ hg commit -A -m "A0"
155 adding a
156 created new head
157
158 $ echo 43 >> b
159 $ hg commit -A -m "A0"
160 adding b
161
162 $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'`
163 obsoleted 1 changesets
164
165 $ hg log --hidden -G
166 @ changeset: 3:f257fde29c7a
167 | tag: tip
168 | user: test
169 | date: Thu Jan 01 00:00:00 1970 +0000
170 | summary: A0
171 |
172 o changeset: 2:337fec4d2edc
173 | parent: 0:ea207398892e
174 | user: test
175 | date: Thu Jan 01 00:00:00 1970 +0000
176 | summary: A0
177 |
178 | x changeset: 1:471597cad322
179 |/ user: test
180 | date: Thu Jan 01 00:00:00 1970 +0000
181 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
182 | summary: A0
183 |
184 o changeset: 0:ea207398892e
185 user: test
186 date: Thu Jan 01 00:00:00 1970 +0000
187 summary: ROOT
188
189 Actual test
190 -----------
191 $ hg update 471597cad322
192 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a!
193 (use --hidden to access hidden revisions)
194 [255]
195 $ hg update --hidden 'min(desc(A0))'
196 updating to a hidden changeset 471597cad322
197 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
198
199 Test output with lots of splitted commit
200 ========================================
201
202 Test setup
203 ----------
204
205 $ hg init $TESTTMP/local-lots-split
206 $ cd $TESTTMP/local-lots-split
207 $ mkcommit ROOT
208 $ echo 42 >> a
209 $ echo 43 >> b
210 $ echo 44 >> c
211 $ echo 45 >> d
212 $ hg commit -A -m "A0"
213 adding a
214 adding b
215 adding c
216 adding d
217 $ hg log --hidden -G
218 @ changeset: 1:de7290d8b885
219 | tag: tip
220 | user: test
221 | date: Thu Jan 01 00:00:00 1970 +0000
222 | summary: A0
223 |
224 o changeset: 0:ea207398892e
225 user: test
226 date: Thu Jan 01 00:00:00 1970 +0000
227 summary: ROOT
228
229 # Simulate a split
230 $ hg up 0
231 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
232
233 $ echo 42 >> a
234 $ hg commit -A -m "A0"
235 adding a
236 created new head
237
238 $ echo 43 >> b
239 $ hg commit -A -m "A0"
240 adding b
241
242 $ echo 44 >> c
243 $ hg commit -A -m "A0"
244 adding c
245
246 $ echo 45 >> d
247 $ hg commit -A -m "A0"
248 adding d
249
250 $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` `getid '4'` `getid '5'`
251 obsoleted 1 changesets
252
253 $ hg log --hidden -G
254 @ changeset: 5:c7f044602e9b
255 | tag: tip
256 | user: test
257 | date: Thu Jan 01 00:00:00 1970 +0000
258 | summary: A0
259 |
260 o changeset: 4:1ae8bc733a14
261 | user: test
262 | date: Thu Jan 01 00:00:00 1970 +0000
263 | summary: A0
264 |
265 o changeset: 3:f257fde29c7a
266 | user: test
267 | date: Thu Jan 01 00:00:00 1970 +0000
268 | summary: A0
269 |
270 o changeset: 2:337fec4d2edc
271 | parent: 0:ea207398892e
272 | user: test
273 | date: Thu Jan 01 00:00:00 1970 +0000
274 | summary: A0
275 |
276 | x changeset: 1:de7290d8b885
277 |/ user: test
278 | date: Thu Jan 01 00:00:00 1970 +0000
279 | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
280 | summary: A0
281 |
282 o changeset: 0:ea207398892e
283 user: test
284 date: Thu Jan 01 00:00:00 1970 +0000
285 summary: ROOT
286
287 Actual test
288 -----------
289 $ hg update de7290d8b885
290 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!
291 (use --hidden to access hidden revisions)
292 [255]
293 $ hg update --hidden 'min(desc(A0))'
294 updating to a hidden changeset de7290d8b885
295 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
296
297 Test output with folded commit
298 ==============================
299
300 Test setup
301 ----------
302
303 $ hg init $TESTTMP/local-fold
304 $ cd $TESTTMP/local-fold
305 $ mkcommit ROOT
306 $ mkcommit A0
307 $ mkcommit B0
308 $ hg log --hidden -G
309 @ changeset: 2:0dec01379d3b
310 | tag: tip
311 | user: test
312 | date: Thu Jan 01 00:00:00 1970 +0000
313 | summary: B0
314 |
315 o changeset: 1:471f378eab4c
316 | user: test
317 | date: Thu Jan 01 00:00:00 1970 +0000
318 | summary: A0
319 |
320 o changeset: 0:ea207398892e
321 user: test
322 date: Thu Jan 01 00:00:00 1970 +0000
323 summary: ROOT
324
325 # Simulate a fold
326 $ hg up 0
327 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
328 $ echo "A0" > A0
329 $ echo "B0" > B0
330 $ hg add A0 B0
331 $ hg commit -m "C0"
332 created new head
333
334 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
335 obsoleted 1 changesets
336 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'`
337 obsoleted 1 changesets
338
339 $ hg log --hidden -G
340 @ changeset: 3:eb5a0daa2192
341 | tag: tip
342 | parent: 0:ea207398892e
343 | user: test
344 | date: Thu Jan 01 00:00:00 1970 +0000
345 | summary: C0
346 |
347 | x changeset: 2:0dec01379d3b
348 | | user: test
349 | | date: Thu Jan 01 00:00:00 1970 +0000
350 | | obsolete: rewritten as 3:eb5a0daa2192
351 | | summary: B0
352 | |
353 | x changeset: 1:471f378eab4c
354 |/ user: test
355 | date: Thu Jan 01 00:00:00 1970 +0000
356 | obsolete: rewritten as 3:eb5a0daa2192
357 | summary: A0
358 |
359 o changeset: 0:ea207398892e
360 user: test
361 date: Thu Jan 01 00:00:00 1970 +0000
362 summary: ROOT
363
364 Actual test
365 -----------
366 $ hg update 471f378eab4c
367 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
368 (use --hidden to access hidden revisions)
369 [255]
370 $ hg update --hidden 'desc(A0)'
371 updating to a hidden changeset 471f378eab4c
372 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
373 $ hg update 0dec01379d3b
374 abort: hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192!
375 (use --hidden to access hidden revisions)
376 [255]
377 $ hg update --hidden 'desc(B0)'
378 updating to a hidden changeset 0dec01379d3b
379 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
380
381 Test output with divergence
382 ===========================
383
384 Test setup
385 ----------
386
387 $ hg init $TESTTMP/local-divergence
388 $ cd $TESTTMP/local-divergence
389 $ mkcommit ROOT
390 $ mkcommit A0
391 $ hg commit --amend -m "A1"
392 $ hg log --hidden -G
393 @ changeset: 2:fdf9bde5129a
394 | tag: tip
395 | parent: 0:ea207398892e
396 | user: test
397 | date: Thu Jan 01 00:00:00 1970 +0000
398 | summary: A1
399 |
400 | x changeset: 1:471f378eab4c
401 |/ user: test
402 | date: Thu Jan 01 00:00:00 1970 +0000
403 | obsolete: rewritten using amend as 2:fdf9bde5129a
404 | summary: A0
405 |
406 o changeset: 0:ea207398892e
407 user: test
408 date: Thu Jan 01 00:00:00 1970 +0000
409 summary: ROOT
410
411 $ hg update --hidden 'desc(A0)'
412 updating to a hidden changeset 471f378eab4c
413 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
414 $ hg commit --amend -m "A2"
415 $ hg log --hidden -G
416 @ changeset: 3:65b757b745b9
417 | tag: tip
418 | parent: 0:ea207398892e
419 | user: test
420 | date: Thu Jan 01 00:00:00 1970 +0000
421 | instability: content-divergent
422 | summary: A2
423 |
424 | * changeset: 2:fdf9bde5129a
425 |/ parent: 0:ea207398892e
426 | user: test
427 | date: Thu Jan 01 00:00:00 1970 +0000
428 | instability: content-divergent
429 | summary: A1
430 |
431 | x changeset: 1:471f378eab4c
432 |/ user: test
433 | date: Thu Jan 01 00:00:00 1970 +0000
434 | obsolete: rewritten using amend as 2:fdf9bde5129a
435 | obsolete: rewritten using amend as 3:65b757b745b9
436 | summary: A0
437 |
438 o changeset: 0:ea207398892e
439 user: test
440 date: Thu Jan 01 00:00:00 1970 +0000
441 summary: ROOT
442
443 Actual test
444 -----------
445 $ hg update 471f378eab4c
446 abort: hidden revision '471f378eab4c' has diverged!
447 (use --hidden to access hidden revisions)
448 [255]
449 $ hg update --hidden 'desc(A0)'
450 updating to a hidden changeset 471f378eab4c
451 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
452
453 Test output with amended + folded commit
454 ========================================
455
456 Test setup
457 ----------
458
459 $ hg init $TESTTMP/local-amend-fold
460 $ cd $TESTTMP/local-amend-fold
461 $ mkcommit ROOT
462 $ mkcommit A0
463 $ mkcommit B0
464 $ hg commit --amend -m "B1"
465 $ hg log --hidden -G
466 @ changeset: 3:b7ea6d14e664
467 | tag: tip
468 | parent: 1:471f378eab4c
469 | user: test
470 | date: Thu Jan 01 00:00:00 1970 +0000
471 | summary: B1
472 |
473 | x changeset: 2:0dec01379d3b
474 |/ user: test
475 | date: Thu Jan 01 00:00:00 1970 +0000
476 | obsolete: rewritten using amend as 3:b7ea6d14e664
477 | summary: B0
478 |
479 o changeset: 1:471f378eab4c
480 | user: test
481 | date: Thu Jan 01 00:00:00 1970 +0000
482 | summary: A0
483 |
484 o changeset: 0:ea207398892e
485 user: test
486 date: Thu Jan 01 00:00:00 1970 +0000
487 summary: ROOT
488
489
490 # Simulate a fold
491 $ hg up 0
492 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
493 $ echo "A0" > A0
494 $ echo "B0" > B0
495 $ hg add A0 B0
496 $ hg commit -m "C0"
497 created new head
498
499 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
500 obsoleted 1 changesets
501 $ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'`
502 obsoleted 1 changesets
503
504 $ hg log --hidden -G
505 @ changeset: 4:eb5a0daa2192
506 | tag: tip
507 | parent: 0:ea207398892e
508 | user: test
509 | date: Thu Jan 01 00:00:00 1970 +0000
510 | summary: C0
511 |
512 | x changeset: 3:b7ea6d14e664
513 | | parent: 1:471f378eab4c
514 | | user: test
515 | | date: Thu Jan 01 00:00:00 1970 +0000
516 | | obsolete: rewritten as 4:eb5a0daa2192
517 | | summary: B1
518 | |
519 | | x changeset: 2:0dec01379d3b
520 | |/ user: test
521 | | date: Thu Jan 01 00:00:00 1970 +0000
522 | | obsolete: rewritten using amend as 3:b7ea6d14e664
523 | | summary: B0
524 | |
525 | x changeset: 1:471f378eab4c
526 |/ user: test
527 | date: Thu Jan 01 00:00:00 1970 +0000
528 | obsolete: rewritten as 4:eb5a0daa2192
529 | summary: A0
530 |
531 o changeset: 0:ea207398892e
532 user: test
533 date: Thu Jan 01 00:00:00 1970 +0000
534 summary: ROOT
535
536 Actual test
537 -----------
538 $ hg update 471f378eab4c
539 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
540 (use --hidden to access hidden revisions)
541 [255]
542 $ hg update --hidden 'desc(A0)'
543 updating to a hidden changeset 471f378eab4c
544 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
545 $ hg update --hidden 0dec01379d3b
546 updating to a hidden changeset 0dec01379d3b
547 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
548 $ hg update 0dec01379d3b
549 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
550 $ hg update --hidden 'desc(B0)'
551 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -36,6 +36,7 b' from . import ('
36 match as matchmod,
36 match as matchmod,
37 mdiff,
37 mdiff,
38 obsolete as obsmod,
38 obsolete as obsmod,
39 obsutil,
39 patch,
40 patch,
40 pathutil,
41 pathutil,
41 phases,
42 phases,
@@ -433,8 +434,21 b' def _filterederror(repo, changeid):'
433 This is extracted in a function to help extensions (eg: evolve) to
434 This is extracted in a function to help extensions (eg: evolve) to
434 experiment with various message variants."""
435 experiment with various message variants."""
435 if repo.filtername.startswith('visible'):
436 if repo.filtername.startswith('visible'):
436 msg = _("hidden revision '%s'") % changeid
437
438 # Check if the changeset is obsolete
439 unfilteredrepo = repo.unfiltered()
440 ctx = unfilteredrepo[changeid]
441
442 # If the changeset is obsolete, enrich the hint with the reason that
443 # made this changeset not visible
444 if ctx.obsolete():
445 reason = obsutil._getfilteredreason(unfilteredrepo, ctx)
446 msg = _("hidden revision '%s' %s") % (changeid, reason)
447 else:
448 msg = _("hidden revision '%s'") % changeid
449
437 hint = _('use --hidden to access hidden revisions')
450 hint = _('use --hidden to access hidden revisions')
451
438 return error.FilteredRepoLookupError(msg, hint=hint)
452 return error.FilteredRepoLookupError(msg, hint=hint)
439 msg = _("filtered revision '%s' (not in '%s' subset)")
453 msg = _("filtered revision '%s' (not in '%s' subset)")
440 msg %= (changeid, repo.filtername)
454 msg %= (changeid, repo.filtername)
@@ -9,9 +9,11 b' from __future__ import absolute_import'
9
9
10 import re
10 import re
11
11
12 from .i18n import _
12 from . import (
13 from . import (
14 node as nodemod,
13 phases,
15 phases,
14 util
16 util,
15 )
17 )
16
18
17 class marker(object):
19 class marker(object):
@@ -751,6 +753,32 b' def successorsandmarkers(repo, ctx):'
751
753
752 return values
754 return values
753
755
756 def _getobsfate(successorssets):
757 """ Compute a changeset obsolescence fate based on its successorssets.
758 Successors can be the tipmost ones or the immediate ones. This function
759 return values are not meant to be shown directly to users, it is meant to
760 be used by internal functions only.
761 Returns one fate from the following values:
762 - pruned
763 - diverged
764 - superseded
765 - superseded_split
766 """
767
768 if len(successorssets) == 0:
769 # The commit has been pruned
770 return 'pruned'
771 elif len(successorssets) > 1:
772 return 'diverged'
773 else:
774 # No divergence, only one set of successors
775 successors = successorssets[0]
776
777 if len(successors) == 1:
778 return 'superseded'
779 else:
780 return 'superseded_split'
781
754 def obsfateverb(successorset, markers):
782 def obsfateverb(successorset, markers):
755 """ Return the verb summarizing the successorset and potentially using
783 """ Return the verb summarizing the successorset and potentially using
756 information from the markers
784 information from the markers
@@ -836,3 +864,34 b' def obsfateprinter(successors, markers, '
836 line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date))
864 line.append(" (between %s and %s)" % (fmtmin_date, fmtmax_date))
837
865
838 return "".join(line)
866 return "".join(line)
867
868 def _getfilteredreason(unfilteredrepo, ctx):
869 """return a human-friendly string on why a obsolete changeset is hidden
870 """
871 successors = successorssets(unfilteredrepo, ctx.node())
872 fate = _getobsfate(successors)
873
874 # Be more precise in case the revision is superseded
875 if fate == 'pruned':
876 reason = _('is pruned')
877 elif fate == 'diverged':
878 reason = _('has diverged')
879 elif fate == 'superseded':
880 reason = _("was rewritten as: %s") % nodemod.short(successors[0][0])
881 elif fate == 'superseded_split':
882
883 succs = []
884 for node_id in successors[0]:
885 succs.append(nodemod.short(node_id))
886
887 if len(succs) <= 2:
888 reason = _("was split as: %s") % ", ".join(succs)
889 else:
890 firstsuccessors = ", ".join(succs[:2])
891 remainingnumber = len(succs) - 2
892
893 args = (firstsuccessors, remainingnumber)
894 successorsmsg = _("%s and %d more") % args
895 reason = _("was split as: %s") % successorsmsg
896
897 return reason
@@ -40,7 +40,7 b' Testing read only commands on the hidden'
40 Testing with rev number
40 Testing with rev number
41
41
42 $ hg exp 2 --config experimental.directaccess.revnums=False
42 $ hg exp 2 --config experimental.directaccess.revnums=False
43 abort: hidden revision '2'!
43 abort: hidden revision '2' was rewritten as: 2443a0e66469!
44 (use --hidden to access hidden revisions)
44 (use --hidden to access hidden revisions)
45 [255]
45 [255]
46
46
@@ -73,7 +73,7 b' Testing with rev number'
73 A c
73 A c
74
74
75 $ hg status --change 2 --config experimental.directaccess.revnums=False
75 $ hg status --change 2 --config experimental.directaccess.revnums=False
76 abort: hidden revision '2'!
76 abort: hidden revision '2' was rewritten as: 2443a0e66469!
77 (use --hidden to access hidden revisions)
77 (use --hidden to access hidden revisions)
78 [255]
78 [255]
79
79
@@ -178,11 +178,11 b' This should not throw error'
178 Commands with undefined cmdtype should not work right now
178 Commands with undefined cmdtype should not work right now
179
179
180 $ hg phase -r 28ad74
180 $ hg phase -r 28ad74
181 abort: hidden revision '28ad74'!
181 abort: hidden revision '28ad74' was rewritten as: 2443a0e66469!
182 (use --hidden to access hidden revisions)
182 (use --hidden to access hidden revisions)
183 [255]
183 [255]
184
184
185 $ hg phase -r 2
185 $ hg phase -r 2
186 abort: hidden revision '2'!
186 abort: hidden revision '2' was rewritten as: 2443a0e66469!
187 (use --hidden to access hidden revisions)
187 (use --hidden to access hidden revisions)
188 [255]
188 [255]
@@ -1827,7 +1827,7 b' enable obsolete to test hidden feature'
1827 1:a765632148dc55d38c35c4f247c618701886cb2f
1827 1:a765632148dc55d38c35c4f247c618701886cb2f
1828 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1828 0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
1829 $ hg log -r a
1829 $ hg log -r a
1830 abort: hidden revision 'a'!
1830 abort: hidden revision 'a' is pruned!
1831 (use --hidden to access hidden revisions)
1831 (use --hidden to access hidden revisions)
1832 [255]
1832 [255]
1833
1833
@@ -1885,7 +1885,7 b' test hidden revision 0 (issue5385)'
1885 2:94375ec45bddd2a824535fc04855bd058c926ec0
1885 2:94375ec45bddd2a824535fc04855bd058c926ec0
1886 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
1886 3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
1887 $ hg log -T'{rev}:{node}\n' -r:0
1887 $ hg log -T'{rev}:{node}\n' -r:0
1888 abort: hidden revision '0'!
1888 abort: hidden revision '0' is pruned!
1889 (use --hidden to access hidden revisions)
1889 (use --hidden to access hidden revisions)
1890 [255]
1890 [255]
1891 $ hg log -T'{rev}:{node}\n' -f
1891 $ hg log -T'{rev}:{node}\n' -f
@@ -197,7 +197,7 b' check that various commands work well wi'
197 abort: unknown revision '6'!
197 abort: unknown revision '6'!
198 [255]
198 [255]
199 $ hg log -r 4
199 $ hg log -r 4
200 abort: hidden revision '4'!
200 abort: hidden revision '4' was rewritten as: 5601fb93a350!
201 (use --hidden to access hidden revisions)
201 (use --hidden to access hidden revisions)
202 [255]
202 [255]
203 $ hg debugrevspec 'rev(6)'
203 $ hg debugrevspec 'rev(6)'
@@ -1337,7 +1337,7 b' bookmarks change'
1337 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
1337 4:13bedc178fce (draft *obsolete*) [ bookb] add b [rewritten using amend as 5:a9b1f8652753]
1338 $ hg book -d bookb
1338 $ hg book -d bookb
1339 $ hg log -r 13bedc178fce
1339 $ hg log -r 13bedc178fce
1340 abort: hidden revision '13bedc178fce'!
1340 abort: hidden revision '13bedc178fce' was rewritten as: a9b1f8652753!
1341 (use --hidden to access hidden revisions)
1341 (use --hidden to access hidden revisions)
1342 [255]
1342 [255]
1343
1343
General Comments 0
You need to be logged in to leave comments. Login now