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

cli: simplify calculation of number of sides of conflict

Browse source 
The number of adds (including `None` terms) is now the number of
"sides".
This commit is contained in:
Martin von Zweigbergk 2023-06-06 15:03:06 -07:00 committed by Martin von Zweigbergk
parent 337544cf96
commit 4a0fa4d9a0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commands/mod.rs
View file

@ -2482,8 +2482,8 @@ fn print_conflicted_paths(
std::iter::zip(conflicts.iter(), formatted_paths) std::iter::zip(conflicts.iter(), formatted_paths)
{ {
let conflict = tree.store().read_conflict(repo_path, conflict_id)?; let conflict = tree.store().read_conflict(repo_path, conflict_id)?;
let sides = conflict.adds().len();
let n_adds = conflict.adds().iter().flatten().count(); let n_adds = conflict.adds().iter().flatten().count();
let sides = n_adds.max(conflict.removes().iter().flatten().count() + 1);
let deletions = sides - n_adds; let deletions = sides - n_adds;
let mut seen_objects = BTreeMap::new(); // Sort for consistency and easier testing let mut seen_objects = BTreeMap::new(); // Sort for consistency and easier testing