martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-21 18:58:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

refs: rename RefTarget::as_conflict() to as_merge()

Browse Source 
Follows up ecc030848d. It's also nice that we have more distinction between
has_conflict() ans as_merge().
This commit is contained in:
Yuya Nishihara 2023-08-07 07:10:07 +09:00
parent b9b285c985
commit 2619200657
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/op_store.rs
View File

@ -127,7 +127,7 @@ impl RefTarget {
self.merge.adds().iter().flatten()
}
pub fn as_conflict(&self) -> &Merge<Option<CommitId>> {
pub fn as_merge(&self) -> &Merge<Option<CommitId>> {
&self.merge
}
}

4
lib/src/refs.rs
View File

@ -30,8 +30,8 @@ pub fn merge_ref_targets(
}
let merge = Merge::new(
vec![base.as_conflict().clone()],
vec![left.as_conflict().clone(), right.as_conflict().clone()],
vec![base.as_merge().clone()],
vec![left.as_merge().clone(), right.as_merge().clone()],
)
.flatten()
.simplify();

6
lib/src/simple_op_store.rs
View File

@ -361,10 +361,10 @@ fn ref_target_to_proto(value: &RefTarget) -> Option<crate::protos::op_store::Ref
let term_to_proto = |term: &Option<CommitId>| crate::protos::op_store::ref_conflict::Term {
value: term.as_ref().map(|id| id.to_bytes()),
};
let conflict = value.as_conflict();
let merge = value.as_merge();
let conflict_proto = crate::protos::op_store::RefConflict {
removes: conflict.removes().iter().map(term_to_proto).collect(),
adds: conflict.adds().iter().map(term_to_proto).collect(),
removes: merge.removes().iter().map(term_to_proto).collect(),
adds: merge.adds().iter().map(term_to_proto).collect(),
};
let proto = crate::protos::op_store::RefTarget {
value: Some(crate::protos::op_store::ref_target::Value::Conflict(