equal
deleted
inserted
replaced
3545 ui.status(_('grafting %s\n') % desc) |
3545 ui.status(_('grafting %s\n') % desc) |
3546 if opts.get('dry_run'): |
3546 if opts.get('dry_run'): |
3547 continue |
3547 continue |
3548 |
3548 |
3549 source = ctx.extra().get('source') |
3549 source = ctx.extra().get('source') |
3550 if not source: |
3550 extra = {} |
3551 source = ctx.hex() |
3551 if source: |
3552 extra = {'source': source} |
3552 extra['source'] = source |
|
3553 extra['intermediate-source'] = ctx.hex() |
|
3554 else: |
|
3555 extra['source'] = ctx.hex() |
3553 user = ctx.user() |
3556 user = ctx.user() |
3554 if opts.get('user'): |
3557 if opts.get('user'): |
3555 user = opts['user'] |
3558 user = opts['user'] |
3556 date = ctx.date() |
3559 date = ctx.date() |
3557 if opts.get('date'): |
3560 if opts.get('date'): |