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

cli: replace use of backend::Conflict when listing paths with conflicts

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-05-31 17:06:57 -07:00 committed by Martin von Zweigbergk
parent 43c55fcbc9
commit 594734dbc9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/commands/mod.rs
View file

@ -2542,8 +2542,9 @@ 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 n_adds = conflict.adds.len(); let conflict = Conflict::from_backend_conflict(&conflict);
let sides = n_adds.max(conflict.removes.len() + 1); 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
@ -2560,9 +2561,9 @@ fn print_conflicted_paths(
// TODO: We might decide it's OK for `jj resolve` to ignore special files in the // TODO: We might decide it's OK for `jj resolve` to ignore special files in the
// `removes` of a conflict (see e.g. https://github.com/martinvonz/jj/pull/978). In // `removes` of a conflict (see e.g. https://github.com/martinvonz/jj/pull/978). In
// that case, `conflict.removes` should be removed below. // that case, `conflict.removes` should be removed below.
for object in itertools::chain(conflict.removes.iter(), conflict.adds.iter()) { for term in itertools::chain(conflict.removes().iter(), conflict.adds().iter()).flatten() {
seen_objects.insert( seen_objects.insert(
match object.value { match term {
TreeValue::File { TreeValue::File {
executable: false, .. executable: false, ..
} => continue, } => continue,