templater: add commit.local/remote_tags() methods for completeness

Author: yuja

CHANGELOG.md

@@ -62,6 +62,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 * New `jj tag set`/`delete` commands to create/update/delete tags locally.
   Updated tags will be exported to Git as lightweight tags.
 
+* New commit template keywords `local`/`remote_tags` to show only local/remote
+  tags. These keywords may be useful in non-colocated Git repositories where
+  local and exported `@git` tags can point to different revisions.
+
 ### Fixed bugs
 
 * `jj metaedit --author-timestamp` twice with the same value no longer

cli/src/commit_templater.rs

@@ -1073,14 +1073,8 @@ fn builtin_commit_methods<'repo>() -> CommitTemplateBuildMethodFnMap<'repo, Comm
                 .keyword_cache
                 .bookmarks_index(language.repo)
                 .clone();
-            let out_property = self_property.map(move |commit| {
-                index
-                    .get(commit.id())
-                    .iter()
-                    .filter(|commit_ref| commit_ref.is_local())
-                    .cloned()
-                    .collect_vec()
-            });
+            let out_property =
+                self_property.map(move |commit| collect_local_refs(index.get(commit.id())));
             Ok(out_property.into_dyn_wrapped())
         },
     );
@@ -1092,14 +1086,8 @@ fn builtin_commit_methods<'repo>() -> CommitTemplateBuildMethodFnMap<'repo, Comm
                 .keyword_cache
                 .bookmarks_index(language.repo)
                 .clone();
-            let out_property = self_property.map(move |commit| {
-                index
-                    .get(commit.id())
-                    .iter()
-                    .filter(|commit_ref| commit_ref.is_remote())
-                    .cloned()
-                    .collect_vec()
-            });
+            let out_property =
+                self_property.map(move |commit| collect_remote_refs(index.get(commit.id())));
             Ok(out_property.into_dyn_wrapped())
         },
     );
@@ -1113,6 +1101,26 @@ fn builtin_commit_methods<'repo>() -> CommitTemplateBuildMethodFnMap<'repo, Comm
             Ok(out_property.into_dyn_wrapped())
         },
     );
+    map.insert(
+        "local_tags",
+        |language, _diagnostics, _build_ctx, self_property, function| {
+            function.expect_no_arguments()?;
+            let index = language.keyword_cache.tags_index(language.repo).clone();
+            let out_property =
+                self_property.map(move |commit| collect_local_refs(index.get(commit.id())));
+            Ok(out_property.into_dyn_wrapped())
+        },
+    );
+    map.insert(
+        "remote_tags",
+        |language, _diagnostics, _build_ctx, self_property, function| {
+            function.expect_no_arguments()?;
+            let index = language.keyword_cache.tags_index(language.repo).clone();
+            let out_property =
+                self_property.map(move |commit| collect_remote_refs(index.get(commit.id())));
+            Ok(out_property.into_dyn_wrapped())
+        },
+    );
     map.insert(
         "git_refs",
         |language, _diagnostics, _build_ctx, self_property, function| {
@@ -1823,6 +1831,22 @@ fn collect_distinct_refs(commit_refs: &[Rc<CommitRef>]) -> Vec<Rc<CommitRef>> {
         .collect()
 }
 
+fn collect_local_refs(commit_refs: &[Rc<CommitRef>]) -> Vec<Rc<CommitRef>> {
+    commit_refs
+        .iter()
+        .filter(|commit_ref| commit_ref.is_local())
+        .cloned()
+        .collect()
+}
+
+fn collect_remote_refs(commit_refs: &[Rc<CommitRef>]) -> Vec<Rc<CommitRef>> {
+    commit_refs
+        .iter()
+        .filter(|commit_ref| commit_ref.is_remote())
+        .cloned()
+        .collect()
+}
+
 /// Wrapper to render ref/remote name in revset syntax.
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 #[serde(transparent)]

cli/tests/test_commit_template.rs

@@ -765,6 +765,16 @@ fn test_log_tags() {
     ◆  000000000000 (no tags)
     [EOF]
     ");
+
+    let template = r#"separate(" ", "L:", local_tags, "R:", remote_tags) ++ "\n""#;
+    let output = work_dir.run_jj(["log", "-rall()", "-T", template]);
+    insta::assert_snapshot!(output, @r"
+    @  L: R:
+    ◆  L: bar baz foo* R: bar@git
+    ◆  L: R: foo@git
+    ◆  L: R:
+    [EOF]
+    ");
 }
 
 #[test]

docs/templates.md

@@ -156,6 +156,8 @@ This type cannot be printed. The following methods are defined.
 * `.tags() -> List<CommitRef>`: Local and remote tags pointing to the commit. A
   tracked remote tag will be included only if its target is different from the
   local one.
+* `.local_tags() -> List<CommitRef>`: All local tags pointing to the commit.
+* `.remote_tags() -> List<CommitRef>`: All remote tags pointing to the commit.
 * `.git_refs() -> List<CommitRef>`
 * `.git_head() -> Boolean`: True for the Git `HEAD` commit.
 * `.divergent() -> Boolean`: True if the commit's change id corresponds to multiple