From 3d1874c6bd52e72a6b8cef3aea3e6a37d2ac6ca8 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Mon, 16 Mar 2026 14:52:32 -0400 Subject: [PATCH] docs(upstream): consolidate #655, #667, #736 into #142 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: three upstream requests (#655, #667, #736) all target the same architectural change — rendering columns as extmark virtual text instead of inline buffer text. Solution: create canonical issue #142 and consolidate all three. --- doc/upstream.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/upstream.md b/doc/upstream.md index 7a14f3f..055dd92 100644 --- a/doc/upstream.md +++ b/doc/upstream.md @@ -25,7 +25,7 @@ issues against this fork. | [#686](https://github.com/stevearc/oil.nvim/pull/686) | Windows path conversion fix | not actionable — Windows-only | | [#735](https://github.com/stevearc/oil.nvim/pull/735) | gX opens external program with selection | not actionable — hardcoded Linux-only, incomplete | | [#591](https://github.com/stevearc/oil.nvim/pull/591) | release-please changelog | not applicable | -| [#667](https://github.com/stevearc/oil.nvim/pull/667) | Virtual text columns + headers | deferred — WIP, conflicting | +| [#667](https://github.com/stevearc/oil.nvim/pull/667) | Virtual text columns + headers | consolidated into [#142](https://github.com/barrettruth/canola.nvim/issues/142) | | [#708](https://github.com/stevearc/oil.nvim/pull/708) | Move file into new dir by renaming | deferred — needs rewrite | | [#721](https://github.com/stevearc/oil.nvim/pull/721) | `create_hook` to populate file contents | deferred — fixing via autocmd event | | [#728](https://github.com/stevearc/oil.nvim/pull/728) | `open_split` for opening oil in a split | deferred — tracked as [#2](https://github.com/barrettruth/canola.nvim/issues/2) | @@ -116,7 +116,7 @@ issues against this fork. | [#645](https://github.com/stevearc/oil.nvim/issues/645) | `close_float` action | fixed | | [#646](https://github.com/stevearc/oil.nvim/issues/646) | `get_current_dir` nil on SSH | fixed — `get_current_url()` API | | [#650](https://github.com/stevearc/oil.nvim/issues/650) | LSP `workspace.fileOperations` events | fixed | -| [#655](https://github.com/stevearc/oil.nvim/issues/655) | File statistics as virtual text | open | +| [#655](https://github.com/stevearc/oil.nvim/issues/655) | File statistics as virtual text | consolidated into [#142](https://github.com/barrettruth/canola.nvim/issues/142) | | [#659](https://github.com/stevearc/oil.nvim/issues/659) | Mark and diff files in buffer | open | | [#664](https://github.com/stevearc/oil.nvim/issues/664) | Session reload extra buffer | not actionable — no repro | | [#665](https://github.com/stevearc/oil.nvim/issues/665) | Hot load preview fast-scratch buffers | not actionable — no clear architecture | @@ -140,5 +140,5 @@ issues against this fork. | [#714](https://github.com/stevearc/oil.nvim/issues/714) | Support question | not actionable — answered | | [#719](https://github.com/stevearc/oil.nvim/issues/719) | Neovim crash on node_modules | not actionable — libuv/neovim bug | | [#726](https://github.com/stevearc/oil.nvim/issues/726) | Meta discussion/roadmap | not actionable | -| [#736](https://github.com/stevearc/oil.nvim/issues/736) | Make icons virtual text | open | +| [#736](https://github.com/stevearc/oil.nvim/issues/736) | Make icons virtual text | consolidated into [#142](https://github.com/barrettruth/canola.nvim/issues/142) | | [#738](https://github.com/stevearc/oil.nvim/issues/738) | Allow changing mtime/atime via time column | not actionable — disproportionate complexity (new mutator action type, reverse strftime parser, per-adapter `utime`), 0 demand, purpose-built tools exist |