templates: Expose conflicted files in the template language #8183
+120
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 tasks
algmyr
force-pushed
the
algmyr/push-nokmyqrvmwmv
branch
from
63dc14a to
f65bf08
Compare
martinvonz
reviewed
Nov 30, 2025
jaredgrubb
reviewed
Nov 30, 2025
yuja
reviewed
Dec 1, 2025
algmyr
force-pushed
the
algmyr/push-nokmyqrvmwmv
branch
2 times, most recently
from
93e1a64 to
2662450
Compare
algmyr
force-pushed
the
algmyr/push-nokmyqrvmwmv
branch
from
2662450 to
c261ca9
Compare
yuja
approved these changes
Dec 2, 2025
| }, | ||
| ); | ||
| map.insert( | ||
| "num_conflict_sides", |
Contributor
There was a problem hiding this comment.
nit: I slightly prefer conflict_sides or conflict_side_count, but I don't feel strongly.
Another idea is to add added/removed_entries() -> List<TreeEntry>.
|
|
||
| // Merge with conflicts. | ||
| work_dir | ||
| .run_jj(["new", "description(left)", "description(right)"]) |
Contributor
There was a problem hiding this comment.
nit: use subject(glob:left) (it's equivalent to exact:left, but I'll remove glob: when it becomes the default.)
| let output = work_dir.run_jj([ | ||
| "log", | ||
| "-r", | ||
| "description(substring:\"left\")", |
Contributor
There was a problem hiding this comment.
nit: same here. subject(glob:left)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Will allow things like showing info about conflicted files in the log.
Should synergize well with #8184
Fixes: #7377
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)