From d840610badd798c2c121f193a9e1bb88291eca24 Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Fri, 6 Oct 2023 01:49:16 +0900
Subject: [PATCH] view: rewrite set_branch() callers in tests, remove the
 method

I'm going to reorganize the underlying data structure, and set_branch() won't
be as simple as it is now.
---
 lib/src/repo.rs          |  4 ----
 lib/src/view.rs          |  4 ----
 lib/tests/test_revset.rs | 10 ++--------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lib/src/repo.rs b/lib/src/repo.rs
index 2705ff8f3..0e64212fa 100644
--- a/lib/src/repo.rs
+++ b/lib/src/repo.rs
@@ -983,10 +983,6 @@ impl MutableRepo {
         self.view.with_ref(|v| v.get_branch(name).cloned())
     }
 
-    pub fn set_branch(&mut self, name: String, target: BranchTarget) {
-        self.view_mut().set_branch(name, target);
-    }
-
     pub fn remove_branch(&mut self, name: &str) {
         self.view_mut().remove_branch(name);
     }
diff --git a/lib/src/view.rs b/lib/src/view.rs
index 13e450667..1fbaf3e70 100644
--- a/lib/src/view.rs
+++ b/lib/src/view.rs
@@ -152,10 +152,6 @@ impl View {
         self.data.branches.get(name)
     }
 
-    pub fn set_branch(&mut self, name: String, target: BranchTarget) {
-        self.data.branches.insert(name, target);
-    }
-
     pub fn remove_branch(&mut self, name: &str) {
         self.data.branches.remove(name);
     }
diff --git a/lib/tests/test_revset.rs b/lib/tests/test_revset.rs
index f76154c39..c51b1eb2b 100644
--- a/lib/tests/test_revset.rs
+++ b/lib/tests/test_revset.rs
@@ -26,7 +26,7 @@ use jj_lib::commit::Commit;
 use jj_lib::git;
 use jj_lib::git_backend::GitBackend;
 use jj_lib::index::{HexPrefix, PrefixResolution};
-use jj_lib::op_store::{BranchTarget, RefTarget, WorkspaceId};
+use jj_lib::op_store::{RefTarget, WorkspaceId};
 use jj_lib::repo::Repo;
 use jj_lib::repo_path::RepoPath;
 use jj_lib::revset::{
@@ -2869,13 +2869,7 @@ fn test_no_such_revision_suggestion() {
     let commit = write_random_commit(mut_repo, &settings);
 
     for branch_name in ["foo", "bar", "baz"] {
-        mut_repo.set_branch(
-            branch_name.to_string(),
-            BranchTarget {
-                local_target: RefTarget::normal(commit.id().clone()),
-                remote_targets: Default::default(),
-            },
-        );
+        mut_repo.set_local_branch_target(branch_name, RefTarget::normal(commit.id().clone()));
     }
 
     assert_matches!(resolve_symbol(mut_repo, "bar"), Ok(_));