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

working_copy: extract file_states_to_proto() helper

Browse source 
Just minimizing the changes in the next commit. As we already have
file_states_from_proto(), it makes sense to extract the "to" function.
This commit is contained in:
Yuya Nishihara 2023-11-23 11:10:02 +09:00
parent 74c4ef32aa
commit 12cd657837
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/src/local_working_copy.rs
View file

@ -206,6 +206,20 @@ fn file_states_from_proto(
.collect() .collect()
} }
fn file_states_to_proto(
file_states: &BTreeMap<RepoPath, FileState>,
) -> Vec<crate::protos::working_copy::FileStateEntry> {
file_states
.iter()
.map(
|(path, state)| crate::protos::working_copy::FileStateEntry {
path: path.to_internal_file_string(),
state: Some(file_state_to_proto(state)),
},
)
.collect()
}
fn sparse_patterns_from_proto( fn sparse_patterns_from_proto(
proto: Option<&crate::protos::working_copy::SparsePatterns>, proto: Option<&crate::protos::working_copy::SparsePatterns>,
) -> Vec<RepoPath> { ) -> Vec<RepoPath> {
@ -466,16 +480,7 @@ impl TreeState {
} }
} }
proto.file_states = self proto.file_states = file_states_to_proto(&self.file_states);
.file_states
.iter()
.map(
|(path, state)| crate::protos::working_copy::FileStateEntry {
path: path.to_internal_file_string(),
state: Some(file_state_to_proto(state)),
},
)
.collect();
let mut sparse_patterns = crate::protos::working_copy::SparsePatterns::default(); let mut sparse_patterns = crate::protos::working_copy::SparsePatterns::default();
for path in &self.sparse_patterns { for path in &self.sparse_patterns {
sparse_patterns sparse_patterns