revset: parameterize special "git" remote that is ignored by default

The default remote parameter of remote_bookmarks() will be derived from this
parameter. It doesn't make sense to exclude @git bookmarks if the backend isn't
Git. It's also nice that parsing tests don't depend on the feature flag.

Author: yuja

cli/src/cli_util.rs

@@ -83,6 +83,7 @@ use jj_lib::op_walk::OpsetEvaluationError;
 use jj_lib::operation::Operation;
 use jj_lib::ref_name::RefName;
 use jj_lib::ref_name::RefNameBuf;
+use jj_lib::ref_name::RemoteName;
 use jj_lib::ref_name::WorkspaceName;
 use jj_lib::ref_name::WorkspaceNameBuf;
 use jj_lib::repo::CheckOutCommitError;
@@ -115,6 +116,7 @@ use jj_lib::revset::UserRevsetExpression;
 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::StringMatcher;
 use jj_lib::str_util::StringPattern;
 use jj_lib::transaction::Transaction;
@@ -782,6 +784,7 @@ pub struct WorkspaceCommandEnvironment {
     settings: UserSettings,
     revset_aliases_map: RevsetAliasesMap,
     template_aliases_map: TemplateAliasesMap,
+    default_ignored_remote: Option<&'static RemoteName>,
     path_converter: RepoPathUiConverter,
     workspace_name: WorkspaceNameBuf,
     immutable_heads_expression: Arc<UserRevsetExpression>,
@@ -795,6 +798,7 @@ impl WorkspaceCommandEnvironment {
         let settings = workspace.settings();
         let revset_aliases_map = revset_util::load_revset_aliases(ui, settings.config())?;
         let template_aliases_map = load_template_aliases(ui, settings.config())?;
+        let default_ignored_remote = default_ignored_remote_name(workspace.repo_loader().store());
         let path_converter = RepoPathUiConverter::Fs {
             cwd: command.cwd().to_owned(),
             base: workspace.workspace_root().to_owned(),
@@ -804,6 +808,7 @@ impl WorkspaceCommandEnvironment {
             settings: settings.clone(),
             revset_aliases_map,
             template_aliases_map,
+            default_ignored_remote,
             path_converter,
             workspace_name: workspace.workspace_name().to_owned(),
             immutable_heads_expression: RevsetExpression::root(),
@@ -840,6 +845,7 @@ impl WorkspaceCommandEnvironment {
             local_variables: HashMap::new(),
             user_email: self.settings.user_email(),
             date_pattern_context: now.into(),
+            default_ignored_remote: self.default_ignored_remote,
             extensions: self.command.revset_extensions(),
             workspace: Some(workspace_context),
         }
@@ -2867,6 +2873,19 @@ pub fn update_working_copy(
     Ok(stats)
 }
 
+/// Returns the special remote name that should be ignored by default.
+pub fn default_ignored_remote_name(store: &Store) -> Option<&'static RemoteName> {
+    #[cfg(feature = "git")]
+    {
+        use jj_lib::git;
+        if git::get_git_backend(store).is_ok() {
+            return Some(git::REMOTE_NAME_FOR_LOCAL_GIT_REPO);
+        }
+    }
+    let _ = store;
+    None
+}
+
 /// 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 {

cli/src/commit_templater.rs

@@ -2768,6 +2768,7 @@ mod tests {
                 local_variables: HashMap::new(),
                 user_email: "[email protected]",
                 date_pattern_context: chrono::DateTime::UNIX_EPOCH.fixed_offset().into(),
+                default_ignored_remote: None,
                 extensions: &self.revset_extensions,
                 workspace: Some(RevsetWorkspaceContext {
                     path_converter: &self.path_converter,

lib/src/revset.rs

@@ -44,6 +44,7 @@ use crate::object_id::PrefixResolution;
 use crate::op_store::RefTarget;
 use crate::op_store::RemoteRefState;
 use crate::op_walk;
+use crate::ref_name::RemoteName;
 use crate::ref_name::RemoteRefSymbol;
 use crate::ref_name::RemoteRefSymbolBuf;
 use crate::ref_name::WorkspaceName;
@@ -3381,6 +3382,8 @@ pub struct RevsetParseContext<'a> {
     pub local_variables: HashMap<&'a str, ExpressionNode<'a>>,
     pub user_email: &'a str,
     pub date_pattern_context: DatePatternContext,
+    /// Special remote that should be ignored by default. (e.g. "git")
+    pub default_ignored_remote: Option<&'a RemoteName>,
     pub extensions: &'a RevsetExtensions,
     pub workspace: Option<RevsetWorkspaceContext<'a>>,
 }
@@ -3392,6 +3395,7 @@ impl<'a> RevsetParseContext<'a> {
             local_variables: _,
             user_email,
             date_pattern_context,
+            default_ignored_remote: _,
             extensions,
             workspace,
         } = *self;
@@ -3495,6 +3499,7 @@ mod tests {
             local_variables: HashMap::new(),
             user_email: "[email protected]",
             date_pattern_context: chrono::Utc::now().fixed_offset().into(),
+            default_ignored_remote: Some("ignored".as_ref()),
             extensions: &RevsetExtensions::default(),
             workspace: None,
         };
@@ -3524,6 +3529,7 @@ mod tests {
             local_variables: HashMap::new(),
             user_email: "[email protected]",
             date_pattern_context: chrono::Utc::now().fixed_offset().into(),
+            default_ignored_remote: Some("ignored".as_ref()),
             extensions: &RevsetExtensions::default(),
             workspace: Some(workspace_ctx),
         };
@@ -3549,6 +3555,7 @@ mod tests {
             local_variables: HashMap::new(),
             user_email: "[email protected]",
             date_pattern_context: chrono::Utc::now().fixed_offset().into(),
+            default_ignored_remote: Some("ignored".as_ref()),
             extensions: &RevsetExtensions::default(),
             workspace: None,
         };

lib/tests/test_revset.rs

@@ -96,6 +96,7 @@ fn resolve_symbol(repo: &dyn Repo, symbol: &str) -> Result<Vec<CommitId>, Revset
         local_variables: HashMap::new(),
         user_email: "",
         date_pattern_context: chrono::Local::now().into(),
+        default_ignored_remote: Some(git::REMOTE_NAME_FOR_LOCAL_GIT_REPO),
         extensions: &RevsetExtensions::default(),
         workspace: None,
     };
@@ -228,6 +229,7 @@ fn test_resolve_symbol_commit_id() {
         local_variables: HashMap::new(),
         user_email: settings.user_email(),
         date_pattern_context: chrono::Utc::now().fixed_offset().into(),
+        default_ignored_remote: Some(git::REMOTE_NAME_FOR_LOCAL_GIT_REPO),
         extensions: &RevsetExtensions::default(),
         workspace: None,
     };
@@ -1017,6 +1019,7 @@ fn try_resolve_expression(
         local_variables: HashMap::new(),
         user_email: settings.user_email(),
         date_pattern_context: chrono::Utc::now().fixed_offset().into(),
+        default_ignored_remote: Some(git::REMOTE_NAME_FOR_LOCAL_GIT_REPO),
         extensions: &RevsetExtensions::default(),
         workspace: None,
     };
@@ -1066,6 +1069,7 @@ fn resolve_commit_ids_in_workspace(
         local_variables: HashMap::new(),
         user_email: settings.user_email(),
         date_pattern_context: chrono::Utc::now().fixed_offset().into(),
+        default_ignored_remote: Some(git::REMOTE_NAME_FOR_LOCAL_GIT_REPO),
         extensions: &RevsetExtensions::default(),
         workspace: Some(workspace_ctx),
     };