From eaca8676586f4074bc33c2120e08f845210814cc340b78386e38c7f847a4cef0 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Thu, 14 Aug 2025 11:06:55 +0300
Subject: [PATCH] Friendlier diff

---
 dsc | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/dsc b/dsc
index e2f68ef..d867fda 100755
--- a/dsc
+++ b/dsc
@@ -209,7 +209,24 @@ switch [lindex $argv 0] {
         file delete $dirsSaved
         file delete $dirsStash
         set fh [open "| diff -urN $Saved/$opt $Stash/$opt" r]
-        puts -nonewline [read $fh]
+        set prefixSaved "--- $Saved/"
+        set prefixSavedLen [string length $prefixSaved]
+        set prefixStash "+++ $Stash/"
+        set prefixStashLen [string length $prefixStash]
+        while {[gets $fh line] >= 0} {
+            if {[string range $line 0 3] == "diff"} {
+                continue
+            }
+            if {[string range $line 0 $prefixSavedLen-1] == $prefixSaved} {
+                puts "--- [string range $line $prefixSavedLen end]"
+                continue
+            }
+            if {[string range $line 0 $prefixStashLen-1] == $prefixStash} {
+                puts "+++ [string range $line $prefixStashLen end]"
+                continue
+            }
+            puts $line
+        }
         catch {close $fh}
     }
     revert {
-- 
2.50.0