comparison mercurial/commands.py @ 24644:51930a7180bd

graft: record intermediate grafts in extras

Previously the extra field for a graft only contained the original commit hash.
This made it impossible to use graft to copy a commit more than once, because
the extras fields did not change after the second graft.

The fix is to add an extra.intermediate-source field that records the immediate
predecessor to graft. This changes hashes for commits that have been grafted
twice, which is why the test was affected.

24643:a8e6897dffbe

            ui.status(_('grafting %s\n') % desc)
            if opts.get('dry_run'):
                continue

            source = ctx.extra().get('source')
            if not source:
                source = ctx.hex()
            extra = {'source': source}
            user = ctx.user()
            if opts.get('user'):
                user = opts['user']
            date = ctx.date()
            if opts.get('date'):

24644:51930a7180bd

            ui.status(_('grafting %s\n') % desc)
            if opts.get('dry_run'):
                continue

            source = ctx.extra().get('source')
            extra = {}
            if source:
                extra['source'] = source
                extra['intermediate-source'] = ctx.hex()
            else:
                extra['source'] = ctx.hex()
            user = ctx.user()
            if opts.get('user'):
                user = opts['user']
            date = ctx.date()
            if opts.get('date'):