History

commit: migrate remaining uses of `Commit::tree_id()` and delete it

Martin von Zweigbergk committed 3 years ago

Commit dc06bbc1 parent 7bfd4395 files · +13 −12Browse files

Showing the changes to lib/src/commit.rs (1 of 5 files). Show all

Unified · Split

lib/src/commit.rs+2−8
@@ -20,7 +20,7 @@ use std::hash::{Hash, Hasher}; · 19 unmodified lines
20use std::sync::Arc;20use std::sync::Arc;
21 21
22use crate::backend;22use crate::backend;
23use crate::backend::{BackendError, ChangeId, CommitId, MergedTreeId, Signature, TreeId};23use crate::backend::{BackendError, ChangeId, CommitId, MergedTreeId, Signature};
24use crate::merged_tree::MergedTree;24use crate::merged_tree::MergedTree;
25use crate::repo_path::RepoPath;25use crate::repo_path::RepoPath;
26use crate::store::Store;26use crate::store::Store;
@@ -113,12 +113,6 @@ impl Commit { · 86 unmodified lines
113 self.store.get_root_tree(&self.data.root_tree)113 self.store.get_root_tree(&self.data.root_tree)
114 }114 }
115 115
116 // TODO(#1624): delete when all callers have been updated to support tree-level
117 // conflicts
118 pub fn tree_id(&self) -> &TreeId {
119 self.data.root_tree.as_legacy_tree_id()
120 }
121
122 pub fn merged_tree_id(&self) -> &MergedTreeId {116 pub fn merged_tree_id(&self) -> &MergedTreeId {
123 &self.data.root_tree117 &self.data.root_tree
124 }118 }
@@ -148,7 +142,7 @@ impl Commit { · 23 unmodified lines
148 pub fn is_discardable(&self) -> bool {142 pub fn is_discardable(&self) -> bool {
149 if self.description().is_empty() {143 if self.description().is_empty() {
150 if let [parent_commit] = &*self.parents() {144 if let [parent_commit] = &*self.parents() {
151 return self.tree_id() == parent_commit.tree_id();145 return self.merged_tree_id() == parent_commit.merged_tree_id();
152 }146 }
153 }147 }
154 false148 false