##// END OF EJS Templates
merge: disallow merge abort in case of an unfinished operation (issue6160)...
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

File last commit:

r41021:4277e20c default
r42780:b8d54f46 default
Show More
Cargo.toml
34 lines | 629 B | application/toml | TOMLLexer
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 [package]
name = "hg-cpython"
version = "0.1.0"
authors = ["Georges Racinet <gracinet@anybox.fr>"]
[lib]
name='rusthg'
crate-type = ["cdylib"]
[features]
Georges Racinet
rust-cpython: build and support for Python3...
r41021 default = ["python27"]
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
Georges Racinet
rust-cpython: build and support for Python3...
r41021 python27 = ["cpython/python27-sys",
"cpython/extension-module-2-7",
"python27-sys",
]
python3 = ["python3-sys", "cpython/python3-sys", "cpython/extension-module"]
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
[dependencies]
hg-core = { path = "../hg-core" }
libc = '*'
[dependencies.cpython]
version = "*"
default-features = false
[dependencies.python27-sys]
version = "0.2.1"
optional = true
[dependencies.python3-sys]
version = "0.2.1"
optional = true