protos: add conflict labels to working copy and simple backend

Author: scott2000

lib/src/local_working_copy.rs

@@ -68,6 +68,7 @@ use crate::backend::TreeId;
 use crate::backend::TreeValue;
 use crate::commit::Commit;
 use crate::config::ConfigGetError;
+use crate::conflict_labels::ConflictLabels;
 use crate::conflicts;
 use crate::conflicts::ConflictMarkerStyle;
 use crate::conflicts::ConflictMaterializeOptions;
@@ -977,7 +978,10 @@ impl TreeState {
                 .iter()
                 .map(|id| TreeId::new(id.clone()))
                 .collect();
-            self.tree_id = MergedTreeId::unlabeled(tree_ids_builder.build());
+            self.tree_id = MergedTreeId::new(
+                tree_ids_builder.build(),
+                ConflictLabels::from_vec(proto.conflict_labels),
+            );
         }
         self.file_states =
             FileStatesMap::from_proto(proto.file_states, proto.is_file_states_sorted);
@@ -995,6 +999,7 @@ impl TreeState {
             .iter()
             .map(|id| id.to_bytes())
             .collect();
+        proto.conflict_labels = self.tree_id.labels().as_slice().to_owned();
         proto.file_states = self.file_states.data.clone();
         // `FileStatesMap` is guaranteed to be sorted.
         proto.is_file_states_sorted = true;

lib/src/protos/local_working_copy.proto

@@ -51,6 +51,8 @@ message TreeState {
   // Alternating positive and negative terms if there's a conflict, otherwise a
   // single (positive) value
   repeated bytes tree_ids = 5;
+  // Labels for the terms of a conflict.
+  repeated string conflict_labels = 7;
   repeated FileStateEntry file_states = 2;
   bool is_file_states_sorted = 6;
   SparsePatterns sparse_patterns = 3;

lib/src/protos/local_working_copy.rs

@@ -37,6 +37,9 @@ pub struct TreeState {
     /// single (positive) value
     #[prost(bytes = "vec", repeated, tag = "5")]
     pub tree_ids: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// Labels for the terms of a conflict.
+    #[prost(string, repeated, tag = "7")]
+    pub conflict_labels: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[prost(message, repeated, tag = "2")]
     pub file_states: ::prost::alloc::vec::Vec<FileStateEntry>,
     #[prost(bool, tag = "6")]

lib/src/protos/simple_store.proto

@@ -44,6 +44,8 @@ message Commit {
   repeated bytes predecessors = 2;
   // Alternating positive and negative terms
   repeated bytes root_tree = 3;
+  // Labels for the terms of a conflict.
+  repeated string conflict_labels = 10;
   bytes change_id = 4;
   string description = 5;
 

lib/src/protos/simple_store.rs

@@ -49,6 +49,9 @@ pub struct Commit {
     /// Alternating positive and negative terms
     #[prost(bytes = "vec", repeated, tag = "3")]
     pub root_tree: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    /// Labels for the terms of a conflict.
+    #[prost(string, repeated, tag = "10")]
+    pub conflict_labels: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[prost(bytes = "vec", tag = "4")]
     pub change_id: ::prost::alloc::vec::Vec<u8>,
     #[prost(string, tag = "5")]

lib/src/simple_backend.rs

@@ -57,6 +57,7 @@ use crate::backend::Tree;
 use crate::backend::TreeId;
 use crate::backend::TreeValue;
 use crate::backend::make_root_commit;
+use crate::conflict_labels::ConflictLabels;
 use crate::content_hash::blake2b_hash;
 use crate::file_util::persist_content_addressed_temp_file;
 use crate::index::Index;
@@ -365,6 +366,7 @@ pub fn commit_to_proto(commit: &Commit) -> crate::protos::simple_store::Commit {
         .iter()
         .map(|id| id.to_bytes())
         .collect();
+    proto.conflict_labels = commit.root_tree.labels().as_slice().to_owned();
     proto.change_id = commit.change_id.to_bytes();
     proto.description = commit.description.clone();
     proto.author = Some(signature_to_proto(&commit.author));
@@ -383,7 +385,10 @@ fn commit_from_proto(mut proto: crate::protos::simple_store::Commit) -> Commit {
     let parents = proto.parents.into_iter().map(CommitId::new).collect();
     let predecessors = proto.predecessors.into_iter().map(CommitId::new).collect();
     let merge_builder: MergeBuilder<_> = proto.root_tree.into_iter().map(TreeId::new).collect();
-    let root_tree = MergedTreeId::unlabeled(merge_builder.build());
+    let root_tree = MergedTreeId::new(
+        merge_builder.build(),
+        ConflictLabels::from_vec(proto.conflict_labels),
+    );
     let change_id = ChangeId::new(proto.change_id);
     Commit {
         parents,