Skip to content

fix(jj): drop graph glyphs from jj log in the commit-log panel #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlyongemallo merged 1 commit into from
Jul 2, 2026
Merged

fix(jj): drop graph glyphs from jj log in the commit-log panel #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions lua/diffview/tests/functional/jj_adapter_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,34 +245,40 @@ describe("diffview.vcs.adapters.jj", function()
end)

describe("get_log_args()", function()
it("returns just `log` when no args are given", function()
it("returns `log --no-graph` when no args are given", function()
local adapter = new_adapter()

eq({ "log" }, adapter:get_log_args({}))
eq({ "log", "--no-graph" }, adapter:get_log_args({}))
end)

it("wraps a single revset in `-r` so `jj log` reads it as a revision", function()
local adapter = new_adapter()

eq({ "log", "-r", "abc123" }, adapter:get_log_args({ "abc123" }))
eq({ "log", "--no-graph", "-r", "abc123" }, adapter:get_log_args({ "abc123" }))
end)

it("wraps an `a..b` range revset in `-r`", function()
local adapter = new_adapter()

eq({ "log", "-r", "abc123..def456" }, adapter:get_log_args({ "abc123..def456" }))
eq(
{ "log", "--no-graph", "-r", "abc123..def456" },
adapter:get_log_args({ "abc123..def456" })
)
end)

it("wraps each revset when given multiple positional args", function()
local adapter = new_adapter()

eq({ "log", "-r", "abc", "-r", "def" }, adapter:get_log_args({ "abc", "def" }))
eq({ "log", "--no-graph", "-r", "abc", "-r", "def" }, adapter:get_log_args({ "abc", "def" }))
end)

it("mixes flags and revsets without re-wrapping flags", function()
local adapter = new_adapter()

eq({ "log", "-n10", "-r", "abc123" }, adapter:get_log_args({ "-n10", "abc123" }))
eq(
{ "log", "--no-graph", "-n10", "-r", "abc123" },
adapter:get_log_args({ "-n10", "abc123" })
)
end)

it("prepends user-configured global flags from `jj_cmd`", function()
Expand All @@ -282,7 +288,7 @@ describe("diffview.vcs.adapters.jj", function()
end

eq(
{ "--repository", "/some/path", "log", "-r", "abc123" },
{ "--repository", "/some/path", "log", "--no-graph", "-r", "abc123" },
adapter:get_log_args({ "abc123" })
)
end)
Expand Down
7 changes: 5 additions & 2 deletions lua/diffview/vcs/adapters/jj/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,11 @@ function JjAdapter:get_log_args(args)
-- revsets `JjRev.to_range` produces) need to go through `-r`. Flags pass
-- through unchanged. `self:args()` carries any user-configured global
-- flags (e.g., `--repository`) ahead of the subcommand, matching how
-- `get_show_args` builds its invocation.
local out = utils.vec_join(self:args(), "log")
-- `get_show_args` builds its invocation. `--no-graph` drops the graph
-- glyphs: they add no signal in the `CommitLogPanel` (whose buffer is
-- `filetype=git` and can't highlight them) and just prefix every line
-- with `○`/`│`/`~`.
local out = utils.vec_join(self:args(), "log", "--no-graph")
for _, arg in ipairs(args) do
if vim.startswith(arg, "-") then
utils.vec_push(out, arg)
Expand Down
Loading