]> Sergey Matveev's repositories - public-inbox.git/commitdiff
view: trim git patches delimited by /^---$/
authorEric Wong <e@80x24.org>
Thu, 28 Aug 2014 04:57:30 +0000 (04:57 +0000)
committerEric Wong <e@80x24.org>
Thu, 28 Aug 2014 04:59:11 +0000 (04:59 +0000)
Patches are usually better viewed standalone and are difficult
to judge when nested.  So save precious vertical space in our
message index.

lib/PublicInbox/View.pm

index 279433916ab488a6fe7979e1fbf9826c8f05aa9b..23cb369bedb3e18414f4c050990caa70275bfb36 100644 (file)
@@ -81,6 +81,7 @@ sub index_entry {
                my ($part) = @_;
                return if $part->subparts; # walk_parts already recurses
                my $enc = enc_for($part->content_type) || $enc_msg || $enc_utf8;
+               my $more = '';
 
                if ($part_nr > 0) {
                        my $fn = $part->filename;
@@ -96,13 +97,19 @@ sub index_entry {
                # Drop signatures
                $s =~ s/\n*-- \n.*\z//s;
 
+               # drop the remainder of git patches, they're usually better
+               # to review when the full message is viewed
+               if ($s =~ s/\n*---\n.*\z//s) {
+                       $more = "$pfx...\n";
+               }
+
                # kill any trailing whitespace
                $s =~ s/\s+\z//s;
 
                # add prefix:
                $s =~ s/^/$pfx/sgm;
 
-               $rv .= $s . "\n";
+               $rv .= $s . "\n$more";
                ++$part_nr;
        });