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

merge tools: rename variable to make diff for the next commit simpler

Browse source
This commit is contained in:
Ilya Grigoriev 2024-03-15 17:40:00 -07:00
parent 429cdb38d7
commit 6a63c705aa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cli/src/merge_tools/diff_working_copies.rs
View file

@ -203,17 +203,17 @@ pub fn check_out_trees_for_diffedit(
let output_wc_path = diff_wc let output_wc_path = diff_wc
.output_working_copy_path() .output_working_copy_path()
.unwrap_or_else(|| diff_wc.right_working_copy_path()); .unwrap_or_else(|| diff_wc.right_working_copy_path());
let instructions_path_to_cleanup = output_wc_path.join("JJ-INSTRUCTIONS"); let output_instructions_path = output_wc_path.join("JJ-INSTRUCTIONS");
// In the unlikely event that the file already exists, then the user will simply // In the unlikely event that the file already exists, then the user will simply
// not get any instructions. // not get any instructions.
let add_instructions = if !instructions_path_to_cleanup.exists() { let add_instructions = if !output_instructions_path.exists() {
instructions instructions
} else { } else {
None None
}; };
if let Some(instructions) = add_instructions { if let Some(instructions) = add_instructions {
let mut output_instructions_file = let mut output_instructions_file =
File::create(&instructions_path_to_cleanup).map_err(ExternalToolError::SetUpDir)?; File::create(&output_instructions_path).map_err(ExternalToolError::SetUpDir)?;
if diff_wc.right_working_copy_path() != output_wc_path { if diff_wc.right_working_copy_path() != output_wc_path {
let mut right_instructions_file = let mut right_instructions_file =
File::create(diff_wc.right_working_copy_path().join("JJ-INSTRUCTIONS")) File::create(diff_wc.right_working_copy_path().join("JJ-INSTRUCTIONS"))
@ -252,7 +252,7 @@ diff editing in mind and be a little inaccurate.
output_instructions_file output_instructions_file
.write_all(instructions.as_bytes()) .write_all(instructions.as_bytes())
.map_err(ExternalToolError::SetUpDir)?; .map_err(ExternalToolError::SetUpDir)?;
diff_wc.instructions_path_to_cleanup = Some(instructions_path_to_cleanup); diff_wc.instructions_path_to_cleanup = Some(output_instructions_path);
} }
Ok(diff_wc) Ok(diff_wc)