Mercurial > hg
comparison relnotes/next @ 42579:b8d54f4625cb
merge: disallow merge abort in case of an unfinished operation (issue6160)
This patch disallows `hg merge --abort` in case an operation of higher
precedence i.e unshelve, rebase, histedit are in unfinished states.
This is done so as to avoid partial abort of these operations in case
merge abort is called at an interrupted step.
The patch adds a `cmdutil.getunfinishedstate` function which checks
for operations under progress and returns a `statecheck` object for it.
Differential Revision: https://phab.mercurial-scm.org/D6607
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Tue, 09 Jul 2019 12:58:29 +0300 |
parents | 9f73620a65fe |
children | cba59b338976 |
comparison
equal
deleted
inserted
replaced
42578:9f73620a65fe | 42579:b8d54f4625cb |
---|---|
79 independently a state for a new operation can be registered using | 79 independently a state for a new operation can be registered using |
80 `addunfinished()` in `state` module. | 80 `addunfinished()` in `state` module. |
81 | 81 |
82 * `cmdutil.checkunfinished()` now includes detection for merge too. | 82 * `cmdutil.checkunfinished()` now includes detection for merge too. |
83 | 83 |
84 * merge abort has been disallowed in case an operation of higher | |
85 precedence is in progress to avoid cases of partial abort of | |
86 operations. | |
87 | |
84 * We used to automatically attempt to make extensions compatible with | 88 * We used to automatically attempt to make extensions compatible with |
85 Python 3 (by translating their source code while loading it). We no | 89 Python 3 (by translating their source code while loading it). We no |
86 longer do that. | 90 longer do that. |