Show More
@@ -483,9 +483,9 b' def histedit(ui, repo, *parent, **opts):' | |||||
483 | ui.debug('restore wc to old tip %s\n' % node.hex(tip)) |
|
483 | ui.debug('restore wc to old tip %s\n' % node.hex(tip)) | |
484 | hg.clean(repo, tip) |
|
484 | hg.clean(repo, tip) | |
485 | ui.debug('should strip created nodes %s\n' % |
|
485 | ui.debug('should strip created nodes %s\n' % | |
486 |
', '.join([node. |
|
486 | ', '.join([node.short(n) for n in created])) | |
487 | ui.debug('should strip temp nodes %s\n' % |
|
487 | ui.debug('should strip temp nodes %s\n' % | |
488 |
', '.join([node. |
|
488 | ', '.join([node.short(n) for n in tmpnodes])) | |
489 | for nodes in (created, tmpnodes): |
|
489 | for nodes in (created, tmpnodes): | |
490 | lock = None |
|
490 | lock = None | |
491 | try: |
|
491 | try: | |
@@ -521,7 +521,7 b' def histedit(ui, repo, *parent, **opts):' | |||||
521 | if not rules: |
|
521 | if not rules: | |
522 | rules = '\n'.join([makedesc(c) for c in ctxs]) |
|
522 | rules = '\n'.join([makedesc(c) for c in ctxs]) | |
523 | rules += '\n\n' |
|
523 | rules += '\n\n' | |
524 |
rules += editcomment % (node. |
|
524 | rules += editcomment % (node.short(parent), node.short(tip)) | |
525 | rules = ui.edit(rules, ui.username()) |
|
525 | rules = ui.edit(rules, ui.username()) | |
526 | # Save edit rules in .hg/histedit-last-edit.txt in case |
|
526 | # Save edit rules in .hg/histedit-last-edit.txt in case | |
527 | # the user needs to ask for help after something |
|
527 | # the user needs to ask for help after something | |
@@ -636,7 +636,7 b' def histedit(ui, repo, *parent, **opts):' | |||||
636 | # TODO update mq state |
|
636 | # TODO update mq state | |
637 |
|
637 | |||
638 | ui.debug('should strip replaced nodes %s\n' % |
|
638 | ui.debug('should strip replaced nodes %s\n' % | |
639 |
', '.join([node. |
|
639 | ', '.join([node.short(n) for n in replaced])) | |
640 | lock = None |
|
640 | lock = None | |
641 | try: |
|
641 | try: | |
642 | lock = repo.lock() |
|
642 | lock = repo.lock() | |
@@ -649,7 +649,7 b' def histedit(ui, repo, *parent, **opts):' | |||||
649 | lockmod.release(lock) |
|
649 | lockmod.release(lock) | |
650 |
|
650 | |||
651 | ui.debug('should strip temp nodes %s\n' % |
|
651 | ui.debug('should strip temp nodes %s\n' % | |
652 |
', '.join([node. |
|
652 | ', '.join([node.short(n) for n in tmpnodes])) | |
653 | lock = None |
|
653 | lock = None | |
654 | try: |
|
654 | try: | |
655 | lock = repo.lock() |
|
655 | lock = repo.lock() | |
@@ -713,7 +713,7 b' def makedesc(c):' | |||||
713 | summary = '' |
|
713 | summary = '' | |
714 | if c.description(): |
|
714 | if c.description(): | |
715 | summary = c.description().splitlines()[0] |
|
715 | summary = c.description().splitlines()[0] | |
716 |
line = 'pick %s %d %s' % (c |
|
716 | line = 'pick %s %d %s' % (c, c.rev(), summary) | |
717 | return line[:80] # trim to 80 chars so it's not stupidly wide in my editor |
|
717 | return line[:80] # trim to 80 chars so it's not stupidly wide in my editor | |
718 |
|
718 | |||
719 | def verifyrules(rules, repo, ctxs): |
|
719 | def verifyrules(rules, repo, ctxs): |
General Comments 0
You need to be logged in to leave comments.
Login now