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

simple_op_store: rewrite RefTarget deserialization to work with Option<_>

Browse source 
.unwrap() calls will be removed if we migrate RefTarget to new Conflict-based
type. Some of them were previously .unwrap_or_default(), but they would panic
anyway inside ref_target_from_proto().
This commit is contained in:
Yuya Nishihara 2023-07-12 22:11:50 +09:00
parent 75429293f2
commit d29b10a8dd
1 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/src/simple_op_store.rs
View file

@ -20,7 +20,6 @@ use std::fs;
use std::io::{ErrorKind, Write}; use std::io::{ErrorKind, Write};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use itertools::Itertools;
use prost::Message; use prost::Message;
use tempfile::{NamedTempFile, PersistError}; use tempfile::{NamedTempFile, PersistError};
@ -273,13 +272,13 @@ fn view_from_proto(proto: crate::protos::op_store::View) -> View {
} }
for branch_proto in proto.branches { for branch_proto in proto.branches {
let local_target = branch_proto.local_target.map(ref_target_from_proto); let local_target = ref_target_from_proto(branch_proto.local_target);
let mut remote_targets = BTreeMap::new(); let mut remote_targets = BTreeMap::new();
for remote_branch in branch_proto.remote_branches { for remote_branch in branch_proto.remote_branches {
remote_targets.insert( remote_targets.insert(
remote_branch.remote_name, remote_branch.remote_name,
ref_target_from_proto(remote_branch.target.unwrap_or_default()), ref_target_from_proto(remote_branch.target).unwrap(),
); );
} }
@ -295,26 +294,23 @@ fn view_from_proto(proto: crate::protos::op_store::View) -> View {
for tag_proto in proto.tags { for tag_proto in proto.tags {
view.tags.insert( view.tags.insert(
tag_proto.name, tag_proto.name,
ref_target_from_proto(tag_proto.target.unwrap_or_default()), ref_target_from_proto(tag_proto.target).unwrap(),
); );
} }
for git_ref in proto.git_refs { for git_ref in proto.git_refs {
if let Some(target) = git_ref.target { let target = if git_ref.target.is_some() {
view.git_refs ref_target_from_proto(git_ref.target)
.insert(git_ref.name, ref_target_from_proto(target));
} else { } else {
// Legacy format // Legacy format
view.git_refs.insert( RefTarget::normal(CommitId::new(git_ref.commit_id))
git_ref.name, };
RefTarget::Normal(CommitId::new(git_ref.commit_id)), view.git_refs.insert(git_ref.name, target.unwrap());
);
}
} }
#[allow(deprecated)] #[allow(deprecated)]
if let Some(git_head) = proto.git_head.as_ref() { if proto.git_head.is_some() {
view.git_head = Some(ref_target_from_proto(git_head.clone())); view.git_head = ref_target_from_proto(proto.git_head);
} else if !proto.git_head_legacy.is_empty() { } else if !proto.git_head_legacy.is_empty() {
view.git_head = RefTarget::normal(CommitId::new(proto.git_head_legacy)); view.git_head = RefTarget::normal(CommitId::new(proto.git_head_legacy));
} }
@ -347,19 +343,18 @@ fn ref_target_to_proto(value: Option<&RefTarget>) -> Option<crate::protos::op_st
} }
} }
fn ref_target_from_proto(proto: crate::protos::op_store::RefTarget) -> RefTarget { fn ref_target_from_proto(
maybe_proto: Option<crate::protos::op_store::RefTarget>,
) -> Option<RefTarget> {
let proto = maybe_proto?;
match proto.value.unwrap() { match proto.value.unwrap() {
crate::protos::op_store::ref_target::Value::CommitId(id) => { crate::protos::op_store::ref_target::Value::CommitId(id) => {
RefTarget::Normal(CommitId::new(id)) RefTarget::normal(CommitId::new(id))
} }
crate::protos::op_store::ref_target::Value::Conflict(conflict) => { crate::protos::op_store::ref_target::Value::Conflict(conflict) => {
let removes = conflict let removes = conflict.removes.into_iter().map(CommitId::new);
.removes let adds = conflict.adds.into_iter().map(CommitId::new);
.into_iter() RefTarget::from_legacy_form(removes, adds)
.map(CommitId::new)
.collect_vec();
let adds = conflict.adds.into_iter().map(CommitId::new).collect_vec();
RefTarget::Conflict { removes, adds }
} }
} }
} }