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(parser): use / instead of \ as divergent change separator

Browse Source 
jj uses / (e.g., rs/1) for divergent changes, not \. Update the parser
to match revsets with /N suffix and update all related tests.
This commit is contained in:
NicolasGB
2026-02-13 10:13:30 +01:00
parent 27ab6707be
commit 3115a0b3f0
2 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/jj/core/parser.lua
+7 -6
View File
@@ -125,7 +125,8 @@ function M.get_revset(line)
}
-- ASCII markers (escaped for pattern matching)
local ascii_markers = { "@", "%*", "/", "\\", "%-", "%+", "|" }
-- Note: "/" is excluded because it's used as divergent change separator (e.g., rs/1)
local ascii_markers = { "@", "%*", "\\", "%-", "%+", "|" }
-- MUST have at least one commit marker symbol to be a valid commit line
-- Otherwise it's a description/message line, not a commit marker line
@@ -162,13 +163,13 @@ function M.get_revset(line)
allowed_prefix = allowed_prefix .. "]+" -- close class, match one or more (not zero)
-- Match first alphanumeric sequence after graph prefix
-- Supports divergent changes: revset\0, revset\1, etc.
-- Only match if it's followed by whitespace, backslash (for divergent), or end of string
-- Supports divergent changes: revset/0, revset/1, etc.
-- Only match if it's followed by whitespace, slash (for divergent), or end of string
-- Try matching with divergent suffix first: revset\N where N is a number
local revset, divergent_num = line:match("^" .. allowed_prefix .. "(%w+)\\(%d+)")
-- Try matching with divergent suffix first: revset/N where N is a number
local revset, divergent_num = line:match("^" .. allowed_prefix .. "(%w+)/(%d+)")
if revset and divergent_num then
return revset .. "\\" .. divergent_num
return revset .. "/" .. divergent_num
end
-- Try regular match followed by whitespace
tests/run_tests.lua
+29 -29
View File
@@ -283,65 +283,65 @@ run_test("still parses correctly with box chars and symbol", function()
assert_equals("go", parser.get_revset(line))
end)
run_test("still parses correctly with divergent change suffix \\0", function()
local line = "├─○ go\\0 some description"
assert_equals("go\\0", parser.get_revset(line))
run_test("still parses correctly with divergent change suffix /0", function()
local line = "├─○ go/0 some description"
assert_equals("go/0", parser.get_revset(line))
end)
-- Divergent changes tests
run_test("parses divergent change with \\0", function()
local line = "◆ abc123\\0 first divergent copy"
assert_equals("abc123\\0", parser.get_revset(line))
run_test("parses divergent change with /0", function()
local line = "◆ abc123/0 first divergent copy"
assert_equals("abc123/0", parser.get_revset(line))
end)
run_test("parses divergent change with \\1", function()
local line = "○ def456\\1 second divergent copy"
assert_equals("def456\\1", parser.get_revset(line))
run_test("parses divergent change with /1", function()
local line = "○ rs/1 lam@lamtrung.com 9 hours ago pr-83-1 6a7 (divergent)"
assert_equals("rs/1", parser.get_revset(line))
end)
run_test("parses divergent change with \\2", function()
local line = "◆ ghi789\\2 third divergent copy"
assert_equals("ghi789\\2", parser.get_revset(line))
run_test("parses divergent change with /2", function()
local line = "◆ ghi789/2 third divergent copy"
assert_equals("ghi789/2", parser.get_revset(line))
end)
run_test("parses divergent change with higher number \\10", function()
local line = "○ jkl012\\10 tenth divergent copy"
assert_equals("jkl012\\10", parser.get_revset(line))
run_test("parses divergent change with higher number /10", function()
local line = "○ jkl012/10 tenth divergent copy"
assert_equals("jkl012/10", parser.get_revset(line))
end)
run_test("parses divergent change with graph chars", function()
local line = "│ │ ◆ mno345\\0 divergent on branch"
assert_equals("mno345\\0", parser.get_revset(line))
local line = "│ │ ◆ mno345/0 divergent on branch"
assert_equals("mno345/0", parser.get_revset(line))
end)
run_test("parses divergent change with @ symbol", function()
local line = "@ pqr678\\1 working copy divergent"
assert_equals("pqr678\\1", parser.get_revset(line))
local line = "@ pqr678/1 working copy divergent"
assert_equals("pqr678/1", parser.get_revset(line))
end)
run_test("parses divergent change with conflict symbol", function()
local line = "× stu901\\0 conflicted divergent"
assert_equals("stu901\\0", parser.get_revset(line))
local line = "× stu901/0 conflicted divergent"
assert_equals("stu901/0", parser.get_revset(line))
end)
run_test("parses divergent change with merge connector", function()
local line = "├─○ vwx234\\2 divergent after merge"
assert_equals("vwx234\\2", parser.get_revset(line))
local line = "├─○ vwx234/2 divergent after merge"
assert_equals("vwx234/2", parser.get_revset(line))
end)
run_test("parses divergent change deeply nested", function()
local line = "│ │ │ │ ◆ yza567\\0 deeply nested divergent"
assert_equals("yza567\\0", parser.get_revset(line))
local line = "│ │ │ │ ◆ yza567/0 deeply nested divergent"
assert_equals("yza567/0", parser.get_revset(line))
end)
run_test("parses short revset with divergent suffix", function()
local line = "○ a\\0 single char divergent"
assert_equals("a\\0", parser.get_revset(line))
local line = "○ a/0 single char divergent"
assert_equals("a/0", parser.get_revset(line))
end)
run_test("parses divergent change at end of line", function()
local line = "◆ bcd890\\1"
assert_equals("bcd890\\1", parser.get_revset(line))
local line = "◆ bcd890/1"
assert_equals("bcd890/1", parser.get_revset(line))
end)
-- Print summary