Show More
@@ -469,15 +469,18 b' def concludenode(repo, rev, p1, p2, comm' | |||||
469 | extra = {'rebase_source': ctx.hex()} |
|
469 | extra = {'rebase_source': ctx.hex()} | |
470 | if extrafn: |
|
470 | if extrafn: | |
471 | extrafn(ctx, extra) |
|
471 | extrafn(ctx, extra) | |
472 | # Commit might fail if unresolved files exist |
|
472 | ||
473 | newrev = repo.commit(text=commitmsg, user=ctx.user(), |
|
473 | backup = repo.ui.backupconfig('phases', 'new-commit') | |
474 | date=ctx.date(), extra=extra, editor=editor) |
|
474 | try: | |
|
475 | targetphase = max(ctx.phase(), phases.draft) | |||
|
476 | repo.ui.setconfig('phases', 'new-commit', targetphase, 'rebase') | |||
|
477 | # Commit might fail if unresolved files exist | |||
|
478 | newrev = repo.commit(text=commitmsg, user=ctx.user(), | |||
|
479 | date=ctx.date(), extra=extra, editor=editor) | |||
|
480 | finally: | |||
|
481 | repo.ui.restoreconfig(backup) | |||
|
482 | ||||
475 | repo.dirstate.setbranch(repo[newrev].branch()) |
|
483 | repo.dirstate.setbranch(repo[newrev].branch()) | |
476 | targetphase = max(ctx.phase(), phases.draft) |
|
|||
477 | # retractboundary doesn't overwrite upper phase inherited from parent |
|
|||
478 | newnode = repo[newrev].node() |
|
|||
479 | if newnode: |
|
|||
480 | phases.retractboundary(repo, targetphase, [newnode]) |
|
|||
481 | return newrev |
|
484 | return newrev | |
482 | except util.Abort: |
|
485 | except util.Abort: | |
483 | # Invalidate the previous setparents |
|
486 | # Invalidate the previous setparents |
General Comments 0
You need to be logged in to leave comments.
Login now