mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-10-06 05:57:38 -04:00
Stefan HallerandClaude Opus 5
c9c6d00a47
Two things about a diff command follow from what its output is for: whether the diff renderer produces it, and whether it is coloured. That was a `plain` flag, which covers two of the three cases — the diff as configured, and git's own uncoloured diff for building patches out of — and leaves no room for the third, which is about to be needed: git's own diff, coloured, for showing where the renderer's version of it can't be acted on. So the flag becomes a mode. It also takes over deciding the colour, which each command spelled out for itself, and it settles a question the flag couldn't put: whether ignoring whitespace applies. It is about what the user wants to see, so it holds for anything shown, and not for a diff a patch is built from, which has to describe every change. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
36 lines
1.2 KiB
Go
36 lines
1.2 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
)
|
|
|
|
// DiffMode says what a diff command's output is for. This decides whether the
|
|
// configured diff renderer produces it, and whether it is coloured.
|
|
type DiffMode int
|
|
|
|
const (
|
|
// DiffModeRendered is the diff as the user has arranged for it to look: through the
|
|
// diff renderer, with the renderer's own arguments and its preference about colour.
|
|
DiffModeRendered DiffMode = iota
|
|
// DiffModeRaw is git's own coloured diff, for showing a diff whose rendered form
|
|
// couldn't be acted on.
|
|
DiffModeRaw
|
|
// DiffModePlain is git's own uncoloured diff, for building patches from and copying
|
|
// text out of rather than for looking at.
|
|
DiffModePlain
|
|
)
|
|
|
|
// colorArg returns the value to pass to git's --color for this mode. Rendered output is
|
|
// coloured however the renderer wants its input; a raw diff gets git's own colour, which
|
|
// is the point of it; a plain one is for reading as text, not for looking at.
|
|
func (self DiffMode) colorArg(diffRendererConfigManager *config.DiffRendererConfigManager) string {
|
|
switch self {
|
|
case DiffModeRendered:
|
|
return diffRendererConfigManager.GetColorArg()
|
|
case DiffModeRaw:
|
|
return "always"
|
|
default:
|
|
return "never"
|
|
}
|
|
}
|