X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=tb-list.pl;h=385e031c4fa22c6df28599c1b9d6e0ebe5d72588;hb=58e8a0a29a4e35b8226243ce3e440a838b576840;hp=e1fea3981c919b894943e03a36492730a8131025;hpb=63df00008c476657609d9fb6d4cd23bc74238a09;p=topbloke.git

diff --git a/tb-list.pl b/tb-list.pl
index e1fea39..385e031 100755
--- a/tb-list.pl
+++ b/tb-list.pl
@@ -8,18 +8,28 @@ use strict;
 use Getopt::Long;
 use Topbloke;
 
+#----- option parsing -----
+
 Getopt::Long::Configure(qw(bundling));
 
 our $deleted=0;
 our $deleted_only=0;
 our $current=0;
-our $relatedto=0;
+our $relatedto;
 our $leaves=0;
 our $sort='';
 
 GetOptions("d|deleted!" => \$deleted,         # including deleted patches
 	   "deleted-only!" => \$deleted_only, # only deleted patches
-	   "r|related=s" => \$relatedto,     # only patches related to this one
+	   "r|related=s" => sub {             # only patches related to that
+	       $relatedto = parse_patch_spec($_[1]);
+	   },
+	   "c|related-current" => sub {      # only patches related to current
+	       my $current_branch = current_branch();
+	       die "-c only permitted when on a topbloke branch\n"
+		   unless $current_branch->{Kind} =~ m/^(?:tip|base)$/;
+	       $relatedto = $current_branch;
+	   },
 	   "l|last|leaf|leaves" => \$leaves, # only leaf patches
 	   "sort=s" => \$sort,
     ) or die "bad options\n";
@@ -43,7 +53,7 @@ foreach $sort (@sort) {
     $toposort=1 if $sort eq $toposort;
 }
 
-$relatedto = $relatedto ? parse_patch_spec($relatedto) : undef;
+#----- list patches -----
 
 our %patches;
 
@@ -56,11 +66,16 @@ foreach_patch($relatedto || $leaves || !$spec ? { } : $spec,
 		  $patches{$patch}{ParsedName} = $parsedname;
 	      });
 
+#----- selection -----
+
 if ($leaves) {
+    debug("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] }) {
+	    debug("leaves $p $dep");
 	    next unless exists $patches{$dep};
 	    $patches{$dep}{NotLeaf} = 1;
 	}
@@ -102,6 +117,8 @@ foreach my $p (keys %patches) {
     push @output, $p;
 }
 
+#----- sorting -----
+
 sub sortsub () {
     my $txt = "sub sort_cmp {\n    my \$r;\n";
     debug("@sort");
@@ -133,7 +150,7 @@ sub sortsub () {
 	    foreach my $ix (qw(0 1)) {
 		my $ab = (qw(a b))[$ix];
 		my $ba = (qw(b a))[$ix];
-		my $r = (qw(-1 1))[$ix];
+		my $r = (qw(1 -1))[$ix];
 		$txt .= "    return $r if \$v${ab}->{Info}[3]{\$$ba};\n";
 	    }
         } else {
@@ -148,11 +165,18 @@ eval sortsub()." 1;" or die "$@ ?";
 
 @output = sort sort_cmp @output;
 
-use Data::Dumper;
+#----- 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};
@@ -163,7 +187,7 @@ 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 ? '>' : '',
+	   $p eq $current_patch ? $ifcurrent : '',
 	   $v->{Info}[0]{Deleted} ? 'D' : '',
 	   $pa->{Email}, $pa->{Domain}, $pa->{Date}, $pa->{Nick},
 	   $subject)