revset: do not ignore "git" remote if user pattern is specified

Since we can now express the default pattern as `remote=~exact:"git"`, we can
unblock queries matching the "git" remote.

Author: yuja

CHANGELOG.md

@@ -19,6 +19,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   - `core.watchman.register_snapshot_trigger`
   - `diff.format`
 
+* The `remote_bookmarks(remote=pattern)` revset now includes Git-tracking
+  bookmarks if the specified `pattern` matches `git`. The default is
+  `remote=~exact:"git"` as before.
+
 ### Deprecations
 
  * `jj bisect run --command <cmd>` is deprecated in favor of

cli/tests/test_git_import_export.rs

@@ -58,8 +58,10 @@ fn test_resolution_of_git_tracking_bookmarks() {
     a7f9930bb6d54ba39e6c254135b9bfe32041fea4 old_message
     [EOF]
     ");
-    // Can't be selected by remote_bookmarks()
-    insta::assert_snapshot!(query(r#"remote_bookmarks(exact:"main", exact:"git")"#), @"");
+    insta::assert_snapshot!(query(r#"remote_bookmarks(exact:"main", exact:"git")"#), @r"
+    a7f9930bb6d54ba39e6c254135b9bfe32041fea4 old_message
+    [EOF]
+    ");
 }
 
 #[test]

docs/revsets.md

@@ -268,8 +268,8 @@ revsets (expressions) as arguments.
   `main@origin` or `main@upstream`. If a bookmark is in a conflicted state, all
   its possible targets are included.
 
-  While Git-tracking bookmarks can be selected by `<name>@git`, these bookmarks
-  aren't included in `remote_bookmarks()`.
+  Git-tracking bookmarks are excluded by default. Use `remote=exact:"git"` or
+  `remote=glob:"*"` to select bookmarks including `@git` ones.
 
 * `tracked_remote_bookmarks([bookmark_pattern], [[remote=]remote_pattern])`: All
   targets of tracked remote bookmarks. Supports the same optional arguments as

lib/src/revset.rs

@@ -897,19 +897,34 @@ static BUILTIN_FUNCTION_MAP: LazyLock<HashMap<&str, RevsetFunction>> = LazyLock:
         };
         Ok(RevsetExpression::bookmarks(expr))
     });
-    map.insert("remote_bookmarks", |diagnostics, function, _context| {
-        parse_remote_bookmarks_arguments(diagnostics, function, None)
+    map.insert("remote_bookmarks", |diagnostics, function, context| {
+        parse_remote_bookmarks_arguments(
+            diagnostics,
+            function,
+            None,
+            context.default_ignored_remote,
+        )
     });
     map.insert(
         "tracked_remote_bookmarks",
-        |diagnostics, function, _context| {
-            parse_remote_bookmarks_arguments(diagnostics, function, Some(RemoteRefState::Tracked))
+        |diagnostics, function, context| {
+            parse_remote_bookmarks_arguments(
+                diagnostics,
+                function,
+                Some(RemoteRefState::Tracked),
+                context.default_ignored_remote,
+            )
         },
     );
     map.insert(
         "untracked_remote_bookmarks",
-        |diagnostics, function, _context| {
-            parse_remote_bookmarks_arguments(diagnostics, function, Some(RemoteRefState::New))
+        |diagnostics, function, context| {
+            parse_remote_bookmarks_arguments(
+                diagnostics,
+                function,
+                Some(RemoteRefState::New),
+                context.default_ignored_remote,
+            )
         },
     );
     map.insert("tags", |diagnostics, function, _context| {
@@ -1205,6 +1220,7 @@ fn parse_remote_bookmarks_arguments(
     diagnostics: &mut RevsetDiagnostics,
     function: &FunctionCallNode,
     remote_ref_state: Option<RemoteRefState>,
+    default_ignored_remote: Option<&RemoteName>,
 ) -> Result<Arc<UserRevsetExpression>, RevsetParseError> {
     let ([], [bookmark_opt_arg, remote_opt_arg]) =
         function.expect_named_arguments(&["", "remote"])?;
@@ -1215,6 +1231,8 @@ fn parse_remote_bookmarks_arguments(
     };
     let remote_expr = if let Some(remote_arg) = remote_opt_arg {
         expect_string_expression(diagnostics, remote_arg)?
+    } else if let Some(remote) = default_ignored_remote {
+        StringExpression::exact(remote).negated()
     } else {
         StringExpression::all()
     };
@@ -2869,7 +2887,6 @@ fn resolve_commit_ref(
             remote,
             remote_ref_state,
         } => {
-            // TODO: should we allow to select @git bookmarks explicitly?
             let bookmark_matcher = bookmark.to_matcher();
             let remote_matcher = remote.to_matcher();
             let commit_ids = repo
@@ -2878,7 +2895,6 @@ fn resolve_commit_ref(
                 .filter(|(_, remote_ref)| {
                     remote_ref_state.is_none_or(|state| remote_ref.state == state)
                 })
-                .filter(|&(symbol, _)| !crate::git::is_special_git_remote(symbol.remote))
                 .flat_map(|(_, remote_ref)| remote_ref.target.added_ids())
                 .cloned()
                 .collect();
@@ -3395,13 +3411,14 @@ impl<'a> RevsetParseContext<'a> {
             local_variables: _,
             user_email,
             date_pattern_context,
-            default_ignored_remote: _,
+            default_ignored_remote,
             extensions,
             workspace,
         } = *self;
         LoweringContext {
             user_email,
             date_pattern_context,
+            default_ignored_remote,
             extensions,
             workspace,
         }
@@ -3413,6 +3430,7 @@ impl<'a> RevsetParseContext<'a> {
 pub struct LoweringContext<'a> {
     user_email: &'a str,
     date_pattern_context: DatePatternContext,
+    default_ignored_remote: Option<&'a RemoteName>,
     extensions: &'a RevsetExtensions,
     workspace: Option<RevsetWorkspaceContext<'a>>,
 }
@@ -3796,7 +3814,7 @@ mod tests {
         CommitRef(
             RemoteBookmarks {
                 bookmark: Pattern(Substring("")),
-                remote: Pattern(Substring("")),
+                remote: NotIn(Pattern(Exact("ignored"))),
                 remote_ref_state: None,
             },
         )
@@ -3805,7 +3823,7 @@ mod tests {
         CommitRef(
             RemoteBookmarks {
                 bookmark: Pattern(Substring("")),
-                remote: Pattern(Substring("")),
+                remote: NotIn(Pattern(Exact("ignored"))),
                 remote_ref_state: Some(Tracked),
             },
         )
@@ -3814,7 +3832,7 @@ mod tests {
         CommitRef(
             RemoteBookmarks {
                 bookmark: Pattern(Substring("")),
-                remote: Pattern(Substring("")),
+                remote: NotIn(Pattern(Exact("ignored"))),
                 remote_ref_state: Some(New),
             },
         )

lib/tests/test_revset.rs

@@ -2579,7 +2579,7 @@ fn test_evaluate_expression_remote_bookmarks() {
         remote_symbol("bookmark2", "private"),
         normal_tracked_remote_ref(commit2.id()),
     );
-    // Git-tracking bookmarks aren't included
+    // Git-tracking bookmarks aren't included by default
     mut_repo.set_remote_bookmark(
         remote_symbol("bookmark", git::REMOTE_NAME_FOR_LOCAL_GIT_REPO),
         normal_tracked_remote_ref(commit_git_remote.id()),
@@ -2631,6 +2631,19 @@ fn test_evaluate_expression_remote_bookmarks() {
         ),
         vec![commit1.id().clone()]
     );
+    // Can get Git-tracking bookmarks by specifying the remote
+    assert_eq!(
+        resolve_commit_ids(mut_repo, "remote_bookmarks(remote=exact:'git')"),
+        vec![commit_git_remote.id().clone()]
+    );
+    assert_eq!(
+        resolve_commit_ids(mut_repo, "remote_bookmarks(remote=glob:'*')"),
+        vec![
+            commit_git_remote.id().clone(),
+            commit2.id().clone(),
+            commit1.id().clone(),
+        ]
+    );
     // Can filter bookmarks by tracked and untracked
     assert_eq!(
         resolve_commit_ids(mut_repo, "tracked_remote_bookmarks()"),