jj mini/snacks rice

nvim/lua/plugins/lib/minidiff_jj.lua

@@ -0,0 +1,165 @@
+local diff = require('mini.diff')
+local JJ = {
+  cache = {},
+  jj_cache = {},
+}
+
+JJ.get_buf_realpath = function(buf_id)
+  return vim.loop.fs_realpath(vim.api.nvim_buf_get_name(buf_id)) or ''
+end
+
+JJ.jj_start_watching_tree_state = function(buf_id, path)
+  local stdout = vim.loop.new_pipe()
+  local args = { 'workspace', 'root' }
+  local spawn_opts = {
+    args = args,
+    cwd = vim.fn.fnamemodify(path, ':h'),
+    stdio = { nil, stdout, nil },
+  }
+
+  local on_not_in_jj = vim.schedule_wrap(function()
+    if not vim.api.nvim_buf_is_valid(buf_id) then
+      JJ.cache[buf_id] = nil
+      return
+    end
+    diff.fail_attach(buf_id)
+    JJ.jj_cache[buf_id] = {}
+  end)
+
+  local process, stdout_feed = nil, {}
+  local on_exit = function(exit_code)
+    process:close()
+
+    -- Watch index only if there was no error retrieving path to it
+    if exit_code ~= 0 or stdout_feed[1] == nil then
+      return on_not_in_jj()
+    end
+
+    -- Set up index watching
+    local jj_dir_path = table.concat(stdout_feed, ''):gsub('\n+$', '') .. '/.jj/working_copy'
+    JJ.jj_setup_tree_state_watch(buf_id, jj_dir_path)
+
+    -- Set reference text immediately
+    JJ.jj_set_ref_text(buf_id)
+  end
+
+  process = vim.loop.spawn('jj', spawn_opts, on_exit)
+  JJ.jj_read_stream(stdout, stdout_feed)
+end
+
+JJ.jj_setup_tree_state_watch = function(buf_id, jj_dir_path)
+  local buf_fs_event, timer = vim.loop.new_fs_event(), vim.loop.new_timer()
+  local buf_jj_set_ref_text = function()
+    JJ.jj_set_ref_text(buf_id)
+  end
+
+  local watch_tree_state = function(_, filename, _)
+    if filename ~= 'tree_state' then
+      return
+    end
+    -- Debounce to not overload during incremental staging (like in script)
+    timer:stop()
+    timer:start(50, 0, buf_jj_set_ref_text)
+  end
+  buf_fs_event:start(jj_dir_path, { recursive = false }, watch_tree_state)
+
+  JJ.jj_invalidate_cache(JJ.jj_cache[buf_id])
+  JJ.jj_cache[buf_id] = { fs_event = buf_fs_event, timer = timer }
+end
+
+JJ.jj_set_ref_text = vim.schedule_wrap(function(buf_id)
+  if not vim.api.nvim_buf_is_valid(buf_id) then
+    return
+  end
+
+  local buf_set_ref_text = vim.schedule_wrap(function(text)
+    pcall(diff.set_ref_text, buf_id, text)
+  end)
+
+  -- NOTE: Do not cache buffer's name to react to its possible rename
+  local path = JJ.get_buf_realpath(buf_id)
+  if path == '' then
+    return buf_set_ref_text {}
+  end
+  local cwd, basename = vim.fn.fnamemodify(path, ':h'), vim.fn.fnamemodify(path, ':t')
+
+  -- Set
+  local stdout = vim.loop.new_pipe()
+  local spawn_opts = {
+    args = { 'file', 'show', '-r', '@-', './' .. basename },
+    cwd = cwd,
+    stdio = { nil, stdout, nil },
+  }
+
+  local process, stdout_feed = nil, {}
+  local on_exit = function(exit_code)
+    process:close()
+
+    if exit_code ~= 0 or stdout_feed[1] == nil then
+      return buf_set_ref_text {}
+    end
+
+    -- Set reference text accounting for possible 'crlf' end of line in index
+    local text = table.concat(stdout_feed, ''):gsub('\r\n', '\n')
+    buf_set_ref_text(text)
+  end
+
+  process = vim.loop.spawn('jj', spawn_opts, on_exit)
+  JJ.jj_read_stream(stdout, stdout_feed)
+end)
+
+JJ.jj_read_stream = function(stream, feed)
+  local callback = function(err, data)
+    if data ~= nil then
+      return table.insert(feed, data)
+    end
+    if err then
+      feed[1] = nil
+    end
+    stream:close()
+  end
+  stream:read_start(callback)
+end
+
+JJ.jj_invalidate_cache = function(cache)
+  if cache == nil then
+    return
+  end
+  pcall(vim.loop.fs_event_stop, cache.fs_event)
+  pcall(vim.loop.timer_stop, cache.timer)
+end
+
+local jj = function()
+  local attach = function(buf_id)
+    -- Try attaching to a buffer only once
+    if JJ.jj_cache[buf_id] ~= nil then
+      return false
+    end
+    -- - Possibly resolve symlinks to get data from the original repo
+    local path = JJ.get_buf_realpath(buf_id)
+    if path == '' then
+      return false
+    end
+
+    JJ.jj_cache[buf_id] = {}
+    JJ.jj_start_watching_tree_state(buf_id, path)
+  end
+
+  local detach = function(buf_id)
+    local cache = JJ.jj_cache[buf_id]
+    JJ.jj_cache[buf_id] = nil
+    JJ.jj_invalidate_cache(cache)
+  end
+
+  local apply_hunks = function(_, _)
+    -- staging does not apply for jj
+  end
+
+  return {
+    name = 'jj',
+    attach = attach,
+    detach = detach,
+    apply_hunks = apply_hunks,
+  }
+end
+return jj

nvim/lua/plugins/lib/snacks_jj.lua

@@ -0,0 +1,133 @@
+local M = {}
+
+function M.status()
+  local function get_files()
+    local status_raw = vim.fn.system('jj diff --no-pager --quiet --summary')
+    local files = {}
+
+    for status in status_raw:gmatch('[^\r\n]+') do
+      local state, text = string.match(status, '^(%a)%s(.+)$')
+
+      if state and text then
+        local file = text
+
+        local hl = ''
+        if state == 'A' then
+          hl = 'SnacksPickerGitStatusAdded'
+        elseif state == 'M' then
+          hl = 'SnacksPickerGitStatusModified'
+        elseif state == 'D' then
+          hl = 'SnacksPickerGitStatusDeleted'
+        elseif state == 'R' then
+          hl = 'SnacksPickerGitStatusRenamed'
+          file = string.match(text, '{.-=>%s*(.-)}')
+        end
+
+        local diff = vim.fn.system('jj diff ' .. file .. ' --no-pager --stat --git')
+        table.insert(files, {
+          text = text,
+          file = file,
+          filename_hl = hl,
+          state = state,
+          diff = diff,
+        })
+      end
+    end
+
+    return files
+  end
+
+  local files = get_files()
+
+  Snacks.picker.pick {
+    source = 'jj_status',
+    items = files,
+    format = 'file',
+    title = 'jj status',
+    preview = function(ctx)
+      if ctx.item.file then
+        Snacks.picker.preview.diff(ctx)
+      else
+        ctx.preview:reset()
+        ctx.preview:set_title('No preview')
+      end
+    end,
+  }
+end
+
+function M.revs()
+  local function jj_new()
+    return function(picker, item)
+      picker:close()
+      if item then
+        if not item.rev then
+          Snacks.notify.warn('No branch or commit found', { title = 'Snacks Picker' })
+          return
+        end
+        local cmd = { 'jj', 'new', '-r', item.rev }
+        Snacks.picker.util.cmd(cmd, function()
+          Snacks.notify('Checking out revision: ' .. item.rev, { title = 'Snacks Picker' })
+          vim.cmd.checktime()
+        end, { cwd = item.cwd })
+      end
+    end
+  end
+
+  local function jj_rev_cmd(rev)
+    if rev ~= nil then
+      return vim.fn.system { 'jj', 'show', '--git', '-r', rev }
+    else
+      return 'No preview available.'
+    end
+  end
+
+  local function jj_log(revset)
+    if revset == nil then
+      revset = '-r @'
+    else
+      revset = '-r ' .. revset
+    end
+    local status_raw = vim.fn.system(
+      'jj log '
+      .. revset
+      ..
+      ' --template \'if(root, format_root_commit(self), label(if(current_working_copy, "working_copy"), concat( format_short_commit_header(self) ++ " ", separate(" ", if(empty, label("empty", "(empty)")), if(description, description.first_line(), label(if(empty, "empty"), description_placeholder),),) ++ "\n",),))\''
+    )
+    local lines = {}
+
+    for line in status_raw:gmatch('[^\r\n]+') do
+      local sign, rev, description = string.match(line, '(.)%s*(%a+)(.*)')
+      table.insert(lines, {
+        text = line,
+        file = line,
+        sign = sign,
+        rev = rev,
+        hl = 'SnacksPickerGitMsg',
+        description = description,
+        diff = jj_rev_cmd(rev),
+      })
+    end
+
+    return lines
+  end
+
+  local lines = jj_log('::@')
+
+  Snacks.picker.pick {
+    source = 'jj_revs',
+    items = lines,
+    format = 'text',
+    title = 'jj log',
+    confirm = jj_new(),
+    preview = function(ctx)
+      if ctx.item.file then
+        Snacks.picker.preview.diff(ctx)
+      else
+        ctx.preview:reset()
+        ctx.preview:set_title('No rev found')
+      end
+    end,
+  }
+end
+
+return M