##// END OF EJS Templates
abort: added support for merge...
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

File last commit:

r40323:7623199d default
r42803:3bc400cc default
Show More
Cargo.toml
20 lines | 501 B | text/plain | TOMLLexer
Yuya Nishihara
rust-chg: add project skeleton...
r40003 [package]
name = "chg"
version = "0.1.0"
authors = ["Yuya Nishihara <yuya@tcha.org>"]
description = "Client for Mercurial command server with cHg extension"
license = "GPL-2.0+"
[dependencies]
bytes = "0.4"
futures = "0.1"
libc = "0.2"
Yuya Nishihara
rust-chg: depend on log and tokio_timer...
r40323 log = { version = "0.4", features = ["std"] }
Yuya Nishihara
rust-chg: add project skeleton...
r40003 tokio = "0.1"
tokio-hglib = "0.2"
# TODO: "^0.2.3" once released. we need AsRawFd support.
tokio-process = { git = "https://github.com/alexcrichton/tokio-process" }
Yuya Nishihara
rust-chg: depend on log and tokio_timer...
r40323 tokio-timer = "0.2"
Yuya Nishihara
rust-chg: add project skeleton...
r40003
[build-dependencies]
cc = "1.0"