mirror of
https://github.com/zoriya/jj.nvim.git
synced 2026-08-07 03:36:16 +00:00
Nicolas GBandGitHub
7fc91fe6d2
Add first-class conflict resolution support to jj.nvim.
- add `jj.cmd.resolve` to run `jj resolve` in a floating terminal or via an
external tool
- add `:J resolve` with support for `-r/--revision`, `--tool`,
`--external/--ext`, and positional filesets
- integrate resolve into the log buffer with the `gr` mapping and optional
`resolve_strategies` picker
- add `utils.is_change_conflicted()` and avoid opening resolve when the
selected revision has no conflicts
- document resolve usage, config, and keymaps in the README
- add tests for resolve arg parsing and conflict detection helpers
68 lines
1.7 KiB
Lua
68 lines
1.7 KiB
Lua
local M = {}
|
|
|
|
local utils = require("jj.utils")
|
|
local terminal = require("jj.ui.terminal")
|
|
local runner = require("jj.core.runner")
|
|
|
|
--- Resolve conflicts in the current change.
|
|
--- @param opts? jj.cmd.resolve.opts
|
|
function M.resolve(opts)
|
|
opts = vim.tbl_deep_extend("force", {}, opts or {}) --[[@as jj.cmd.resolve.opts]]
|
|
local rev = opts.rev or "@"
|
|
local filesets = opts.filesets or {}
|
|
local args = opts.args or {}
|
|
|
|
if not utils.ensure_jj() then
|
|
return
|
|
end
|
|
|
|
local cmd_args = { "jj", "resolve", "--revision", rev }
|
|
-- Extra arguments
|
|
vim.list_extend(cmd_args, args)
|
|
-- Append the filestes
|
|
vim.list_extend(cmd_args, filesets)
|
|
|
|
local escaped_cmd_args = {}
|
|
for _, arg in ipairs(cmd_args) do
|
|
table.insert(escaped_cmd_args, vim.fn.shellescape(arg))
|
|
end
|
|
local cmd = table.concat(escaped_cmd_args, " ")
|
|
|
|
utils.notify(string.format("Resolving conflicts in change `%s`...", rev), vim.log.levels.INFO)
|
|
|
|
-- If external is set, run the command asynchronously and invoke the on_exit callback if provided
|
|
if opts.external then
|
|
-- Run the command asynchronously and notify the user of the result
|
|
runner.execute_command_async(
|
|
cmd,
|
|
function(output)
|
|
if output and output ~= "" then
|
|
utils.notify(output, vim.log.levels.INFO)
|
|
end
|
|
if opts.on_exit then
|
|
opts.on_exit(0)
|
|
end
|
|
end,
|
|
string.format("Could not resolve conflicts in `%s`", rev),
|
|
nil,
|
|
nil,
|
|
function()
|
|
if opts.on_exit then
|
|
opts.on_exit(1)
|
|
end
|
|
end
|
|
)
|
|
else
|
|
-- Otherwise, run in a floating terminal
|
|
terminal.run_floating(cmd, nil, {
|
|
title = " JJ Resolve ",
|
|
modifiable = true,
|
|
keep_modifiable = true,
|
|
interactive = true,
|
|
on_exit = opts.on_exit or nil,
|
|
})
|
|
end
|
|
end
|
|
|
|
return M
|