ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

merge_tools: rename MergeTool::Internal -> MergeTool::Builtin

Browse source 
The name we will expose to the user is `builtin`, so this changes the internal messaging to match that.
This commit is contained in:
Waleed Khan 2023-08-29 23:13:35 +02:00
parent e8239c7f4e
commit ccd67e8156
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/src/merge_tools/mod.rs
View file

@ -107,7 +107,7 @@ pub fn run_mergetool(
let editor = get_merge_tool_from_settings(ui, settings)?; let editor = get_merge_tool_from_settings(ui, settings)?;
match editor { match editor {
MergeTool::Internal => unimplemented!("run_mergetool with internal mergetool"), MergeTool::Builtin => unimplemented!("run_mergetool with builtin mergetool"),
MergeTool::External(editor) => external::run_mergetool_external( MergeTool::External(editor) => external::run_mergetool_external(
&editor, file_merge, content, repo_path, conflict, tree, &editor, file_merge, content, repo_path, conflict, tree,
), ),
@ -125,7 +125,7 @@ pub fn edit_diff(
// Start a diff editor on the two directories. // Start a diff editor on the two directories.
let editor = get_diff_editor_from_settings(ui, settings)?; let editor = get_diff_editor_from_settings(ui, settings)?;
match editor { match editor {
MergeTool::Internal => unimplemented!("run_mergetool with internal mergetool"), MergeTool::Builtin => unimplemented!("run_mergetool with builtin mergetool"),
MergeTool::External(editor) => edit_diff_external( MergeTool::External(editor) => edit_diff_external(
editor, editor,
left_tree, left_tree,
@ -139,7 +139,7 @@ pub fn edit_diff(
#[derive(Clone, Debug, Eq, PartialEq)] #[derive(Clone, Debug, Eq, PartialEq)]
pub enum MergeTool { pub enum MergeTool {
Internal, Builtin,
External(ExternalMergeTool), External(ExternalMergeTool),
} }