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

From:
Stefan Sperling <stsp@stsp.name>
Subject:
Re: tog: diff local worktree changes
To:
Mark Jamsek <mark@jamsek.com>
Cc:
Game of Trees <gameoftrees@openbsd.org>
Date:
Tue, 30 Aug 2022 16:48:04 +0200

Download raw body.

Thread
On Tue, Aug 30, 2022 at 11:36:44PM +1000, Mark Jamsek wrote:
> I understand your concerns, and to make my intention clear I don't want
> to go this route of morphing tog into a mini-IDE. Even assuming the work
> was a given, I wouldn't want to see tog go that route.
> 
> That said, I'm not sure that the addition of `tog diff` to diff worktree
> changes would shift user expectations so much that a tog equivalent of
> all Got CLI commands would be wanted.

Some in-person discussion between Mark and myself followed.
A summary of this below:

The proposed patch adds functionality that we want, but with the
proposed patch this functionality is reachable only from the tog
command line  We discusssed that there should also be a way to
discover the work-tree diffing feature from within an interactive
tog session.

For instance, we could provide special log view entries for local
and staged changes in the log view (tig does this as well).
Such entries would be present if tog is invoked in a worktree,
and local or staged diffs could then be reached from there.

From tog's point of view, local and staged changes can appear
and disappear at any moment.
Because running the equivalent of 'got status' takes time, we
would need a background thread that does this to periodically
refresh information displayed about the work tree's state.