equal
deleted
inserted
replaced
2588 hint=_('use hg resolve and hg graft --continue')) |
2588 hint=_('use hg resolve and hg graft --continue')) |
2589 else: |
2589 else: |
2590 cont = False |
2590 cont = False |
2591 |
2591 |
2592 # commit |
2592 # commit |
2593 extra = {'source': ctx.hex()} |
2593 source = ctx.extra().get('source') |
|
2594 if not source: |
|
2595 source = ctx.hex() |
|
2596 extra = {'source': source} |
2594 user = ctx.user() |
2597 user = ctx.user() |
2595 if opts.get('user'): |
2598 if opts.get('user'): |
2596 user = opts['user'] |
2599 user = opts['user'] |
2597 date = ctx.date() |
2600 date = ctx.date() |
2598 if opts.get('date'): |
2601 if opts.get('date'): |