Add a horizontal scale

[u/fanf2/git-graph.git] / git-graph

diff --git a/git-graph b/git-graph
index a4f269e..b5254dd 100755 (executable)
--- a/git-graph
+++ b/git-graph
@@ -4,25 +4,23 @@ use warnings;
 use strict;
 
 use Getopt::Long qw{:config gnu_getopt posix_default};
+use POSIX;
 use Term::ReadKey;
 
 $0 =~ s{^.*/([^/]+)$}{$1};
 
-sub stop { exit 1; } # because 'die' uses a weird exit status
-sub wail { warn "$0: @_\n"; }
-sub fail { wail @_; stop; }
-sub fale { fail "@_: $!"; }
-
 my %opt;
 GetOptions(\%opt, qw{
-       cancel
-       overlay
-       stack
-}) or stop;
+       cancel|c
+       overlay|o
+       stack|s
+}) or exit 1;
 
 $opt{stack} = 1 unless $opt{cancel} or $opt{overlay};
 
-my @log = qx{git log --pretty=format:%ai --shortstat};
+my @terminal = GetTerminalSize;
+my $width = $terminal[0] - 11;
+my $height = $terminal[1] - 2;
 
 my %add;
 my %del;
@@ -31,21 +29,18 @@ my $addmax = 0;
 my $delmax = 0;
 my $canmax = 0;
 
-while (@log) {
-       my $date = shift @log;
-       my $stat = shift @log;
-       my $blank = shift @log;
-       fail "bad blank line $blank"
-           unless not defined $blank or $blank eq "\n";
-       fail "truncated git log output"
-           unless defined $date and defined $stat;
-       chomp ($date, $stat);
-       $date =~ s{^([0-9-]{10}) [0-9:]{8} [+-][0-9]{4}$}{$1}
-           or fail "bad date $date";
-       $stat =~ m{^\ \d+\ files?\ changed
-                  (?:,\ (\d+)\ insertion[s()+]+)?
-                  (?:,\ (\d+)\ deletion[s()-]+)?$}x
-           or fail "bad stats $stat";
+my $date;
+
+for (qx{git log --pretty=format:%ct --shortstat --since='$height days ago'}) {
+       next if m{^\s*$};
+       if (m{^(\d{10})\n$}) {
+               $date = int ($1 / 86400);
+               next;
+       }
+       m{^\ \d+\ files?\ changed
+         (?:,\ (\d+)\ insertion[s()+]+)?
+          (?:,\ (\d+)\ deletion[s()-]+)?$}x
+           or die "$0: bad stats $_";
        my ($add,$del) = ($1 || 0, $2 || 0);
        $add{$date} += $add;
        $del{$date} += $del;
@@ -60,13 +55,16 @@ while (@log) {
 my $max = $opt{cancel} ? $canmax :
     $opt{stack} ? $addmax + $delmax :
     $addmax > $delmax ? $addmax : $delmax;
-my $width = [GetTerminalSize]->[0] - 12;
 my $scale = $width / $max;
 
-for my $date (sort keys %add) {
+my $today = int (time / 86400);
+
+for my $date ($today - $height .. $today) {
        my $add;
        my $del;
        my $mod;
+       $add{$date} //= 0;
+       $del{$date} //= 0;
        if ($opt{cancel}) {
                if ($add{$date} > $del{$date}) {
                        $add = $add{$date} - $del{$date};
@@ -92,8 +90,14 @@ for my $date (sort keys %add) {
                $del = $del{$date};
                $mod = 0;
        }
-       printf "$date \e[33m%s\e[32m%s\e[31m%s\e[0m\n",
-           "#" x ($mod * $scale),
-           "+" x ($add * $scale),
-           "-" x ($del * $scale);
+       my $greg = strftime "%b %d %w", localtime $date * 86400;
+       $greg =~ s{(\d)$}{substr "sMTWTFs", $1, 1}e;
+       printf "$greg \e[33m%s\e[32m%s\e[31m%s\e[0m\n",
+           "#" x ($mod && 1 + $mod * $scale),
+           "+" x ($add && 1 + $add * $scale),
+           "-" x ($del && 1 + $del * $scale);
 }
+printf "         \e[33m#\e[0m <- %-8d %s %8d ->\n",
+    1/$scale,
+    " " x ($width - 25),
+    $max;