zoriya/jj.nvim
1
0
Fork 0
mirror of https://github.com/zoriya/jj.nvim.git synced 2026-08-15 23:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(filesets): Correclty escape filesets in different commands to avoid

Browse Source 
special characters breaking jj's parsing
This commit is contained in:
NicolasGB
2026-06-30 12:45:40 +02:00
committed by Nicolas GB
parent db06e9a73c
commit c724290141
5 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/jj/picker.lua
+12 -3
View File
@@ -121,7 +121,7 @@ local function get_files()
text = line:sub(3),
file = file_path,
status = change .. " ",
diff_cmd = string.format("jj --no-pager diff %s", vim.fn.shellescape(file_path)),
diff_cmd = string.format("jj --no-pager diff %s", utils.escape_fileset(file_path)),
confirm_action = "open_and_diff",
}
@@ -174,7 +174,7 @@ local function log_history(file_path)
"--no-graph",
[[ -T 'change_id.shortest() ++ "\t" ++ coalesce(author.name(), "(no author)") ++ "\t" ++ committer.timestamp() ++ "\t" ++ coalesce(description.first_line(), "(no description)") ++ "\n"' ]],
}, " ")
local output, ok = runner.execute_command(string.format(format, vim.fn.shellescape(file_path)))
local output, ok = runner.execute_command(string.format(format, utils.escape_fileset(file_path)))
if not ok then
return
end
@@ -201,7 +201,16 @@ local function log_history(file_path)
time = time_part,
description = description,
text = string.format("%s %s %s %s", rev, author, short_time, description),
preview_cmd = { "jj", "--no-pager", "diff", file_path, "-r", rev, "--stat", "--git" },
preview_cmd = {
"jj",
"--no-pager",
"diff",
utils.escape_fileset(file_path),
"-r",
rev,
"--stat",
"--git",
},
confirm_action = "edit_revision",
})
end