abort: added support for merge
This adds support of `hg merge --abort` to `hg abort` plan. This involves refactoring `hg.merge` into two different functions removing the abort logic of `merge` from `hg.merge` and then creating a seperate `hg.abortmerge` to handle the abort logic so that the abortion of merge can be called independently. `hg.abortmerge` is then registered as `abortfunc` for the state detection API so that `commands.abort` can use it to deal with an unfinished merge operation. Results are shown as tests. Differential Revision: https://phab.mercurial-scm.org/D6588
Showing
- mercurial/commands.py 8 additions, 0 deletionsmercurial/commands.py
- mercurial/hg.py 21 additions, 17 deletionsmercurial/hg.py
- mercurial/state.py 0 additions, 7 deletionsmercurial/state.py
- tests/test-commit-unresolved.t 20 additions, 4 deletionstests/test-commit-unresolved.t
- tests/test-shelve2.t 9 additions, 4 deletionstests/test-shelve2.t
Loading
Please register or sign in to comment