templater: make branches, tags, git_refs, and git_head return list type #2437

yuja · 2023-10-27T06:14:11Z

Checklist

If applicable:

I have updated CHANGELOG.md
I have updated the documentation (README.md, docs/, demos/)
I have updated the config schema (cli/src/config-schema.json)
I have added tests to cover my changes

I'm going to change list types to be implicitly cast to boolean. Exhaustive match will prevent future bugs.

I'm going to change "branches" to return a list instead of formatted string, and I don't think "if(branches, ..)" should be invalidated by that. Perhaps, a container type like String, Vec<T>, Option<T> can implement the cast.

I think this is just a remainder of 65de7cb "`jj log`: Change conflicted branches from `br?` to `br??`."

Both local and remote refs are backed by the same value type since we'll need some kind of runtime abstraction to represent "branches" keyword (which is a list of local + remote branches.) It's tedious to implement separate local/remote/both ref types. The "unsynced" flag is inverted just because the positive term is slightly easier to document.

I'm not going to change the default output, but this allows us to highlight or dim only the @Remote component.

cli/tests/test_commit_template.rs

yuja added 6 commits October 27, 2023 14:31

templater: match exhaustively in boolean cast function

f34aa01

I'm going to change list types to be implicitly cast to boolean. Exhaustive match will prevent future bugs.

templater: allow implicit list-to-boolean cast

3f264d2

I'm going to change "branches" to return a list instead of formatted string, and I don't think "if(branches, ..)" should be invalidated by that. Perhaps, a container type like String, Vec<T>, Option<T> can implement the cast.

templater: consistently use double ?? to denote conflicted refs

cd4d6c9

I think this is just a remainder of 65de7cb "`jj log`: Change conflicted branches from `br?` to `br??`."

templater: make branches, tags, git_refs, and git_head return list type

0f36fc8

I'm not going to change the default output, but this allows us to highlight or dim only the @Remote component.

templater: use "git" constant to build HEAD@git ref name

b6194f1

martinvonz approved these changes Oct 27, 2023

View reviewed changes

cli/tests/test_commit_template.rs Show resolved Hide resolved

yuja merged commit 817ca7f into jj-vcs:main Oct 27, 2023
14 checks passed

yuja deleted the push-zolnkrmluumw branch October 27, 2023 20:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

templater: make branches, tags, git_refs, and git_head return list type #2437

templater: make branches, tags, git_refs, and git_head return list type #2437

yuja commented Oct 27, 2023

templater: make branches, tags, git_refs, and git_head return list type #2437

templater: make branches, tags, git_refs, and git_head return list type #2437

Conversation

yuja commented Oct 27, 2023

Checklist