X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=tb-list.pl;h=8fc3c3bd8784067feb62c4fb4b604904461c61e7;hp=9b76473b57cce4fffb5f25e2324e982178bd623d;hb=2799df8533bddff6feeee7c1b9d31cc6583e04f9;hpb=81dcd63e7a64de60e08ede165198f0e2753e0b8b

diff --git a/tb-list.pl b/tb-list.pl
index 9b76473..8fc3c3b 100755
--- a/tb-list.pl
+++ b/tb-list.pl
@@ -59,11 +59,16 @@ our %patches;
 
 foreach_patch($relatedto || $leaves || !$spec ? { } : $spec, 
 	      $deleted || $deleted_only, 
-	      [0, !!$leaves, 0, $toposort || !!$relatedto],
+	      [qw(B_deps +included)],
 	      sub { 
-		  my ($patch,$parsedname,@info) = @_;
-		  $patches{$patch}{Info} = \@info;
+		  my ($patch,$parsedname,$meta) = @_;
+		  $patches{$patch}{Meta} = $meta;
 		  $patches{$patch}{ParsedName} = $parsedname;
+		  $patches{$patch}{Deps} =
+		      grep { m/^[^-]/ } split /\n/, $meta->{'B_deps'};
+		  $patches{$patch}{Included} = { };
+		  $patches{$patch}{Included}{$_} = 1
+		      foreach split /\n/, $meta->{'+included'};
 	      });
 
 #----- selection -----
@@ -73,8 +78,8 @@ if ($leaves) {
     foreach my $p (keys %patches) {
 	debug("leaves $p");
 	my $v = $patches{$p};
-	next if $v->{Info}[0]{Deleted};
-	foreach my $dep (keys %{ $v->{Info}[1] }) {
+	next if defined $v->{Meta}{'deleted'};
+	foreach my $dep (@{ $v->{Deps} }) {
 	    debug("leaves $p $dep");
 	    next unless exists $patches{$dep};
 	    $patches{$dep}{NotLeaf} = 1;
@@ -86,7 +91,7 @@ if ($relatedto) {
     foreach my $p (keys %patches) {
 	my $v = $patches{$p};
 	# mark Related=1 if any patch matching $relatedto includes us
-	foreach my $dep (keys %{ $v->{Info}[3] }) {
+	foreach my $dep (keys %{ $v->{Included} }) {
 	    next unless exists $patches{$dep};
 	    my $depv = $patches{$dep};
 	    next unless patch_matches_spec($depv->{ParsedName}, $relatedto);
@@ -95,7 +100,7 @@ if ($relatedto) {
 	}
 	if (patch_matches_spec($v->{ParsedName}, $relatedto)) {
 	    # if we match $relatedto, mark all our inclusions as Related=1
-	    foreach my $dep (keys %{ $v->{Info}[3] }) {
+	    foreach my $dep (keys %{ $v->{Included} }) {
 		next unless exists $patches{$dep};
 		$patches{$dep}{Related} = 1;
 	    }
@@ -109,8 +114,8 @@ our @output;
 
 foreach my $p (keys %patches) {
     my $v = $patches{$p};
-    next if !$deleted && $v->{Info}[0]{Deleted};
-    next if $deleted_only && !$v->{Info}[0]{Deleted};
+    next if !$deleted && defined $v->{Meta}{'deleted'};
+    next if $deleted_only && !defined $v->{Meta}{'deleted'};
     next if $leaves && $v->{NotLeaf};
     next if $relatedto && !$v->{Related};
     next if $spec && !patch_matches_spec($v->{ParsedName}, $spec);
@@ -151,7 +156,7 @@ sub sortsub () {
 		my $ab = (qw(a b))[$ix];
 		my $ba = (qw(b a))[$ix];
 		my $r = (qw(1 -1))[$ix];
-		$txt .= "    return $r if \$v${ab}->{Info}[3]{\$$ba};\n";
+		$txt .= "    return $r if \$v${ab}->{Included}{\$$ba};\n";
 	    }
         } else {
 	    die $sort;
@@ -168,8 +173,15 @@ eval sortsub()." 1;" or die "$@ ?";
 #----- printing -----
 
 my $current_branch = current_branch();
-my $current_patch = $current_branch->{Kind} eq 'tip'
-    ? $current_branch->{Fullname} : '';
+my $current_patch = '';
+my $ifcurrent;
+if ($current_branch->{Kind} eq 'tip') {
+    $current_patch = $current_branch->{Fullname};
+    $ifcurrent = '>';
+} elsif ($current_branch->{Kind} eq 'base') {
+    $current_patch = $current_branch->{Fullname};
+    $ifcurrent = '#';
+}
 
 foreach my $p (@output) {
     my $v = $patches{$p};
@@ -180,8 +192,8 @@ foreach my $p (@output) {
 	$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' : '',
+	   $p eq $current_patch ? $ifcurrent : '',
+	   defined $v->{Meta}{'deleted'} ? 'D' : '',
 	   $pa->{Email}, $pa->{Domain}, $pa->{Date}, $pa->{Nick},
 	   $subject)
 	or die $!;