1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this file,
// You can obtain one at http://mozilla.org/MPL/2.0/.
use crate::client::{Client, HglibError, Runner};
use crate::{runcommand, MkArg};
pub struct Arg<'a> {
pub rev: &'a str,
pub force: bool,
pub tool: &'a str,
}
impl<'a> Default for Arg<'a> {
fn default() -> Self {
Self {
rev: "",
force: false,
tool: "",
}
}
}
impl<'a> Arg<'a> {
fn run(&self, client: &mut Client) -> Result<(Vec<u8>, i32), HglibError> {
runcommand!(
client,
"merge",
&[""],
"-r",
self.rev,
"-f",
self.force,
"-t",
self.tool,
"-y",
true
)
}
}
impl Client {
pub fn merge(&mut self, x: Arg) -> Result<(), HglibError> {
x.run(self)?;
Ok(())
}
}