X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tig.pl;h=d7272a3183981ad8040d2c963f9f6fe1a4e03bf5;hb=cf2f4142baba6dc0bcc9d8af37e83cb8ca3add0e;hp=77b7d9416600f812fd760bbf7f05df208e99effa;hpb=4bf926384a26bbdbe7c6bb6476aa6093381667c8;p=config%2Fdotfiles.git

diff --git a/tig.pl b/tig.pl
index 77b7d94..d7272a3 100755
--- a/tig.pl
+++ b/tig.pl
@@ -34,13 +34,31 @@ my $color_ref_reference = 'red bold';
 my $color_author        = 'magenta';
 
 
-my $format = '%h'  . '%x00' # abbreviated commit hash
+my $format = '%x00'         # separator from --graph
+           . '%h'  . '%x00' # abbreviated commit hash
            . '%at' . '%x00' # author date
            . '%an' . '%x00' # author name
            . '%s'  . '%x00' # subject
            . '%d';          # ref names
-my $cmd = "git log --all --graph --format='$format'";
-open my $fh, '-|', $cmd or die $!;
+my @cmd = ('git', 'log', '--graph', "--format=$format",
+           # use either given arguments or --all to list all commits
+           (scalar @ARGV) ? @ARGV : '--all');
+open my $fh, '-|', @cmd or die $!;
+
+my $pager = $ENV{PAGER};
+# Try to find an usable pager without searching $PATH.
+if (not defined $pager) {
+    foreach my $path (qw(/usr/bin/less /bin/less /usr/bin/more /bin/more)) {
+        next if not -x $path;
+
+        $pager = $path;
+        last;
+    }
+}
+# Use a pager if STDOUT is a terminal.
+if (-t STDOUT and defined $pager) {
+    open STDOUT, '|-', $pager or die $!;
+}
 
 while (my $line = <$fh>) {
     # History graph line.
@@ -50,7 +68,8 @@ while (my $line = <$fh>) {
     }
 
     # Commit line.
-    $line =~ /^([ *|]+) (.+)\x00(.+)\x00(.+)\x00(.+)\x00(.*)$/ or die $line;
+    $line =~ /^([ *|.\\-]+)\x00(.+)\x00(.+)\x00(.+)\x00(.*)\x00(.*)$/
+        or die $line;
     my $prefix  = $1;
     my $hash    = colored($2, $color_hash);
     my $date    = POSIX::strftime('%Y-%m-%d', localtime($3));
@@ -58,6 +77,8 @@ while (my $line = <$fh>) {
     my $message = $5;
     my $refs    = $6;
 
+    # Strip trailing whitespace.
+    $prefix =~ s/\s+$//;
     # Color "graph".
     $prefix =~ s/\|/colored($&, $color_graph)/ge;
 
@@ -90,3 +111,9 @@ while (my $line = <$fh>) {
 }
 
 close $fh or die $!;
+
+# Necessary for the redirection to a pager or the pager terminates after our
+# script finishes without displaying all data.
+if (defined $pager) {
+    close STDOUT or die $!;
+}