mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-24 10:13:41 -05:00
When loading the files of a commit we passed --no-renames, so a rename showed up as a separate delete and add rather than a single R entry. That made it impossible to work with a rename that also modifies the file: the modifications were spread across a full deletion and a full addition instead of appearing as the handful of lines that actually changed. The staging view already shows renames and lets you stage their hunks, so there was no good reason for the patch builder to differ; the flag was only there because the commit-file parser couldn't cope with the rename record format. Switch the commit-file loader and the per-file diff to --find-renames, teach the parser about the rename record (a status followed by two paths), and carry the previous path through the patch builder so the diff for a rename is loaded with both paths, which is what makes git emit the rename in the first place. A whole-file selection keeps the rename in the header, so the rename moves or is discarded together with the file's contents. A partial selection instead strips the rename metadata and points the header at the new path, so applying the patch only changes the contents and leaves the rename in place; the blob index line is kept so that a 3-way apply can still fall back to a blob merge. Discarding a renamed file from a commit now discards both the new and the old path, so the new file is removed and the old one is restored. Changing the rename similarity threshold refreshes the commit files panel too, not just the files panel, so that a rename can turn into a delete and add or back. It is disabled while building a patch, however, because the patch builder caches each file's diff by path and would desync if a rename changed into a delete and add underneath it. Finally, copying a file's diff from the commit files panel now passes both paths for a rename, so the copied diff shows the rename instead of a new-file add. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
364 lines
9.8 KiB
Go
364 lines
9.8 KiB
Go
package presentation
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/gookit/color"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/patch"
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/filetree"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
"github.com/jesseduffield/lazygit/pkg/theme"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
const (
|
|
EXPANDED_ARROW = "▼"
|
|
COLLAPSED_ARROW = "▶"
|
|
)
|
|
|
|
func RenderFileTree(
|
|
tree filetree.IFileTree,
|
|
submoduleConfigs []*models.SubmoduleConfig,
|
|
showFileIcons bool,
|
|
showNumstat bool,
|
|
customIconsConfig *config.CustomIconsConfig,
|
|
showRootItem bool,
|
|
) []string {
|
|
collapsedPaths := tree.CollapsedPaths()
|
|
return renderAux(tree.GetRoot().Raw(), collapsedPaths, -1, -1, func(node *filetree.Node[models.File], treeDepth int, visualDepth int, isCollapsed bool) string {
|
|
fileNode := filetree.NewFileNode(node)
|
|
|
|
return getFileLine(isCollapsed, fileNode.GetHasUnstagedChanges(), fileNode.GetHasStagedChanges(), treeDepth, visualDepth, showNumstat, showFileIcons, submoduleConfigs, node, customIconsConfig, showRootItem)
|
|
})
|
|
}
|
|
|
|
func RenderCommitFileTree(
|
|
tree *filetree.CommitFileTreeViewModel,
|
|
patchBuilder *patch.PatchBuilder,
|
|
showFileIcons bool,
|
|
customIconsConfig *config.CustomIconsConfig,
|
|
) []string {
|
|
collapsedPaths := tree.CollapsedPaths()
|
|
return renderAux(tree.GetRoot().Raw(), collapsedPaths, -1, -1, func(node *filetree.Node[models.CommitFile], treeDepth int, visualDepth int, isCollapsed bool) string {
|
|
status := commitFilePatchStatus(node, tree, patchBuilder)
|
|
|
|
return getCommitFileLine(isCollapsed, treeDepth, visualDepth, node, status, showFileIcons, customIconsConfig)
|
|
})
|
|
}
|
|
|
|
// Returns the status of a commit file in terms of its inclusion in the custom patch
|
|
func commitFilePatchStatus(node *filetree.Node[models.CommitFile], tree *filetree.CommitFileTreeViewModel, patchBuilder *patch.PatchBuilder) patch.PatchStatus {
|
|
// This is a little convoluted because we're dealing with either a leaf or a non-leaf.
|
|
// But this code actually applies to both. If it's a leaf, the status will just
|
|
// be whatever status it is, but if it's a non-leaf it will determine its status
|
|
// based on the leaves of that subtree
|
|
if node.EveryFile(func(file *models.CommitFile) bool {
|
|
return patchBuilder.GetFileStatus(file.Path, tree.GetRef().RefName()) == patch.WHOLE
|
|
}) {
|
|
return patch.WHOLE
|
|
} else if node.EveryFile(func(file *models.CommitFile) bool {
|
|
return patchBuilder.GetFileStatus(file.Path, tree.GetRef().RefName()) == patch.UNSELECTED
|
|
}) {
|
|
return patch.UNSELECTED
|
|
}
|
|
return patch.PART
|
|
}
|
|
|
|
func renderAux[T any](
|
|
node *filetree.Node[T],
|
|
collapsedPaths *filetree.CollapsedPaths,
|
|
// treeDepth is the depth of the node in the actual file tree. This is different to
|
|
// visualDepth because some directory nodes are compressed e.g. 'pkg/gui/blah' takes
|
|
// up two tree depths, but one visual depth. We need to track these separately,
|
|
// because indentation relies on visual depth, whereas file path truncation
|
|
// relies on tree depth.
|
|
treeDepth int,
|
|
visualDepth int,
|
|
renderLine func(*filetree.Node[T], int, int, bool) string,
|
|
) []string {
|
|
if node == nil {
|
|
return []string{}
|
|
}
|
|
|
|
isRoot := treeDepth == -1
|
|
|
|
if node.IsFile() {
|
|
if isRoot {
|
|
return []string{}
|
|
}
|
|
return []string{renderLine(node, treeDepth, visualDepth, false)}
|
|
}
|
|
|
|
arr := []string{}
|
|
if !isRoot {
|
|
isCollapsed := collapsedPaths.IsCollapsed(node.GetInternalPath())
|
|
arr = append(arr, renderLine(node, treeDepth, visualDepth, isCollapsed))
|
|
}
|
|
|
|
if collapsedPaths.IsCollapsed(node.GetInternalPath()) {
|
|
return arr
|
|
}
|
|
|
|
for _, child := range node.Children {
|
|
arr = append(arr, renderAux(child, collapsedPaths, treeDepth+1+node.CompressionLevel, visualDepth+1, renderLine)...)
|
|
}
|
|
|
|
return arr
|
|
}
|
|
|
|
func getFileLine(
|
|
isCollapsed bool,
|
|
hasUnstagedChanges bool,
|
|
hasStagedChanges bool,
|
|
treeDepth int,
|
|
visualDepth int,
|
|
showNumstat,
|
|
showFileIcons bool,
|
|
submoduleConfigs []*models.SubmoduleConfig,
|
|
node *filetree.Node[models.File],
|
|
customIconsConfig *config.CustomIconsConfig,
|
|
showRootItem bool,
|
|
) string {
|
|
name := fileNameAtDepth(node, treeDepth, showRootItem)
|
|
output := ""
|
|
|
|
var nameColor style.TextStyle
|
|
|
|
file := node.File
|
|
|
|
indentation := strings.Repeat(" ", visualDepth)
|
|
|
|
if hasStagedChanges && !hasUnstagedChanges {
|
|
nameColor = style.FgGreen
|
|
} else if hasStagedChanges {
|
|
nameColor = style.FgYellow
|
|
} else {
|
|
nameColor = theme.DefaultTextColor
|
|
}
|
|
|
|
if file == nil {
|
|
output += indentation + ""
|
|
arrow := EXPANDED_ARROW
|
|
if isCollapsed {
|
|
arrow = COLLAPSED_ARROW
|
|
}
|
|
|
|
arrowStyle := nameColor
|
|
|
|
output += arrowStyle.Sprint(arrow) + " "
|
|
} else {
|
|
// Sprinting the space at the end in the specific style is for the sake of
|
|
// when a reverse style is used in the theme, which looks ugly if you just
|
|
// use the default style
|
|
output += indentation + formatFileStatus(file, nameColor) + nameColor.Sprint(" ")
|
|
}
|
|
|
|
isSubmodule := file != nil && file.IsSubmodule(submoduleConfigs)
|
|
isLinkedWorktree := file != nil && file.IsWorktree
|
|
isDirectory := file == nil
|
|
|
|
if showFileIcons {
|
|
icon := icons.IconForFile(name, isSubmodule, isLinkedWorktree, isDirectory, customIconsConfig)
|
|
paint := color.HEX(icon.Color, false)
|
|
output += paint.Sprint(icon.Icon) + nameColor.Sprint(" ")
|
|
}
|
|
|
|
output += nameColor.Sprint(utils.EscapeSpecialChars(name))
|
|
|
|
if isSubmodule {
|
|
output += theme.DefaultTextColor.Sprint(" (submodule)")
|
|
}
|
|
|
|
if file != nil && showNumstat {
|
|
if lineChanges := formatLineChanges(file.LinesAdded, file.LinesDeleted); lineChanges != "" {
|
|
output += " " + lineChanges
|
|
}
|
|
}
|
|
|
|
return output
|
|
}
|
|
|
|
func formatFileStatus(file *models.File, restColor style.TextStyle) string {
|
|
firstChar := file.ShortStatus[0:1]
|
|
firstCharCl := style.FgGreen
|
|
switch firstChar {
|
|
case "?":
|
|
firstCharCl = theme.UnstagedChangesColor
|
|
case " ":
|
|
firstCharCl = restColor
|
|
}
|
|
|
|
secondChar := file.ShortStatus[1:2]
|
|
secondCharCl := theme.UnstagedChangesColor
|
|
if secondChar == " " {
|
|
secondCharCl = restColor
|
|
}
|
|
|
|
return firstCharCl.Sprint(firstChar) + secondCharCl.Sprint(secondChar)
|
|
}
|
|
|
|
func formatLineChanges(linesAdded, linesDeleted int) string {
|
|
output := ""
|
|
|
|
if linesAdded != 0 {
|
|
output += style.FgGreen.Sprintf("+%d", linesAdded)
|
|
}
|
|
|
|
if linesDeleted != 0 {
|
|
if output != "" {
|
|
output += " "
|
|
}
|
|
output += style.FgRed.Sprintf("-%d", linesDeleted)
|
|
}
|
|
|
|
return output
|
|
}
|
|
|
|
func getCommitFileLine(
|
|
isCollapsed bool,
|
|
treeDepth int,
|
|
visualDepth int,
|
|
node *filetree.Node[models.CommitFile],
|
|
status patch.PatchStatus,
|
|
showFileIcons bool,
|
|
customIconsConfig *config.CustomIconsConfig,
|
|
) string {
|
|
indentation := strings.Repeat(" ", visualDepth)
|
|
name := commitFileNameAtDepth(node, treeDepth)
|
|
commitFile := node.File
|
|
output := indentation
|
|
|
|
isDirectory := commitFile == nil
|
|
|
|
nameColor := theme.DefaultTextColor
|
|
|
|
switch status {
|
|
case patch.WHOLE:
|
|
nameColor = style.FgGreen
|
|
case patch.PART:
|
|
nameColor = style.FgYellow
|
|
case patch.UNSELECTED:
|
|
nameColor = theme.DefaultTextColor
|
|
}
|
|
|
|
if isDirectory {
|
|
arrow := EXPANDED_ARROW
|
|
if isCollapsed {
|
|
arrow = COLLAPSED_ARROW
|
|
}
|
|
|
|
output += nameColor.Sprint(arrow) + " "
|
|
} else {
|
|
var symbol string
|
|
symbolStyle := nameColor
|
|
|
|
switch status {
|
|
case patch.WHOLE:
|
|
symbol = "●"
|
|
case patch.PART:
|
|
symbol = "◐"
|
|
case patch.UNSELECTED:
|
|
symbol = commitFile.ChangeStatus
|
|
symbolStyle = getColorForChangeStatus(symbol)
|
|
}
|
|
|
|
output += symbolStyle.Sprint(symbol) + " "
|
|
}
|
|
|
|
name = utils.EscapeSpecialChars(name)
|
|
isSubmodule := false
|
|
isLinkedWorktree := false
|
|
|
|
if showFileIcons {
|
|
icon := icons.IconForFile(name, isSubmodule, isLinkedWorktree, isDirectory, customIconsConfig)
|
|
paint := color.HEX(icon.Color, false)
|
|
output += paint.Sprint(icon.Icon) + " "
|
|
}
|
|
|
|
output += nameColor.Sprint(name)
|
|
return output
|
|
}
|
|
|
|
func getColorForChangeStatus(changeStatus string) style.TextStyle {
|
|
switch changeStatus {
|
|
case "A":
|
|
return style.FgGreen
|
|
case "M", "R":
|
|
return style.FgYellow
|
|
case "D":
|
|
return theme.UnstagedChangesColor
|
|
case "C":
|
|
return style.FgCyan
|
|
case "T":
|
|
return style.FgMagenta
|
|
default:
|
|
return theme.DefaultTextColor
|
|
}
|
|
}
|
|
|
|
func fileNameAtDepth(node *filetree.Node[models.File], depth int, showRootItem bool) string {
|
|
splitName := split(node.GetInternalPath())
|
|
if depth == 0 && splitName[0] == "." {
|
|
if len(splitName) == 1 {
|
|
return "/"
|
|
}
|
|
depth = 1
|
|
}
|
|
name := join(splitName[depth:])
|
|
|
|
if node.File != nil && node.File.IsRename() {
|
|
splitPrevName := filetree.SplitFileTreePath(node.File.PreviousPath, showRootItem)
|
|
|
|
prevName := node.File.PreviousPath
|
|
// if the file has just been renamed inside the same directory, we can shave off
|
|
// the prefix for the previous path too. Otherwise we'll keep it unchanged
|
|
sameParentDir := len(splitName) == len(splitPrevName) && join(splitName[0:depth]) == join(splitPrevName[0:depth])
|
|
if sameParentDir {
|
|
prevName = join(splitPrevName[depth:])
|
|
}
|
|
|
|
return prevName + " → " + name
|
|
}
|
|
|
|
return name
|
|
}
|
|
|
|
func commitFileNameAtDepth(node *filetree.Node[models.CommitFile], depth int) string {
|
|
splitName := split(node.GetInternalPath())
|
|
showRootItem := splitName[0] == "."
|
|
if depth == 0 && showRootItem {
|
|
if len(splitName) == 1 {
|
|
return "/"
|
|
}
|
|
depth = 1
|
|
}
|
|
name := join(splitName[depth:])
|
|
|
|
if node.File != nil && node.File.IsRename() {
|
|
splitPrevName := filetree.SplitFileTreePath(node.File.PreviousPath, showRootItem)
|
|
|
|
prevName := node.File.PreviousPath
|
|
// if the file has just been renamed inside the same directory, we can shave off
|
|
// the prefix for the previous path too. Otherwise we'll keep it unchanged
|
|
sameParentDir := len(splitName) == len(splitPrevName) && join(splitName[0:depth]) == join(splitPrevName[0:depth])
|
|
if sameParentDir {
|
|
prevName = join(splitPrevName[depth:])
|
|
}
|
|
|
|
return prevName + " → " + name
|
|
}
|
|
|
|
return name
|
|
}
|
|
|
|
func split(str string) []string {
|
|
return strings.Split(str, "/")
|
|
}
|
|
|
|
func join(strs []string) string {
|
|
return strings.Join(strs, "/")
|
|
}
|