jj/src
Martin von Zweigbergk 0aa738a518 view: add support for conflicting git refs in the model
This adds support for having conflicting git refs in the view, but we
never create conflicts yet. The `git_refs()` revset includes all "add"
sides of any conflicts. Similarly `origin/main` (for example) resolves
to all "adds" if it's conflicted (meaning that `jj co origin/main` and
many other commands will error out if `origin/main` is
conflicted). The `git_refs` template renders the reference for all
"adds" and adds a "?" as suffix for conflicted refs.

The reason I'm adding this now is not because it's high priority on
its own (it's likely extremely uncommon to run two concurrent `jj git
refresh` and *also* update refs in the underlying git repo at the same
time) but because it's a building block for the branch support I've
planned (issue ).
2021-07-24 19:01:56 -07:00
..
commands.rs
diff_edit.rs
formatter.rs
graphlog.rs
lib.rs
main.rs
template.pest
template_parser.rs
templater.rs view: add support for conflicting git refs in the model 2021-07-24 19:01:56 -07:00
testutils.rs
ui.rs