comparison hgext/rebase.py @ 37041:0b1230a5a958

rebase: look up default date outside of conclude[memory]node()

Differential Revision: https://phab.mercurial-scm.org/D2922

37040:b8d305bd12ca

        Return node of committed revision.'''
        repo = self.repo
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        extra = {'rebase_source': ctx.hex()}
        for c in self.extrafns:
            c(ctx, extra)
        keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
        destphase = max(ctx.phase(), phases.draft)

                newnode = concludememorynode(repo, ctx, p1, p2,
                    wctx=self.wctx,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    date=self.date)
                mergemod.mergestate.clean(repo)
            else:
                newnode = concludenode(repo, ctx, p1, p2,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    date=self.date)

            if newnode is None:
                # If it ended up being a no-op commit, then the normal
                # merge state clean-up path doesn't happen, so do it
                # here. Fix issue5494

    Return node of committed revision.'''
    # Replicates the empty check in ``repo.commit``.
    if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
        return None

    if date is None:
        date = ctx.date()

    # By convention, ``extra['branch']`` (set by extrafn) clobbers
    # ``branch`` (used when passing ``--keepbranches``).
    branch = repo[p1].branch()
    if 'branch' in extra:
        branch = extra['branch']

        dsguard = dirstateguard.dirstateguard(repo, 'rebase')
    with dsguard:
        repo.setparents(repo[p1].node(), repo[p2].node())

        # Commit might fail if unresolved files exist
        if date is None:
            date = ctx.date()
        newnode = repo.commit(text=commitmsg, user=ctx.user(),
                              date=date, extra=extra, editor=editor)

        repo.dirstate.setbranch(repo[newnode].branch())
        return newnode

37041:0b1230a5a958

        Return node of committed revision.'''
        repo = self.repo
        ctx = repo[rev]
        if commitmsg is None:
            commitmsg = ctx.description()
        date = self.date
        if date is None:
            date = ctx.date()
        extra = {'rebase_source': ctx.hex()}
        for c in self.extrafns:
            c(ctx, extra)
        keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
        destphase = max(ctx.phase(), phases.draft)

                newnode = concludememorynode(repo, ctx, p1, p2,
                    wctx=self.wctx,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    date=date)
                mergemod.mergestate.clean(repo)
            else:
                newnode = concludenode(repo, ctx, p1, p2,
                    extra=extra,
                    commitmsg=commitmsg,
                    editor=editor,
                    date=date)

            if newnode is None:
                # If it ended up being a no-op commit, then the normal
                # merge state clean-up path doesn't happen, so do it
                # here. Fix issue5494

    Return node of committed revision.'''
    # Replicates the empty check in ``repo.commit``.
    if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
        return None

    # By convention, ``extra['branch']`` (set by extrafn) clobbers
    # ``branch`` (used when passing ``--keepbranches``).
    branch = repo[p1].branch()
    if 'branch' in extra:
        branch = extra['branch']

        dsguard = dirstateguard.dirstateguard(repo, 'rebase')
    with dsguard:
        repo.setparents(repo[p1].node(), repo[p2].node())

        # Commit might fail if unresolved files exist
        newnode = repo.commit(text=commitmsg, user=ctx.user(),
                              date=date, extra=extra, editor=editor)

        repo.dirstate.setbranch(repo[newnode].branch())
        return newnode