From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 23 Jan 2012 00:53:03 +0000 (+0000)
Subject: tb-list works
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=commitdiff_plain;h=63df00008c476657609d9fb6d4cd23bc74238a09;ds=sidebyside

tb-list works
---

diff --git a/Topbloke.pm b/Topbloke.pm
index 56055cf..b6de690 100644
--- a/Topbloke.pm
+++ b/Topbloke.pm
@@ -17,13 +17,15 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debug
 		      run_git run_git_1line run_git_check_nooutput
-		      run_git_test_anyoutput
+		      run_git_test_anyoutput git_get_object
 		      git_config git_dir chdir_toplevel
-		      current_branch parse_patch_spec
+		      current_branch parse_patch_spec parse_patch_name
 		      setup_config check_no_unwanted_metadata
+		      patch_matches_spec
 		      foreach_patch
 		      flagsfile_add_flag
-		      wf_start wf wf_abort wf_done wf_contents);
+		      wf_start wf wf_abort wf_done wf_contents
+		      closeout);
     %EXPORT_TAGS = ( );
     @EXPORT_OK   = qw();
 }
@@ -97,17 +99,24 @@ sub git_get_object ($) {
 				     $git_command, qw(cat-file --batch))
 	    or die $!;
     }
+    #debug("git_get_object $objname");
     $SIG{'PIPE'} = 'IGN';
     print $gro_in $objname,"\n" or die $!;
     $gro_in->flush or die "$objname $!";
     $SIG{'PIPE'} = 'DFL';
     my $l = <$gro_out>;
     chomp $l or die "$objname $l ?";
+    #debug("git_get_object $objname => $l");
     if ($l =~ m/ missing$/) {
 	return 'missing';
     } elsif (my ($type,$bytes) = $l =~ m/^\S+ (\w+) (\d+)$/) {
-	my $data;
-	read $gro_out, $data, $bytes == $bytes or die "$objname $!";
+	my $data = '';
+	if ($bytes) {
+	    (read $gro_out, $data, $bytes) == $bytes or die "$objname $!";
+	}
+	my $nl;
+	(read $gro_out, $nl, 1) == 1 or die "$objname $!";
+	$nl eq "\n" or die "$objname ?";
 	return ($type, $data);
     } else {
 	die "$objname $l";
@@ -158,6 +167,7 @@ sub current_branch () {
 	};
     }
     if ($ref =~ m#^refs/topbloke-(tip|base)s/([^/\@]*)\@([^/\@]*)/([^/]*)/#) {
+	my $fullname = "$2\@$3/$4/$'";
 	return {
 	    Kind => $1,
 	    Email => $2,
@@ -165,7 +175,8 @@ sub current_branch () {
 	    Date => $4,
 	    Nick => $', #',
 	    Ref => $ref,
-	    DepSpec => "$2\@$3/$4/$'",
+	    DepSpec => $fullname,
+	    Fullname => $fullname,
 	};
     } elsif ($ref =~ m#^refs/heads/#) {
 	return {
@@ -192,6 +203,10 @@ sub parse_patch_name ($) {
 	Domain => $domain,
 	Date => $date,
 	Nick => $nick,
+	Kind => 'tip',
+	DepSpec => $patch,
+	Fullname => $patch,
+	Ref => "refs/topbloke-tips/$patch",
     };
 }
 
@@ -427,4 +442,9 @@ sub wf_contents ($$) {
     wf_done($wf);
 }
 
+sub closeout () {
+    STDOUT->error and die $!;
+    close STDOUT or die $!;
+}
+
 1;
diff --git a/tb-list.pl b/tb-list.pl
index 6a4466b..e1fea39 100755
--- a/tb-list.pl
+++ b/tb-list.pl
@@ -43,6 +43,8 @@ foreach $sort (@sort) {
     $toposort=1 if $sort eq $toposort;
 }
 
+$relatedto = $relatedto ? parse_patch_spec($relatedto) : undef;
+
 our %patches;
 
 foreach_patch($relatedto || $leaves || !$spec ? { } : $spec, 
@@ -82,6 +84,8 @@ if ($relatedto) {
 		next unless exists $patches{$dep};
 		$patches{$dep}{Related} = 1;
 	    }
+	    # oh, and mark ourselves as Related=1 too!
+	    $v->{Related} = 1;
 	}
     }
 }
@@ -94,6 +98,7 @@ foreach my $p (keys %patches) {
     next if $deleted_only && !$v->{Info}[0]{Deleted};
     next if $leaves && $v->{NotLeaf};
     next if $relatedto && !$v->{Related};
+    next if $spec && !patch_matches_spec($v->{ParsedName}, $spec);
     push @output, $p;
 }
 
@@ -145,7 +150,24 @@ eval sortsub()." 1;" or die "$@ ?";
 
 use Data::Dumper;
 
+my $current_branch = current_branch();
+my $current_patch = $current_branch->{Kind} eq 'tip'
+    ? $current_branch->{Fullname} : '';
+
 foreach my $p (@output) {
     my $v = $patches{$p};
-    print Dumper($p, $v);
+    my $pa = $v->{ParsedName};
+    my ($msgkind, $msg) = git_get_object("$pa->{Ref}:.topbloke/msg");
+    die "$p $msgkind ?" unless $msgkind eq 'blob';
+    my $subject =
+	$msg =~ m/^Subject:\s*(?:\[[^][]*\]\s*)?(.*\S)\s*$/mi
+	? $1 : "[no subject]";	
+    printf("%1s%1s %s\@%s/%s/%-20s %s\n",
+	   $p eq $current_patch ? '>' : '',
+	   $v->{Info}[0]{Deleted} ? 'D' : '',
+	   $pa->{Email}, $pa->{Domain}, $pa->{Date}, $pa->{Nick},
+	   $subject)
+	or die $!;
 }
+
+closeout();