From f5d0419384c123d6c468c823d1ce5d8e3ce5fff3 Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Mon, 3 Oct 2022 20:18:34 +0900
Subject: [PATCH] working_copy: return {operation_id, workspace_id} by
 reference

Let WorkspaceCommandHelper clone it. WorkspaceCommandHelper could return
workspace_id by reference, but doing that would introduce noisy .clone()
calls and lifetime mess.
---
 lib/src/working_copy.rs     | 10 +++++-----
 lib/src/workspace.rs        |  2 +-
 lib/tests/test_workspace.rs |  4 ++--
 src/cli_util.rs             |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/src/working_copy.rs b/lib/src/working_copy.rs
index a895b2630..20f842cdd 100644
--- a/lib/src/working_copy.rs
+++ b/lib/src/working_copy.rs
@@ -1050,12 +1050,12 @@ impl WorkingCopy {
         self.checkout_state.get_mut().unwrap()
     }
 
-    pub fn operation_id(&self) -> OperationId {
-        self.checkout_state().operation_id.clone()
+    pub fn operation_id(&self) -> &OperationId {
+        &self.checkout_state().operation_id
     }
 
-    pub fn workspace_id(&self) -> WorkspaceId {
-        self.checkout_state().workspace_id.clone()
+    pub fn workspace_id(&self) -> &WorkspaceId {
+        &self.checkout_state().workspace_id
     }
 
     fn tree_state(&self) -> &TreeState {
@@ -1101,7 +1101,7 @@ impl WorkingCopy {
         // TODO: It's expensive to reload the whole tree. We should first check if it
         // has changed.
         self.tree_state.take();
-        let old_operation_id = self.operation_id();
+        let old_operation_id = self.operation_id().clone();
         let old_tree_id = self.current_tree_id().clone();
 
         LockedWorkingCopy {
diff --git a/lib/src/workspace.rs b/lib/src/workspace.rs
index 4d8227b5d..bb1790887 100644
--- a/lib/src/workspace.rs
+++ b/lib/src/workspace.rs
@@ -207,7 +207,7 @@ impl Workspace {
         &self.workspace_root
     }
 
-    pub fn workspace_id(&self) -> WorkspaceId {
+    pub fn workspace_id(&self) -> &WorkspaceId {
         self.working_copy.workspace_id()
     }
 
diff --git a/lib/tests/test_workspace.rs b/lib/tests/test_workspace.rs
index 6f251b20e..2597f2867 100644
--- a/lib/tests/test_workspace.rs
+++ b/lib/tests/test_workspace.rs
@@ -73,7 +73,7 @@ fn test_init_additional_workspace(use_git: bool) {
         wc_commit.parent_ids(),
         vec![repo.store().root_commit_id().clone()]
     );
-    assert_eq!(ws2.workspace_id(), ws2_id);
+    assert_eq!(ws2.workspace_id(), &ws2_id);
     assert_eq!(
         *ws2.repo_path(),
         workspace.repo_path().canonicalize().unwrap()
@@ -82,7 +82,7 @@ fn test_init_additional_workspace(use_git: bool) {
     let same_workspace = Workspace::load(&settings, &ws2_root, &BackendFactories::default());
     assert!(same_workspace.is_ok());
     let same_workspace = same_workspace.unwrap();
-    assert_eq!(same_workspace.workspace_id(), ws2_id);
+    assert_eq!(same_workspace.workspace_id(), &ws2_id);
     assert_eq!(
         *same_workspace.repo_path(),
         workspace.repo_path().canonicalize().unwrap()
diff --git a/src/cli_util.rs b/src/cli_util.rs
index 55a0a3ce2..b6a55b973 100644
--- a/src/cli_util.rs
+++ b/src/cli_util.rs
@@ -364,7 +364,7 @@ impl WorkspaceCommandHelper {
             // If the Git HEAD has changed, abandon our old checkout and check out the new
             // Git HEAD.
             if new_git_head != old_git_head && new_git_head.is_some() {
-                let workspace_id = self.workspace.workspace_id();
+                let workspace_id = self.workspace_id();
                 let mut locked_working_copy = self.workspace.working_copy_mut().start_mutation();
                 if let Some(old_wc_commit_id) = self.repo.view().get_wc_commit_id(&workspace_id) {
                     tx.mut_repo()
@@ -470,7 +470,7 @@ impl WorkspaceCommandHelper {
     }
 
     pub fn workspace_id(&self) -> WorkspaceId {
-        self.workspace.workspace_id()
+        self.workspace.workspace_id().clone()
     }
 
     pub fn working_copy_shared_with_git(&self) -> bool {