diff options
Diffstat (limited to 'quilt/diff.in')
| -rw-r--r-- | quilt/diff.in | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/quilt/diff.in b/quilt/diff.in index 15d182e..f336a66 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -17,6 +17,8 @@ then . @SCRIPTS@/patchfns fi +setup_colors + usage() { printf $"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--color] [file ...]\n" @@ -71,18 +73,21 @@ included. colorize() { if [ -n "$opt_color" ]; then @AWK@ ' - function esc(x) { return "'$'\e''[" x "m" } { if (/^(Index:|\-\-\-|\+\+\+|\*\*\*) /) - print esc(32) $0 esc(0) + print "'$color_diff_hdr'" $0 "'$color_clear'" else if (/^\+/) - print esc(36) $0 esc(0) - else if (/^(\-|!)/) - print esc(35) $0 esc(0) + print "'$color_diff_add'" $0 "'$color_clear'" + else if (/^-/) + print "'$color_diff_rem'" $0 "'$color_clear'" + else if (/^!/) + print "'$color_diff_mod'" $0 "'$color_clear'" else if (/^@@ \-[0-9]+(,[0-9]+)? \+[0-9]+(,[0-9]+)? @@/) print gensub(/^(@@[^@]*@@)([ \t]*)(.*)/, - esc(33) "\\1" esc(0) "\\2" esc(35) "\\3" esc(0), "") + "'$color_diff_hunk'" "\\1" "'$color_clear'" \ + "\\2" \ + "'$color_diff_ctx'" "\\3" "'$color_clear'", "") else if (/^\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/) - print esc(33) $0 esc(0) + print "'$color_diff_cctx'" $0 "'$color_clear'" else print }' |