X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=41375195d6cdd997ff79ff8aff572930647af1bf;hp=8132b8fce7eab84e711e7ee961ad3fbfd3ee773b;hb=f8ed9026e0fb1f258296f51a5722f5ed0d065c4b;hpb=b9c9a1f4bc7a38ea789a3e5ae7c8a8b80d74689a

diff --git a/dgit b/dgit
index 8132b8fc..41375195 100755
--- a/dgit
+++ b/dgit
@@ -68,7 +68,7 @@ our $csuite;
 sub lbranch () { return "$branchprefix/$csuite"; }
 my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
 sub lref () { return "refs/heads/".lbranch(); }
-sub lrref () { return "refs/remotes/$remotename/$csuite"; }
+sub lrref () { return "refs/remotes/$remotename/$branchprefix/$csuite"; }
 sub rrref () { return "refs/$branchprefix/$csuite"; }
 sub debiantag ($) { 
     my ($v) = @_;
@@ -104,6 +104,7 @@ sub url_get {
     my $what = $_[$#_];
     print "downloading $what...\n";
     my $r = $ua->get(@_) or die $!;
+    return undef if $r->code == 404;
     $r->is_success or fail "failed to fetch $what: ".$r->status_line;
     return $r->decoded_content();
 }
@@ -200,6 +201,10 @@ important dgit options:
   -c<name>=<value>    set git config option (used directly by dgit too)
 END
 
+our $later_warning_msg = <<END;
+Perhaps the upload is stuck in incoming.  Using the version from git.
+END
+
 sub badusage {
     print STDERR "$us: @_\n", $helpmsg or die $!;
     exit 8;
@@ -368,26 +373,27 @@ sub canonicalise_suite_sshdakls ($$) {
 
 sub madison_parse ($) {
     my ($rmad) = @_;
-    if (!length $rmad) {
-	return ();
-    }
-    $rmad =~ m{^ \s*( [^ \t|]+ )\s* \|
-                 \s*( [^ \t|]+ )\s* \|
-                 \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
-                 \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
-    $1 eq $package or die "$rmad $package ?";
-    my $vsn = $2;
-    my $newsuite = $3;
-    my $component;
-    if (defined $4) {
-	$component = $4;
-    } else {
-	$component = access_cfg('archive-query-default-component');
+    my @out;
+    foreach my $l (split /\n/, $rmad) {
+	$l =~ m{^ \s*( [^ \t|]+ )\s* \|
+                  \s*( [^ \t|]+ )\s* \|
+                  \s*( [^ \t|/]+ )(?:/([^ \t|/]+))? \s* \|
+                  \s*( [^ \t|]+ )\s* }x or die "$rmad $?";
+	$1 eq $package or die "$rmad $package ?";
+	my $vsn = $2;
+	my $newsuite = $3;
+	my $component;
+	if (defined $4) {
+	    $component = $4;
+	} else {
+	    $component = access_cfg('archive-query-default-component');
+	}
+	$5 eq 'source' or die "$rmad ?";
+	my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
+	my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc";
+	push @out, [$vsn,$subpath,$newsuite];
     }
-    $5 eq 'source' or die "$rmad ?";
-    my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
-    my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc";
-    return ($vsn,$subpath,$newsuite);
+    return sort { -version_compare_string($a->[0],$b->[0]); } @out;
 }
 
 sub canonicalise_suite_madison ($$) {
@@ -396,7 +402,7 @@ sub canonicalise_suite_madison ($$) {
 	"unable to canonicalise suite using package $package".
 	" which does not appear to exist in suite $isuite;".
 	" --existing-package may help";
-    return $r[2];
+    return $r[0][2];
 }
 
 sub canonicalise_suite () {
@@ -408,17 +414,24 @@ sub canonicalise_suite () {
 }
 
 sub get_archive_dsc () {
-    my ($vsn,$subpath) = archive_query('archive_query');
     canonicalise_suite();
-    if (!defined $vsn) { $dsc=undef; return undef; }
-    $dscurl = access_cfg('mirror').$subpath;
-    $dscdata = url_get($dscurl);
-    my $dscfh = new IO::File \$dscdata, '<' or die $!;
-    print DEBUG Dumper($dscdata) if $debug>1;
-    $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
-    print DEBUG Dumper($dsc) if $debug>1;
-    my $fmt = getfield $dsc, 'Format';
-    fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
+    my @vsns = archive_query('archive_query');
+    foreach my $vinfo (@vsns) {
+	my ($vsn,$subpath) = @$vinfo;
+	$dscurl = access_cfg('mirror').$subpath;
+	$dscdata = url_get($dscurl);
+	next unless defined $dscdata;
+	$dscurl = access_cfg('mirror').$subpath;
+	$dscdata = url_get($dscurl);
+	my $dscfh = new IO::File \$dscdata, '<' or die $!;
+	print DEBUG Dumper($dscdata) if $debug>1;
+	$dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
+	print DEBUG Dumper($dsc) if $debug>1;
+	my $fmt = getfield $dsc, 'Format';
+	fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
+	return $dsc;
+    }
+    return undef;
 }
 
 sub check_for_git () {
@@ -565,9 +578,10 @@ END
             $outputhash = make_commit qw(../commit2.tmp);
 	} elsif ($vcmp > 0) {
 	    print STDERR <<END or die $!;
+
 Version actually in archive:    $cversion (older)
 Last allegedly pushed/uploaded: $oversion (newer or same)
-Perhaps the upload is stuck in incoming.  Using the version from git.
+$later_warning_msg
 END
             $outputhash = $upload_hash;
 	} elsif ($outputhash ne $upload_hash) {
@@ -651,6 +665,16 @@ sub fetch_from_archive () {
 	    unless $upload_hash;
 	$hash = $dsc_hash;
 	ensure_we_have_orig();
+	if (is_fast_fwd($dsc_hash,$upload_hash)) {
+	    print STDERR <<END or die $!;
+
+Git commit in archive is behind the last version allegedly pushed/uploaded.
+Commit referred to by archive:  $dsc_hash
+Last allegedly pushed/uploaded: $upload_hash
+$later_warning_msg
+END
+	    $hash = $upload_hash;
+	}
     } else {
 	$hash = generate_commit_from_dsc();
     }