X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=79618d90400f0a834ddd78a2d92a5005c4102aed;hp=1b32fa7c1cc632d9d7ae2d117e7a78756d47a4e1;hb=50442a0454ed323e0fce646d5ebfd213fd7051a9;hpb=dc711dab0d5e682372d2110655286012be08fdbe

diff --git a/dgit b/dgit
index 1b32fa7c..79618d90 100755
--- a/dgit
+++ b/dgit
@@ -619,7 +619,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.test-dummy.git-url' => "$td/git",
 	       'dgit-distro.test-dummy.git-host' => "git",
 	       'dgit-distro.test-dummy.git-path' => "$td/git",
-	       'dgit-distro.test-dummy.archive-query' => "ftpmasterapi:",
+	       'dgit-distro.test-dummy.archive-query' => "dummycatapi:",
 	       'dgit-distro.test-dummy.archive-query-url' => "file://$td/aq/",
 	       'dgit-distro.test-dummy.mirror' => "file://$td/mirror/",
 	       'dgit-distro.test-dummy.upload-host' => 'test-dummy',
@@ -1615,6 +1615,101 @@ sub is_orig_file_of_vsn ($$) {
     return 1;
 }
 
+sub changes_update_origs_from_dsc ($$$$) {
+    my ($dsc, $changes, $upstreamvsn, $changesfile) = @_;
+    my %changes_f;
+    printdebug "checking origs needed ($upstreamvsn)...\n";
+    $_ = getfield $changes, 'Files';
+    m/^\w+ \d+ (\S+ \S+) \S+$/m or
+	fail "cannot find section/priority from .changes Files field";
+    my $placementinfo = $1;
+    my %changed;
+    printdebug "checking origs needed placement '$placementinfo'...\n";
+    foreach my $l (split /\n/, getfield $dsc, 'Files') {
+	$l =~ m/\S+$/ or next;
+	my $file = $&;
+	printdebug "origs $file | $l\n";
+	next unless is_orig_file_of_vsn $file, $upstreamvsn;
+	printdebug "origs $file is_orig\n";
+	my $have = archive_query('file_in_archive', $file);
+	if (!defined $have) {
+	    print STDERR <<END;
+archive does not support .orig check; hope you used --ch:--sa/-sd if needed
+END
+	    return;
+	}
+	my $found_same = 0;
+	my @found_differ;
+	printdebug "origs $file \$#\$have=$#$have\n";
+	foreach my $h (@$have) {
+	    my $same = 0;
+	    my @differ;
+	    foreach my $csumi (@files_csum_info_fields) {
+		my ($fname, $module, $method, $archivefield) = @$csumi;
+		next unless defined $h->{$archivefield};
+		$_ = $dsc->{$fname};
+		next unless defined;
+		m/^(\w+) .* \Q$file\E$/m or
+		    fail ".dsc $fname missing entry for $file";
+		if ($h->{$archivefield} eq $1) {
+		    $same++;
+		} else {
+		    push @differ,
+ "$archivefield: $h->{$archivefield} (archive) != $1 (local .dsc)";
+		}
+	    }
+	    die "$file ".Dumper($h)." ?!" if $same && @differ;
+	    $found_same++
+		if $same;
+	    push @found_differ, "archive $h->{filename}: ".join "; ", @differ
+		if @differ;
+	}
+	print "origs $file f.same=$found_same #f._differ=$#found_differ\n";
+	if (@found_differ && !$found_same) {
+	    fail join "\n",
+		"archive contains $file with different checksum",
+		@found_differ;
+	}
+	# Now we edit the changes file to add or remove it
+	foreach my $csumi (@files_csum_info_fields) {
+	    my ($fname, $module, $method, $archivefield) = @$csumi;
+	    next unless defined $changes->{$fname};
+	    if ($found_same) {
+		# in archive, delete from .changes if it's there
+		$changed{$file} = "removed" if
+		    $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
+	    } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
+		# not in archive, but it's here in the .changes
+	    } else {
+		my $dsc_data = getfield $dsc, $fname;
+		$dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
+		my $extra = $1;
+		$extra =~ s/ \d+ /$&$placementinfo /
+		    or die "$fname $extra >$dsc_data< ?"
+		    if $fname eq 'Files';
+		$changes->{$fname} .= "\n". $extra;
+		$changed{$file} = "added";
+	    }
+	}
+    }
+    if (%changed) {
+	foreach my $file (keys %changed) {
+	    progress sprintf
+		"edited .changes for archive .orig contents: %s %s",
+		$changed{$file}, $file;
+	}
+	my $chtmp = "$changesfile.tmp";
+	$changes->save($chtmp);
+	if (act_local()) {
+	    rename $chtmp,$changesfile or die "$changesfile $!";
+	} else {
+	    progress "[new .changes left in $changesfile]";
+	}
+    } else {
+	progress "$changesfile already has appropriate .orig(s) (if any)";
+    }
+}
+
 sub make_commit ($) {
     my ($file) = @_;
     return cmdoutput @git, qw(hash-object -w -t commit), $file;
@@ -3356,6 +3451,10 @@ END
     files_compare_inputs($dsc, $changes)
 	unless forceing [qw(dsc-changes-mismatch)];
 
+    # Perhaps adjust .dsc to contain right set of origs
+    changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
+				  $changesfile);
+
     # Checks complete, we're going to try and go ahead:
 
     responder_send_file('changes',$changesfile);