Mercurial > hg
changeset 31222:56d3e0b499df
rebase: clear updatestate during rebase --abort in more cases
Previously, rebase --abort would only call update if you were on a node that had
already been rebased. This meant that if the rebase failed during the rebase of
the first commit, the working copy would be left dirty (with a .hg/updatestate
file) and rebase --abort would not have update to clean it up.
The fix is to also perform an update if you're still on the target node or on
the original working copy node (since the working copy may be dirty, we still
need to do the update). We don't want to perform an update in all cases though
because of issue4009.
A subsequent patch makes this case much more common, since it causes the entire
rebase transaction to rollback during unexpected exceptions. This causes the
existing test-rebase-abort.t to cover this case.
| author | Durham Goode <durham@fb.com> |
|---|---|
| date | Tue, 07 Mar 2017 14:19:08 -0800 |
| parents | 2faf233b88e4 |
| children | 685b8d077577 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Mar 08 00:49:15 2017 +0530 +++ b/hgext/rebase.py Tue Mar 07 14:19:08 2017 -0800 @@ -1156,8 +1156,11 @@ if rebased: strippoints = [ c.node() for c in repo.set('roots(%ld)', rebased)] - shouldupdate = len([ - c.node() for c in repo.set('. & (%ld)', rebased)]) > 0 + + updateifonnodes = set(rebased) + updateifonnodes.add(target) + updateifonnodes.add(originalwd) + shouldupdate = repo['.'].rev() in updateifonnodes # Update away from the rebase if necessary if shouldupdate or needupdate(repo, state):