git: replace remaining users of is_special_git_remote()

We no longer need jj-lib functions.

Author: yuja

cli/src/cli_util.rs

@@ -117,10 +117,10 @@ use jj_lib::rewrite::restore_tree;
 use jj_lib::settings::HumanByteSize;
 use jj_lib::settings::UserSettings;
 use jj_lib::store::Store;
+use jj_lib::str_util::StringExpression;
 use jj_lib::str_util::StringMatcher;
 use jj_lib::str_util::StringPattern;
 use jj_lib::transaction::Transaction;
-use jj_lib::view::View;
 use jj_lib::working_copy;
 use jj_lib::working_copy::CheckoutStats;
 use jj_lib::working_copy::SnapshotOptions;
@@ -2888,9 +2888,13 @@ pub fn default_ignored_remote_name(store: &Store) -> Option<&'static RemoteName>
 
 /// Whether or not the `bookmark` has any tracked remotes (i.e. is a tracking
 /// local bookmark.)
-pub fn has_tracked_remote_bookmarks(view: &View, bookmark: &RefName) -> bool {
-    view.remote_bookmarks_matching(&StringMatcher::exact(bookmark), &StringMatcher::all())
-        .filter(|&(symbol, _)| !jj_lib::git::is_special_git_remote(symbol.remote))
+pub fn has_tracked_remote_bookmarks(repo: &dyn Repo, bookmark: &RefName) -> bool {
+    let remote_matcher = match default_ignored_remote_name(repo.store()) {
+        Some(remote) => StringExpression::exact(remote).negated().to_matcher(),
+        None => StringMatcher::all(),
+    };
+    repo.view()
+        .remote_bookmarks_matching(&StringMatcher::exact(bookmark), &remote_matcher)
         .any(|(_, remote_ref)| remote_ref.is_tracked())
 }
 

cli/src/commands/abandon.rs

@@ -184,10 +184,10 @@ pub(crate) fn cmd_abandon(
 
     #[cfg(feature = "git")]
     if jj_lib::git::get_git_backend(workspace_command.repo().store()).is_ok() {
-        let view = workspace_command.repo().view();
+        let repo = workspace_command.repo().as_ref();
         if deleted_bookmarks
             .iter()
-            .any(|name| has_tracked_remote_bookmarks(view, name))
+            .any(|name| has_tracked_remote_bookmarks(repo, name))
         {
             writeln!(
                 ui.hint_default(),

cli/src/commands/bookmark/create.rs

@@ -62,7 +62,7 @@ pub fn cmd_bookmark_create(
                 "Use `jj bookmark set` to update it.",
             ));
         }
-        if has_tracked_remote_bookmarks(view, name) {
+        if has_tracked_remote_bookmarks(repo, name) {
             return Err(user_error_with_hint(
                 format!(
                     "Tracked remote bookmarks exist for deleted bookmark: {name}",

cli/src/commands/bookmark/forget.rs

@@ -18,11 +18,13 @@ use jj_lib::op_store::LocalRemoteRefTarget;
 use jj_lib::op_store::RefTarget;
 use jj_lib::op_store::RemoteRef;
 use jj_lib::ref_name::RefName;
+use jj_lib::repo::Repo as _;
 use jj_lib::str_util::StringPattern;
 use jj_lib::view::View;
 
 use super::find_bookmarks_with;
 use crate::cli_util::CommandHelper;
+use crate::cli_util::default_ignored_remote_name;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;
@@ -65,6 +67,7 @@ pub fn cmd_bookmark_forget(
 ) -> Result<(), CommandError> {
     let mut workspace_command = command.workspace_helper(ui)?;
     let repo = workspace_command.repo().clone();
+    let ignored_remote = default_ignored_remote_name(repo.store());
     let matched_bookmarks = find_forgettable_bookmarks(repo.view(), &args.names)?;
     let mut tx = workspace_command.start_transaction();
     let mut forgotten_remote: usize = 0;
@@ -82,7 +85,7 @@ pub fn cmd_bookmark_forget(
                 continue;
             }
             // Git-tracking remote bookmarks cannot be untracked currently, so skip them
-            if jj_lib::git::is_special_git_remote(symbol.remote) {
+            if ignored_remote.is_some_and(|ignored| symbol.remote == ignored) {
                 continue;
             }
             tx.repo_mut().untrack_remote_bookmark(symbol);

cli/src/commands/bookmark/list.rs

@@ -32,6 +32,7 @@ use jj_lib::str_util::StringPattern;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RevisionArg;
+use crate::cli_util::default_ignored_remote_name;
 use crate::command_error::CommandError;
 use crate::commit_templater::CommitRef;
 use crate::complete;
@@ -185,6 +186,7 @@ pub fn cmd_bookmark_list(
             .labeled(["bookmark_list"])
     };
 
+    let ignored_tracked_remote = default_ignored_remote_name(repo.store());
     let mut bookmark_list_items: Vec<RefListItem> = Vec::new();
     let bookmarks_to_list = view.bookmarks().filter(|(name, target)| {
         bookmark_names_to_list
@@ -208,7 +210,9 @@ pub fn cmd_bookmark_list(
             .partition::<Vec<_>, _>(|&(_, remote_ref)| remote_ref.is_tracked());
 
         if args.tracked {
-            tracked_remote_refs.retain(|&(remote, _)| !jj_lib::git::is_special_git_remote(remote));
+            tracked_remote_refs.retain(|&(remote, _)| {
+                ignored_tracked_remote.is_none_or(|ignored| remote != ignored)
+            });
         } else if !args.all_remotes && args.remotes.is_none() {
             tracked_remote_refs.retain(|&(_, remote_ref)| remote_ref.target != *local_target);
         }
@@ -279,7 +283,7 @@ pub fn cmd_bookmark_list(
             .map(|item| {
                 item.tracked.iter().any(|r| {
                     let remote = r.remote_name().expect("tracked ref should be remote");
-                    !jj_lib::git::is_special_git_remote(remote.as_ref())
+                    ignored_tracked_remote.is_none_or(|ignored| remote != ignored)
                 })
             })
             .max();

cli/src/commands/bookmark/rename.rs

@@ -79,8 +79,8 @@ pub fn cmd_bookmark_rename(
         ),
     )?;
 
-    let view = workspace_command.repo().view();
-    if has_tracked_remote_bookmarks(view, old_bookmark) {
+    let repo = workspace_command.repo().as_ref();
+    if has_tracked_remote_bookmarks(repo, old_bookmark) {
         writeln!(
             ui.warning_default(),
             "Tracked remote bookmarks for bookmark {old_bookmark} were not renamed.",
@@ -95,7 +95,7 @@ pub fn cmd_bookmark_rename(
             new_bookmark = new_bookmark.as_symbol()
         )?;
     }
-    if has_tracked_remote_bookmarks(view, new_bookmark) {
+    if has_tracked_remote_bookmarks(repo, new_bookmark) {
         // This isn't an error because bookmark renaming can't be propagated to
         // the remote immediately. "rename old new && rename new old" should be
         // allowed even if the original old bookmark had tracked remotes.

cli/src/commands/bookmark/set.rs

@@ -70,7 +70,7 @@ pub fn cmd_bookmark_set(
         let old_target = repo.view().get_local_bookmark(name);
         // If a bookmark is absent locally but is still tracking remote bookmarks,
         // we are resurrecting the local bookmark, not "creating" a new bookmark.
-        if old_target.is_absent() && !has_tracked_remote_bookmarks(repo.view(), name) {
+        if old_target.is_absent() && !has_tracked_remote_bookmarks(repo, name) {
             new_bookmark_count += 1;
         } else if old_target.as_normal() != Some(target_commit.id()) {
             moved_bookmark_count += 1;

cli/src/commands/bookmark/untrack.rs

@@ -14,10 +14,12 @@
 
 use clap_complete::ArgValueCandidates;
 use itertools::Itertools as _;
+use jj_lib::repo::Repo as _;
 
 use super::find_trackable_remote_bookmarks;
 use crate::cli_util::CommandHelper;
 use crate::cli_util::RemoteBookmarkNamePattern;
+use crate::cli_util::default_ignored_remote_name;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::ui::Ui;
@@ -55,9 +57,10 @@ pub fn cmd_bookmark_untrack(
 ) -> Result<(), CommandError> {
     let mut workspace_command = command.workspace_helper(ui)?;
     let repo = workspace_command.repo().clone();
+    let ignored_remote = default_ignored_remote_name(repo.store());
     let mut symbols = Vec::new();
     for (symbol, remote_ref) in find_trackable_remote_bookmarks(repo.view(), &args.names)? {
-        if jj_lib::git::is_special_git_remote(symbol.remote) {
+        if ignored_remote.is_some_and(|ignored| symbol.remote == ignored) {
             // This restriction can be lifted if we want to support untracked @git
             // bookmarks.
             writeln!(

cli/src/commands/git/push.rs

@@ -815,9 +815,9 @@ fn classify_bookmark_update(
     }
 }
 
-fn ensure_new_bookmark_name(view: &View, name: &RefName) -> Result<(), CommandError> {
+fn ensure_new_bookmark_name(repo: &dyn Repo, name: &RefName) -> Result<(), CommandError> {
     let symbol = name.as_symbol();
-    if view.get_local_bookmark(name).is_present() {
+    if repo.view().get_local_bookmark(name).is_present() {
         return Err(user_error_with_hint(
             format!("Bookmark already exists: {symbol}"),
             format!(
@@ -826,7 +826,7 @@ fn ensure_new_bookmark_name(view: &View, name: &RefName) -> Result<(), CommandEr
             ),
         ));
     }
-    if has_tracked_remote_bookmarks(view, name) {
+    if has_tracked_remote_bookmarks(repo, name) {
         return Err(user_error_with_hint(
             format!("Tracked remote bookmarks exist for deleted bookmark: {symbol}"),
             format!(
@@ -868,7 +868,7 @@ fn create_explicitly_named_bookmarks(
         )
         .hinted(hint)
     })?;
-    ensure_new_bookmark_name(tx.repo().view(), &name)?;
+    ensure_new_bookmark_name(tx.repo(), &name)?;
     let revision = tx
         .base_workspace_helper()
         .resolve_single_rev(ui, &revision_str.to_string().into())?;
@@ -915,12 +915,11 @@ fn create_change_bookmarks(
 
     for (commit, name) in iter::zip(&all_commits, &bookmark_names) {
         let target = RefTarget::normal(commit.id().clone());
-        let view = tx.base_repo().view();
-        if view.get_local_bookmark(name) == &target {
+        if tx.base_repo().view().get_local_bookmark(name) == &target {
             // Existing bookmark pointing to the commit, which is allowed
             continue;
         }
-        ensure_new_bookmark_name(view, name)?;
+        ensure_new_bookmark_name(tx.base_repo().as_ref(), name)?;
         writeln!(
             ui.status(),
             "Creating bookmark {name} for revision {change_id:.12}",

cli/src/commands/operation/diff.rs

@@ -38,6 +38,7 @@ use pollster::FutureExt as _;
 
 use crate::cli_util::CommandHelper;
 use crate::cli_util::LogContentFormat;
+use crate::cli_util::default_ignored_remote_name;
 use crate::command_error::CommandError;
 use crate::complete;
 use crate::diff_util::DiffFormatArgs;
@@ -348,13 +349,14 @@ pub fn show_op_diff(
         writeln!(formatter)?;
     }
 
+    let ignored_remote = default_ignored_remote_name(current_repo.store());
     let changed_remote_bookmarks = diff_named_remote_refs(
         from_repo.view().all_remote_bookmarks(),
         to_repo.view().all_remote_bookmarks(),
     )
     // Skip updates to the local git repo, since they should typically be covered in
     // local branches.
-    .filter(|(symbol, _)| !jj_lib::git::is_special_git_remote(symbol.remote))
+    .filter(|(symbol, _)| ignored_remote.is_none_or(|ignored| symbol.remote != ignored))
     .collect_vec();
     if !changed_remote_bookmarks.is_empty() {
         writeln!(formatter)?;