Re: summaries in git add --patch[PATCH 1/2]
From: William Pursell <hidden>
Date: 2016-06-15 22:45:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: summaries in git add --patch[PATCH 1/2] · Junio C Hamano <hidden>
- 2016-06-15 · Re: summaries in git add --patch[PATCH 1/2] · William Pursell <hidden>
- 2016-06-15 · Re: summaries in git add --patch[PATCH 1/2] · Junio C Hamano <hidden>
Junio C Hamano wrote:
Do you really want the surrounding @@ in the result, by the way?
Oddly, I liked it before. But now that you mention it, it does seem ugly.
How well does substr() work with utf-8 and other multi-byte encodings these days, I have to wonder...
Hopefully, it works well. Here's another go, with your suggestions applied. From 92ab9b7c694ba98b43984bbbdfcd5eeb9cbb7d56 Mon Sep 17 00:00:00 2001 From: William Pursell <redacted> Date: Thu, 4 Dec 2008 06:09:50 +0000 Subject: [PATCH 1/2] Add subroutine to display one-line summary of hunks. This commit implements a rather simple-minded mechanism to display a one-line summary of the hunks in an array ref. The display consists of the line numbers and the first changed line, truncated to 80 characters. 20 lines are displayed at a time, and the index of the first undisplayed line is returned, allowing the caller to display more if desired. (The 20 and 80 should be made configurable.) Signed-off-by: William Pursell <redacted> --- git-add--interactive.perl | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index b0223c3..b25a841 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl@@ -836,6 +836,48 @@ sub patch_update_cmd { } } +# Generate a one line summary of a hunk. +sub summarize_hunk { + my $rhunk = shift; + my $summary = $rhunk->{TEXT}[0]; + + # Keep the line numbers, discard extra context. + $summary =~ s/@@(.*?)@@.*/$1 /s; + $summary .= " " x (20 - length $summary); + + # Add some user context, the first changed line that contains + # some non-white character other than a bracket. + for my $line (@{$rhunk->{TEXT}}) { + if ($line =~ m/^([+-][][{}()\s]*[^][{}()\s])/) { + $summary .= $line; + last; + } + } + + chomp $summary; + return substr($summary, 0, 80) . "\n"; +} + + +# Print a one-line summary of each hunk in the array ref in +# the first argument, starting wih the index in the 2nd. +sub display_hunks { + my ($hunks, $i) = @_; + my $ctr = 0; + $i = 0 if not $i; + for (; $i < @$hunks && $ctr < 20; $i++, $ctr++) { + my $status = " "; + if (defined $hunks->[$i]{USE}) { + $status = $hunks->[$i]{USE} ? "+" : "-"; + } + printf "%s%2d: %s", + $status, + $i + 1, + summarize_hunk($hunks->[$i]); + } + return $i; +} + sub patch_update_file { my ($ix, $num); my $path = shift;
--
1.6.1.rc1.37.g83daf.dirty
--
William Pursell