sg-check-tested: strip hg rev numbers from front when considering uniqueness

diff --git a/sg-check-tested b/sg-check-tested
index 673a45c1dcde7452b14acb0a151198d9ecbec59e..8ffa8f056487211caed9933c39dd335d6aaa0e73 100755 (executable)
--- a/sg-check-tested
+++ b/sg-check-tested
@@ -113,6 +113,9 @@ sub prepare_execute ($@) {
 
 my $q = prepare_execute($qtxt, @conds_vars);
 
+sub massage ($) { local ($_) = @_; s/^\d+\://; $_; }
+
+FLIGHT:
 while (my $row= $q->fetchrow_hashref()) {
     my $flight= $row->{flight};
     if (!defined $prrev) {
@@ -140,10 +143,15 @@ END
        }
         my $row1= $valsq->fetchrow_hashref();
         next unless defined $row1->{val} && length $row1->{val};
-        print DEBUG "got $row1->{val}\n";
-        my $row2= $valsq->fetchrow_hashref();
-        next if defined $row2;
-        print "$row1->{val}\n";
+       my $val1 = massage($row1->{val});
+        print DEBUG "got $val1\n";
+       while (my $row2 = $valsq->fetchrow_hashref()) {
+           my $val2 = massage($row2->{val});
+           next if $val2 eq $val1;
+           print DEBUG "also $val2\n";
+           next FLIGHT;
+       }
+        print "$val1\n";
         exit 0;
     }
 }