"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Stefan Sperling <stsp@stsp.name>
Subject:
Re: implement support for work tree diffs in tog
To:
Mark Jamsek <mark@jamsek.com>, gameoftrees@openbsd.org
Date:
Thu, 5 Dec 2024 19:39:37 +0100

Download raw body.

Thread
On Thu, Dec 05, 2024 at 05:19:02PM +0100, Stefan Sperling wrote:
> On Fri, Dec 06, 2024 at 02:32:03AM +1100, Mark Jamsek wrote:
> > The below diff introduces support for work tree diffs via the tog diff
> > CLI with `tog diff [-s] [path ...]` and the log view.
> 
> I am happy with this. I will keep running with it to test it, and
> see no reason to block this diff from going in.

One thing which doesn't work as expected is marking some older
commit and then pressing Enter on a work tree entry. The resulting
diff view displays the work tree diff only, rather than showing the
local changes mixed with committed changes, relative to the marked commit.

This is a limitation in Got's diff engine, since diffing work tree
state against repository state is not implemented there. It can only
diff the work tree against the index and a repository tree against
another repository tree. So there's nothing to fix in tog for now.
I wanted to mention my observation anyway. This is something for
the project's ever-growing todo list...