mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-17 22:14:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

diff kitten: Add support for files that are identical apart from mode changes

Browse Source 
Fixes #6611
This commit is contained in:
Kovid Goyal
2023-09-09 19:04:54 +05:30
parent eb51d459ae
commit c99d55691d
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kittens/diff/render.go
View File

@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"math"
"os"
"strconv"
"strings"
@@ -571,7 +572,15 @@ func lines_for_diff(left_path string, right_path string, patch *Patch, columns,
is_full_width: true,
}
if patch.Len() == 0 {
for _, line := range splitlines("The files are identical", columns-margin_size) {
txt := "The files are identical"
if lstat, err := os.Stat(left_path); err == nil {
if rstat, err := os.Stat(right_path); err == nil {
if lstat.Mode() != rstat.Mode() {
txt = fmt.Sprintf("Mode changed: %s to %s", lstat.Mode(), rstat.Mode())
}
}
}
for _, line := range splitlines(txt, columns-margin_size) {
sl := ScreenLine{}
sl.left.marked_up_text = line
ht.screen_lines = append(ht.screen_lines, &sl)