allow to disable word diffs

README.md

@@ -14,6 +14,7 @@ go get go.xrstf.de/stalk
 ```
 Usage of ./stalk:
   -c, --context-lines int   number of context lines to show in diffs (default 3)
+  -w, --diff-by-line        diff entire lines and do not highlight changes within words
   -h, --hide stringArray    path expression to hide in output (can be given multiple times)
       --hide-managed        Do not show managed fields (default true)
   -j, --jsonpath string     JSON path expression to transform the output (applied before the --show paths)

main.go

@@ -38,6 +38,7 @@ type options struct {
 	showPaths         []string
 	selector          labels.Selector
 	showEmpty         bool
+	disableWordDiff   bool
 	contextLines      int
 	verbose           bool
 }
@@ -49,6 +50,7 @@ func main() {
 		namespace:         "default",
 		hideManagedFields: true,
 		showEmpty:         false,
+		disableWordDiff:   false,
 		contextLines:      3,
 	}
 
@@ -60,6 +62,7 @@ func main() {
 	pflag.StringArrayVarP(&opt.showPaths, "show", "s", opt.showPaths, "path expression to include in output (can be given multiple times) (applied before the --hide paths)")
 	pflag.StringArrayVarP(&opt.hidePaths, "hide", "h", opt.hidePaths, "path expression to hide in output (can be given multiple times)")
 	pflag.BoolVarP(&opt.showEmpty, "show-empty", "e", opt.showEmpty, "do not hide changes which would produce no diff because of --hide/--show/--jsonpath")
+	pflag.BoolVarP(&opt.disableWordDiff, "diff-by-line", "w", opt.disableWordDiff, "diff entire lines and do not highlight changes within words")
 	pflag.IntVarP(&opt.contextLines, "context-lines", "c", opt.contextLines, "number of context lines to show in diffs")
 	pflag.BoolVarP(&opt.verbose, "verbose", "v", opt.verbose, "Enable more verbose output")
 	pflag.Parse()
@@ -78,6 +81,7 @@ func main() {
 	// validate CLI flags
 	differOpts := &diff.Options{
 		ContextLines:     opt.contextLines,
+		DisableWordDiff:  true,
 		ExcludePaths:     opt.hidePaths,
 		IncludePaths:     opt.showPaths,
 		HideEmptyDiffs:   !opt.showEmpty,

pkg/diff/colors.go

@@ -31,3 +31,10 @@ func cloneColorTheme(theme map[cdiff.Tag]color.Style) map[cdiff.Tag]color.Style
 
 	return result
 }
+
+func disableWordDiff(theme map[cdiff.Tag]color.Style) map[cdiff.Tag]color.Style {
+	theme[cdiff.OpenDeletedModified] = theme[cdiff.OpenDeletedNotModified]
+	theme[cdiff.OpenInsertedModified] = theme[cdiff.OpenInsertedNotModified]
+
+	return theme
+}

pkg/diff/options.go

@@ -12,8 +12,9 @@ import (
 )
 
 type Options struct {
-	ContextLines   int
-	HideEmptyDiffs bool
+	ContextLines    int
+	HideEmptyDiffs  bool
+	DisableWordDiff bool
 
 	JSONPath         string
 	compiledJSONPath *jsonpath.JSONPath

pkg/diff/printer.go

@@ -27,6 +27,12 @@ func NewDiffer(opt *Options, log logrus.FieldLogger) (*Differ, error) {
 		return nil, fmt.Errorf("invalid options: %w", err)
 	}
 
+	if opt.DisableWordDiff {
+		opt.CreateColorTheme = disableWordDiff(cloneColorTheme(opt.CreateColorTheme))
+		opt.UpdateColorTheme = disableWordDiff(cloneColorTheme(opt.UpdateColorTheme))
+		opt.DeleteColorTheme = disableWordDiff(cloneColorTheme(opt.DeleteColorTheme))
+	}
+
 	return &Differ{
 		opt: opt,
 		log: log,
@@ -166,7 +172,7 @@ func diffTitle(obj *unstructured.Unstructured, lastSeen time.Time) string {
 	timestamp := lastSeen.Format(time.RFC3339)
 	kind := obj.GroupVersionKind().Kind
 
-	return fmt.Sprintf("%s %s v%s (%s) (gen. %d)", kind, objectKey(obj), timestamp, obj.GetResourceVersion(), obj.GetGeneration())
+	return fmt.Sprintf("%s %s v%s (%s) (gen. %d)", kind, objectKey(obj), obj.GetResourceVersion(), timestamp, obj.GetGeneration())
 }
 
 // this ensures that the first line of a context/diff is not placed in the