equal
deleted
inserted
replaced
1446 |
1446 |
1447 opts['phase_divergent'] = opts['bumped'] |
1447 opts['phase_divergent'] = opts['bumped'] |
1448 |
1448 |
1449 return opts |
1449 return opts |
1450 |
1450 |
1451 def _cleanup(ui, repo, startnode, showprogress, shouldupdate): |
1451 def _cleanup(ui, repo, startnode, shouldupdate): |
1452 if showprogress: |
|
1453 compat.progress(ui, _('evolve'), None) |
|
1454 |
|
1455 if not shouldupdate: |
1452 if not shouldupdate: |
1456 # Move back to startnode, or to its successor if the start node is |
1453 # Move back to startnode, or to its successor if the start node is |
1457 # obsolete (perhaps made obsolete by the current `hg evolve`) |
1454 # obsolete (perhaps made obsolete by the current `hg evolve`) |
1458 unfi = repo.unfiltered() |
1455 unfi = repo.unfiltered() |
1459 succ = utility._singlesuccessor(repo, unfi[startnode]) |
1456 succ = utility._singlesuccessor(repo, unfi[startnode]) |
1757 evolvestate['skippedrevs'].append(curctx.node()) |
1754 evolvestate['skippedrevs'].append(curctx.node()) |
1758 |
1755 |
1759 evolvestate['orphanmerge'] = False |
1756 evolvestate['orphanmerge'] = False |
1760 seen += 1 |
1757 seen += 1 |
1761 |
1758 |
1762 _cleanup(ui, repo, startnode, showprogress, shouldupdate) |
1759 if showprogress: |
|
1760 compat.progress(ui, _('evolve'), None) |
|
1761 |
|
1762 _cleanup(ui, repo, startnode, shouldupdate) |
1763 |
1763 |
1764 def solveobswdp(ui, repo, opts): |
1764 def solveobswdp(ui, repo, opts): |
1765 """this function updates to the successor of obsolete wdir parent""" |
1765 """this function updates to the successor of obsolete wdir parent""" |
1766 oldid = repo['.'].node() |
1766 oldid = repo['.'].node() |
1767 startctx = repo['.'] |
1767 startctx = repo['.'] |