Show More
@@ -1763,16 +1763,20 b' def clearrebased(ui, repo, destmap, stat' | |||||
1763 | tonode = repo.changelog.node |
|
1763 | tonode = repo.changelog.node | |
1764 | replacements = {} |
|
1764 | replacements = {} | |
1765 | moves = {} |
|
1765 | moves = {} | |
|
1766 | stripcleanup = not obsolete.isenabled(repo, obsolete.createmarkersopt) | |||
1766 | for rev, newrev in sorted(state.items()): |
|
1767 | for rev, newrev in sorted(state.items()): | |
1767 | if newrev >= 0 and newrev != rev: |
|
1768 | if newrev >= 0 and newrev != rev: | |
1768 | oldnode = tonode(rev) |
|
1769 | oldnode = tonode(rev) | |
1769 | newnode = collapsedas or tonode(newrev) |
|
1770 | newnode = collapsedas or tonode(newrev) | |
1770 | moves[oldnode] = newnode |
|
1771 | moves[oldnode] = newnode | |
1771 | if not keepf: |
|
1772 | if not keepf: | |
|
1773 | succs = None | |||
1772 | if rev in skipped: |
|
1774 | if rev in skipped: | |
|
1775 | if stripcleanup or not repo[rev].obsolete(): | |||
1773 | succs = () |
|
1776 | succs = () | |
1774 | else: |
|
1777 | else: | |
1775 | succs = (newnode,) |
|
1778 | succs = (newnode,) | |
|
1779 | if succs is not None: | |||
1776 | replacements[oldnode] = succs |
|
1780 | replacements[oldnode] = succs | |
1777 | scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup) |
|
1781 | scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup) | |
1778 | if fm: |
|
1782 | if fm: |
General Comments 0
You need to be logged in to leave comments.
Login now