create works again

[topbloke.git] / tb-list.pl

diff --git a/tb-list.pl b/tb-list.pl
index 8b23d6d6f6f1d735a7cc589dbe8c480e1719bd4c..8fc3c3bd8784067feb62c4fb4b604904461c61e7 100755 (executable)
--- a/tb-list.pl
+++ b/tb-list.pl
@@ -2,8 +2,6 @@
 # usage: tb-list [<patch-spec>]
 #  lists all patches matching <patch-spec> and other criteria
 
-xxx needs updating for new metadata and new theory
-
 use warnings;
 use strict;
 
@@ -60,13 +58,17 @@ foreach $sort (@sort) {
 our %patches;
 
 foreach_patch($relatedto || $leaves || !$spec ? { } : $spec, 
-xxx new api for foreach_patch
              $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 -----
@@ -76,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;
@@ -89,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);
@@ -98,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;
            }
@@ -112,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);
@@ -154,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;
@@ -191,7 +193,7 @@ foreach my $p (@output) {
        ? $1 : "[no subject]";  
     printf("%1s%1s %s\@%s/%s/%-20s %s\n",
           $p eq $current_patch ? $ifcurrent : '',
-          $v->{Info}[0]{Deleted} ? 'D' : '',
+          defined $v->{Meta}{'deleted'} ? 'D' : '',
           $pa->{Email}, $pa->{Domain}, $pa->{Date}, $pa->{Nick},
           $subject)
        or die $!;