comparison hgext/rebase.py @ 27146:88fde8db5307

rebase: propagate extra dict from rebase source changeset

This corrects extra propagation for the rebase command and the shelve command.

27145:3a2fd83182fb

        repo.setparents(repo[p1].node(), repo[p2].node())
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
        extra = {'rebase_source': ctx.hex()}
        if extrafn:
            extrafn(ctx, extra)

        backup = repo.ui.backupconfig('phases', 'new-commit')
        try:

27146:88fde8db5307

        repo.setparents(repo[p1].node(), repo[p2].node())
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
        extra = ctx.extra().copy()
        if not keepbranches:
            del extra['branch']
        extra['rebase_source'] = ctx.hex()
        if extrafn:
            extrafn(ctx, extra)

        backup = repo.ui.backupconfig('phases', 'new-commit')
        try: