fix(commit): Migrate from simulated commit to jj's native command.

- This required some improvements on the editor buffer logic,
      introduced a `on_write` (previously on_done but it wasn't the
      right meaning) hook and an `on_unload` to allow for both
      describe and commit correct workflows.
    - Introduced an utils function to extract the description text and
      clean it post buffer write
This commit is contained in:
NicolasGB
2026-02-07 17:32:57 +01:00
committed by Nicolas GB
parent 400a3a5263
commit 149ae9ebc7
5 changed files with 168 additions and 57 deletions
+63
View File
@@ -273,6 +273,50 @@ function M.is_change_immutable(revset)
return vim.trim(output) == "true"
end
--- Build describe text for a given revision
--- @param revset? string The revision to describe (default: @)
--- @return string[]|nil
function M.get_describe_text(revset)
if not revset or revset == "" then
revset = "@"
end
local parser = require("jj.core.parser")
local old_description_raw, success = runner.execute_command(
"jj log -r " .. revset .. " --quiet --no-graph -T 'coalesce(description, \"\\n\")'",
"Failed to get old description"
)
if not old_description_raw or not success then
return nil
end
local status_result, success2 = runner.execute_command(
"jj log -r " .. revset .. " --quiet --no-graph -T 'self.diff().summary()'",
"Error getting status"
)
if not success2 then
return nil
end
local status_files = parser.get_status_files(status_result)
local old_description = vim.trim(old_description_raw)
local description_lines = vim.split(old_description, "\n")
local text = {}
for _, line in ipairs(description_lines) do
table.insert(text, line)
end
table.insert(text, "")
table.insert(text, "JJ: Change ID: " .. revset)
table.insert(text, "JJ: This commit contains the following changes:")
for _, item in ipairs(status_files) do
table.insert(text, string.format("JJ: %s %s", item.status, item.file))
end
table.insert(text, "JJ:")
table.insert(text, 'JJ: Lines starting with "JJ:" (like this one) will be removed')
return text
end
---
--- Get the commit id from a given revision
--- @param revset string The revset to extract the commit id from
@@ -293,4 +337,23 @@ function M.get_commit_id(revset)
return vim.trim(output)
end
--- Extract the description from the describe text
--- @param lines string[] The lines of a described change
--- @return string|nil
function M.extract_description_from_describe(lines)
local final_lines = {}
for _, line in ipairs(lines) do
if not line:match("^JJ:") then
table.insert(final_lines, line)
end
end
-- Join lines and trim leading/trailing whitespace
local trimmed_description = table.concat(final_lines, "\n"):gsub("^%s+", ""):gsub("%s+$", "")
if trimmed_description == "" then
-- If nothing return nil
return
end
return trimmed_description
end
return M