mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-14 16:37:42 +00:00
cli: make *Args::tool
fields non-public, except for DiffFormatArgs
Probably just a bad copy&paste.
This commit is contained in:
parent
cd3d75ebf6
commit
ea5a208ca5
7 changed files with 7 additions and 7 deletions
|
@ -33,7 +33,7 @@ pub(crate) struct CommitArgs {
|
|||
interactive: bool,
|
||||
/// Specify diff editor to be used (implies --interactive)
|
||||
#[arg(long, value_name = "NAME")]
|
||||
pub tool: Option<String>,
|
||||
tool: Option<String>,
|
||||
/// The change description to use (don't open editor)
|
||||
#[arg(long = "message", short, value_name = "MESSAGE")]
|
||||
message_paragraphs: Vec<String>,
|
||||
|
|
|
@ -53,7 +53,7 @@ pub(crate) struct DiffeditArgs {
|
|||
to: Option<RevisionArg>,
|
||||
/// Specify diff editor to be used
|
||||
#[arg(long, value_name = "NAME")]
|
||||
pub tool: Option<String>,
|
||||
tool: Option<String>,
|
||||
}
|
||||
|
||||
#[instrument(skip_all)]
|
||||
|
|
|
@ -52,7 +52,7 @@ pub(crate) struct MoveArgs {
|
|||
interactive: bool,
|
||||
/// Specify diff editor to be used (implies --interactive)
|
||||
#[arg(long, value_name = "NAME")]
|
||||
pub tool: Option<String>,
|
||||
tool: Option<String>,
|
||||
/// Move only changes to these paths (instead of all paths)
|
||||
#[arg(conflicts_with_all = ["interactive", "tool"], value_hint = clap::ValueHint::AnyPath)]
|
||||
paths: Vec<String>,
|
||||
|
|
|
@ -57,7 +57,7 @@ pub(crate) struct ResolveArgs {
|
|||
quiet: bool,
|
||||
/// Specify 3-way merge tool to be used
|
||||
#[arg(long, conflicts_with = "list", value_name = "NAME")]
|
||||
pub tool: Option<String>,
|
||||
tool: Option<String>,
|
||||
/// Restrict to these paths when searching for a conflict to resolve. We
|
||||
/// will attempt to resolve the first conflict we can find. You can use
|
||||
/// the `--list` argument to find paths to use here.
|
||||
|
|
|
@ -43,7 +43,7 @@ pub(crate) struct SplitArgs {
|
|||
interactive: bool,
|
||||
/// Specify diff editor to be used (implies --interactive)
|
||||
#[arg(long, value_name = "NAME")]
|
||||
pub tool: Option<String>,
|
||||
tool: Option<String>,
|
||||
/// The revision to split
|
||||
#[arg(long, short, default_value = "@")]
|
||||
revision: RevisionArg,
|
||||
|
|
|
@ -47,7 +47,7 @@ pub(crate) struct SquashArgs {
|
|||
interactive: bool,
|
||||
/// Specify diff editor to be used (implies --interactive)
|
||||
#[arg(long, value_name = "NAME")]
|
||||
pub tool: Option<String>,
|
||||
tool: Option<String>,
|
||||
/// Move only changes to these paths (instead of all paths)
|
||||
#[arg(conflicts_with_all = ["interactive", "tool"], value_hint = clap::ValueHint::AnyPath)]
|
||||
paths: Vec<String>,
|
||||
|
|
|
@ -46,7 +46,7 @@ pub(crate) struct UnsquashArgs {
|
|||
interactive: bool,
|
||||
/// Specify diff editor to be used (implies --interactive)
|
||||
#[arg(long, value_name = "NAME")]
|
||||
pub tool: Option<String>,
|
||||
tool: Option<String>,
|
||||
}
|
||||
|
||||
#[instrument(skip_all)]
|
||||
|
|
Loading…
Reference in a new issue