##// END OF EJS Templates
absorb: print '{rev}:' as a prefix to the hash...
Matt Harbison -
r40186:1be1689d default
parent child Browse files
Show More
@@ -727,9 +727,9 b' class fixupstate(object):'
727
727
728 def _ctx2str(self, ctx):
728 def _ctx2str(self, ctx):
729 if self.ui.debugflag:
729 if self.ui.debugflag:
730 return ctx.hex()
730 return '%d:%s' % (ctx.rev(), ctx.hex())
731 else:
731 else:
732 return node.short(ctx.node())
732 return '%d:%s' % (ctx.rev(), node.short(ctx.node()))
733
733
734 def _getnewfilecontents(self, ctx):
734 def _getnewfilecontents(self, ctx):
735 """(ctx) -> {path: str}
735 """(ctx) -> {path: str}
@@ -394,10 +394,10 b' Remove lines may delete changesets:'
394 30970db -3
394 30970db -3
395 a393a58 -4
395 a393a58 -4
396 $ hg absorb -v | grep became
396 $ hg absorb -v | grep became
397 bfafb49242db: 1 file(s) changed, became 1a2de97fc652
397 0:bfafb49242db: 1 file(s) changed, became 4:1a2de97fc652
398 115485984805: 2 file(s) changed, became 0c930dfab74c
398 1:115485984805: 2 file(s) changed, became 5:0c930dfab74c
399 30970dbf7b40: became empty and was dropped
399 2:30970dbf7b40: became empty and was dropped
400 a393a58b9a85: became empty and was dropped
400 3:a393a58b9a85: became empty and was dropped
401 $ hg log -T '{rev} {desc}\n' -Gp
401 $ hg log -T '{rev} {desc}\n' -Gp
402 @ 5 b12
402 @ 5 b12
403 | diff --git a/b b/b
403 | diff --git a/b b/b
@@ -444,8 +444,8 b' This should move us to the non-obsolete '
444 f1c23dd -3
444 f1c23dd -3
445 82dbe7f -4
445 82dbe7f -4
446 $ hg absorb --verbose
446 $ hg absorb --verbose
447 f1c23dd5d08d: became empty and was dropped
447 1:f1c23dd5d08d: became empty and was dropped
448 82dbe7fd19f0: became empty and was dropped
448 2:82dbe7fd19f0: became empty and was dropped
449 a: 1 of 1 chunk(s) applied
449 a: 1 of 1 chunk(s) applied
450 $ hg id
450 $ hg id
451 bfafb49242db tip
451 bfafb49242db tip
General Comments 0
You need to be logged in to leave comments. Login now