Show More
@@ -1513,12 +1513,14 b' def rebasenode(repo, rev, p1, p2, base, ' | |||||
1513 | p1ctx = repo[p1] |
|
1513 | p1ctx = repo[p1] | |
1514 | if wctx.isinmemory(): |
|
1514 | if wctx.isinmemory(): | |
1515 | wctx.setbase(p1ctx) |
|
1515 | wctx.setbase(p1ctx) | |
|
1516 | scope = util.nullcontextmanager | |||
1516 | else: |
|
1517 | else: | |
1517 | if repo[b'.'].rev() != p1: |
|
1518 | if repo[b'.'].rev() != p1: | |
1518 | repo.ui.debug(b" update to %d:%s\n" % (p1, p1ctx)) |
|
1519 | repo.ui.debug(b" update to %d:%s\n" % (p1, p1ctx)) | |
1519 | mergemod.clean_update(p1ctx) |
|
1520 | mergemod.clean_update(p1ctx) | |
1520 | else: |
|
1521 | else: | |
1521 | repo.ui.debug(b" already in destination\n") |
|
1522 | repo.ui.debug(b" already in destination\n") | |
|
1523 | scope = lambda: repo.dirstate.changing_parents(repo) | |||
1522 | # This is, alas, necessary to invalidate workingctx's manifest cache, |
|
1524 | # This is, alas, necessary to invalidate workingctx's manifest cache, | |
1523 | # as well as other data we litter on it in other places. |
|
1525 | # as well as other data we litter on it in other places. | |
1524 | wctx = repo[None] |
|
1526 | wctx = repo[None] | |
@@ -1528,6 +1530,7 b' def rebasenode(repo, rev, p1, p2, base, ' | |||||
1528 | if base is not None: |
|
1530 | if base is not None: | |
1529 | repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base])) |
|
1531 | repo.ui.debug(b" detach base %d:%s\n" % (base, repo[base])) | |
1530 |
|
1532 | |||
|
1533 | with scope(): | |||
1531 | # See explanation in merge.graft() |
|
1534 | # See explanation in merge.graft() | |
1532 | mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) |
|
1535 | mergeancestor = repo.changelog.isancestor(p1ctx.node(), ctx.node()) | |
1533 | stats = mergemod._update( |
|
1536 | stats = mergemod._update( |
General Comments 0
You need to be logged in to leave comments.
Login now