From 230ac39e70550fc9e30b1283f7858eebad105cb0 Mon Sep 17 00:00:00 2001
From: Justin Puah <justin@puah.dev>
Date: Fri, 31 Jul 2026 16:46:47 +1000
Subject: [PATCH] feat(nvim): swap diffview.nvim for the maintained
 diffview-plus fork

sindrets/diffview.nvim has had no commits since 2024-06-13 and carries 130
open issues; the PR-review workflow (<leader>gm, ado-pr.nvim, review-ado-pr)
depends on it. dlyongemallo/diffview-plus.nvim is the active fork and keeps
the `diffview` module namespace plus the :Diffview* commands, so
config/diffview.lua and its keymaps are unchanged.

The existing opts need no migration: the fork's documented breaking changes
cover file_panel.show (not set), flat log options (not set), and win_config
nesting (already nested).

The old lockfile key is removed rather than left beside the new one - the
offline plugin installer provisions every lockfile entry, so a stale key
would put a second lua/diffview/ on the packpath on offline machines.
---
 nvim/lua/config/plugins.lua |  8 ++++++--
 nvim/nvim-pack-lock.json    | 10 +++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/nvim/lua/config/plugins.lua b/nvim/lua/config/plugins.lua
index 5b1ff15..d9dff80 100644
--- a/nvim/lua/config/plugins.lua
+++ b/nvim/lua/config/plugins.lua
@@ -32,8 +32,12 @@ local specs = {
   'https://github.com/b0o/schemastore.nvim',
   'https://github.com/lewis6991/gitsigns.nvim',
   -- forge-agnostic branch/PR diff UI — `:DiffviewOpen origin/main...HEAD`; works for Azure
-  -- DevOps PRs where octo.nvim, GitHub-only, does not; config in config/diffview.lua
-  'https://github.com/sindrets/diffview.nvim',
+  -- DevOps PRs where octo.nvim, GitHub-only, does not; config in config/diffview.lua.
+  -- The -plus fork, NOT sindrets/diffview.nvim: upstream's last commit is 2024-06-13 with
+  -- 130 open issues. The fork keeps the `diffview` module namespace and the :Diffview*
+  -- commands, so config/diffview.lua and the <leader>g* maps are unchanged. Requires only
+  -- Neovim >= 0.10 (README); plenary is its test-runner dep, not a runtime one.
+  'https://github.com/dlyongemallo/diffview-plus.nvim',
   'https://github.com/MeanderingProgrammer/render-markdown.nvim',
   -- orgmode compiles its own pinned tree-sitter-org grammar into its own plugin
   -- dir on setup(), independent of nvim-treesitter. Do NOT add 'org' to
diff --git a/nvim/nvim-pack-lock.json b/nvim/nvim-pack-lock.json
index 8d54f54..a81f9d8 100644
--- a/nvim/nvim-pack-lock.json
+++ b/nvim/nvim-pack-lock.json
@@ -4,9 +4,9 @@
       "rev": "b77c47c34e11ef9102a3f6dbd12f6b835b7c3af1",
       "src": "https://github.com/stevearc/aerial.nvim"
     },
-    "diffview.nvim": {
-      "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
-      "src": "https://github.com/sindrets/diffview.nvim"
+    "diffview-plus.nvim": {
+      "rev": "62dc5adf4e77489a2a6d3bf36ef6e4ac5738b634",
+      "src": "https://github.com/dlyongemallo/diffview-plus.nvim"
     },
     "fzf-lua": {
       "rev": "c8aaa74c97157b2c62bdcfc1e57b15c052dc63ca",
@@ -35,12 +35,12 @@
     "nvim-treesitter": {
       "rev": "7248feaca45e4d944591497964bc19afa89ad1c6",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter",
-      "version": "main"
+      "version": "'main'"
     },
     "nvim-treesitter-textobjects": {
       "rev": "898ee307df58f854d11cd7edd06472574d48014e",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects",
-      "version": "main"
+      "version": "'main'"
     },
     "oil-git-status.nvim": {
       "rev": "a3e2ccb00cb8822115e28a9a1791eda051d940c9",