X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=357ccc3ac96e0faaa1be3502f364cf03b7d81bd5;hb=f8607d8ff99642d610d2bc338eb831aae4baba2b;hp=949d22c794f4e04ede69f238601ef5f690071c95;hpb=251174a2cc06e0cd3041c0b97b9fc687902979fc;p=dgit.git

diff --git a/dgit b/dgit
index 949d22c7..357ccc3a 100755
--- a/dgit
+++ b/dgit
@@ -50,8 +50,6 @@ our (@dget) = qw(dget);
 our (@dput) = qw(dput);
 our (@debsign) = qw(debsign);
 our (@gpg) = qw(gpg);
-fixme should be in manual
-fixme should pass this to debsign
 our (@sbuild) = qw(sbuild -A);
 our (@dpkgbuildpackage) = qw(dpkg-buildpackage -i\.git/ -I.git);
 our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
@@ -122,13 +120,17 @@ sub fetchspec () {
 
 our $ua;
 
+sub progress {
+    print @_, "\n";
+}
+
 sub url_get {
     if (!$ua) {
 	$ua = LWP::UserAgent->new();
 	$ua->env_proxy;
     }
     my $what = $_[$#_];
-    print "downloading $what...\n";
+    progress "downloading $what...";
     my $r = $ua->get(@_) or die $!;
     return undef if $r->code == 404;
     $r->is_success or fail "failed to fetch $what: ".$r->status_line;
@@ -174,9 +176,9 @@ sub runcmd {
 
 sub printdone {
     if (!$dryrun) {
-	print "dgit ok: @_\n";
+	progress "dgit ok: @_";
     } else {
-	print "would be ok: @_ (but dry run only)\n";
+	progress "would be ok: @_ (but dry run only)";
     }
 }
 
@@ -443,7 +445,7 @@ sub canonicalise_suite () {
     $csuite = archive_query('canonicalise_suite');
     if ($isuite ne $csuite) {
 	# madison canonicalises for us
-	print "canonical suite name for $isuite is $csuite\n";
+	progress "canonical suite name for $isuite is $csuite";
     }
 }
 
@@ -613,7 +615,7 @@ END
     close C or die $!;
     my $outputhash = make_commit qw(../commit.tmp);
     my $cversion = getfield $clogp, 'Version';
-    print "synthesised git commit from .dsc $cversion\n";
+    progress "synthesised git commit from .dsc $cversion";
     if ($lastpush_hash) {
 	runcmd @git, qw(reset --hard), $lastpush_hash;
 	runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
@@ -668,7 +670,7 @@ sub ensure_we_have_orig () {
 		fail "existing file $f has hash $got but .dsc".
 		    " demands hash $fi->{Hash}".
 		    " (perhaps you should delete this file?)";
-	    print "using existing $f\n";
+	    progress "using existing $f";
 	    next;
 	} else {
 	    die "$f $!" unless $!==&ENOENT;
@@ -715,12 +717,12 @@ sub fetch_from_archive () {
 	if (defined $dsc_hash) {
 	    $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
 	    $dsc_hash = $&;
-	    print "last upload to archive specified git hash\n";
+	    progress "last upload to archive specified git hash";
 	} else {
-	    print "last upload to archive has NO git hash\n";
+	    progress "last upload to archive has NO git hash";
 	}
     } else {
-	print "no version available from the archive\n";
+	progress "no version available from the archive";
     }
 
     my $lrref_fn = ".git/".lrref();
@@ -828,11 +830,11 @@ sub clone ($) {
     close H or die $!;
     runcmd @git, qw(remote add), 'origin', access_giturl();
     if (check_for_git()) {
-	print "fetching existing git history\n";
+	progress "fetching existing git history";
 	git_fetch_us();
 	runcmd_ordryrun @git, qw(fetch origin);
     } else {
-	print "starting new git history\n";
+	progress "starting new git history";
     }
     fetch_from_archive() or no_such_package;
     runcmd @git, qw(reset --hard), lrref();
@@ -882,50 +884,128 @@ sub commit_quilty_patch () {
     }
     fail "unexpected output from git status (is tree clean?)" if $bad;
     if (!%adds) {
-	print "nothing quilty to commit, ok.\n";
+	progress "nothing quilty to commit, ok.";
 	return;
     }
     runcmd_ordryrun @git, qw(add), sort keys %adds;
     my $m = "Commit Debian 3.0 (quilt) metadata";
-    print "$m\n";
+    progress "$m";
     runcmd_ordryrun @git, qw(commit -m), $m;
 }
 
 sub madformat ($) {
     my ($format) = @_;
     return 0 unless $format eq '3.0 (quilt)';
-    print "Format \`$format', urgh\n";
+    progress "Format \`$format', urgh";
     if ($noquilt) {
-	print "Not doing any fixup of \`$format' due to --no-quilt-fixup";
+	progress "Not doing any fixup of \`$format' due to --no-quilt-fixup";
 	return 0;
     }
     return 1;
 }
 
-sub dopush () {
-    print DEBUG "actually entering push\n";
-    my $clogp = parsechangelog();
+sub push_parse_changelog ($) {
+    my ($clogpfn) = @_;
+
+    my $clogp = Dpkg::Control::Hash->new();
+    $clogp->load($clogpfn);
+
+    responder_send_file('parsed-changelog', $clogpfn);
+
     $package = getfield $clogp, 'Source';
     my $cversion = getfield $clogp, 'Version';
+    my $tag = debiantag($cversion);
+    runcmd @git, qw(check-ref-format), $tag;
+
     my $dscfn = dscfn($cversion);
-    stat "../$dscfn" or
-	fail "looked for .dsc $dscfn, but $!;".
-	    " maybe you forgot to build";
-    $dsc = parsecontrol("../$dscfn","$dscfn");
-    my $dscpackage = getfield $dsc, 'Source';
-    my $format = getfield $dsc, 'Format';
+
+    return ($clogp, $cversion, $tag, $dscfn);
+}
+
+sub push_parse_dsc ($$) {
+    my ($dscfn,$dscfnwhat, $cversion) = @_;
+    $dsc = parsecontrol($dscfn,$dscfnwhat);
     my $dversion = getfield $dsc, 'Version';
+    my $dscpackage = getfield $dsc, 'Source';
     ($dscpackage eq $package && $dversion eq $cversion) or
 	fail "$dsc is for $dscpackage $dversion".
 	    " but debian/changelog is for $package $cversion";
+}
+
+sub push_mktag ($$$$$$$$) {
+    my ($head,$clogp,$tag,
+	$dsc,$dscfn,
+	$changesfile,$changesfilewhat,
+	$tfn) = @_;
+
+    $dsc->{$ourdscfield[0]} = $head;
+    $dsc->save("$dscfn.tmp") or die $!;
+
+    my $changes = parsecontrol($changesfile,$changesfilewhat);
+    foreach my $field (qw(Source Distribution Version)) {
+	$changes->{$field} eq $clogp->{$field} or
+	    fail "changes field $field \`$changes->{$field}'".
+	        " does not match changelog \`$clogp->{$field}'";
+    }
+
+    # We make the git tag by hand because (a) that makes it easier
+    # to control the "tagger" (b) we can do remote signing
+    my $authline = clogp_authline $clogp;
+    open TO, '>', $tfn->('.tmp') or die $!;
+    print TO <<END or die $!;
+object $head
+type commit
+tag $tag
+tagger $authline
+
+$package release $cversion for $csuite [dgit]
+END
+    close TO or die $!;
+
+    my $tagobjfn = $tfn->('.tmp');
+    if ($sign) {
+	if (!defined $keyid) {
+	    $keyid = access_cfg('keyid','RETURN-UNDEF');
+	}
+	unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
+	my @sign_cmd = (@gpg, qw(--detach-sign --armor));
+	push @sign_cmd, qw(-u),$keyid if defined $keyid;
+	push @sign_cmd, $tfn->('.tmp');
+	runcmd_ordryrun @sign_cmd;
+	if (!$dryrun) {
+	    $tagobjfn = $tfn->('.signed.tmp');
+	    runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
+	        $tfn->('.tmp'), $tfn->('.tmp.asc');
+	}
+    }
+
+    return ($tagobjfn);
+}
+
+sub dopush () {
+    print DEBUG "actually entering push\n";
+    prep_ud();
+
+    runcmd shell_cmd "exec >.git/dgit/changelog.822.tmp",
+        qw(dpkg-parsechangelog);
+
+    my ($clogp, $cversion, $tag, $dscfn) =
+	push_parse_changelog(".git/dgit/changelog.822.tmp");
+
+    stat "../$dscfn" or
+	fail "looked for .dsc $dscfn, but $!;".
+	    " maybe you forgot to build";
+
+    push_parse_dsc("../$dscfn", $dscfn, $cversion);
+
+    my $format = getfield $dsc, 'Format';
     print DEBUG "format $format\n";
     if (madformat($format)) {
 	commit_quilty_patch();
     }
     check_not_dirty();
-    prep_ud();
     chdir $ud or die $!;
-    print "checking that $dscfn corresponds to HEAD\n";
+    progress "checking that $dscfn corresponds to HEAD";
     runcmd qw(dpkg-source -x --), "../../../../$dscfn";
     my ($tree,$dir) = mktree_in_ud_from_only_subdir();
     chdir '../../../..' or die $!;
@@ -947,8 +1027,6 @@ sub dopush () {
 #        map { lref($_).":".rref($_) }
 #        (uploadbranch());
     my $head = rev_parse('HEAD');
-    $dsc->{$ourdscfield[0]} = $head;
-    $dsc->save("../$dscfn.tmp") or die $!;
     if (!$changesfile) {
 	my $multi = "../${package}_".(stripepoch $cversion)."_multi.changes";
 	if (stat "$multi") {
@@ -964,43 +1042,18 @@ sub dopush () {
 	    ($changesfile) = @cs;
 	}
     }
-    my $changes = parsecontrol($changesfile,$changesfile);
-    foreach my $field (qw(Source Distribution Version)) {
-	$changes->{$field} eq $clogp->{$field} or
-	    fail "changes field $field \`$changes->{$field}'".
-	        " does not match changelog \`$clogp->{$field}'";
-    }
-    my $tag = debiantag($dversion);
-    runcmd @git, qw(check-ref-format), $tag;
 
-    # We make the git tag by hand because (a) that makes it easier
-    # to control the "tagger" (b) we can do remote signing
-    my $authline = clogp_authline $clogp;
-    my $tfn = sub { ".git/dgit/tag$_[0]"; };
-    open TO, '>', $tfn->('.tmp') or die $!;
-    print TO <<END or die $!;
-object $head
-type commit
-tag $tag
-tagger $authline
+    my ($tagobjfn) =
+	push_mktag($head,$clogp,$tag,
+		   $dsc,"../$dscfn",
+		   $changesfile,$changesfile,
+		   sub { ".git/dgit/tag$_[0]"; });
 
-$package release $dversion for $csuite [dgit]
-END
-    close TO or die $!;
+    my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
+    runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
+    runcmd_ordryrun @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
+    runcmd_ordryrun @git, qw(tag -v --), $tag;
 
-    my $tagobjfn = $tfn->('.tmp');
-    if ($sign) {
-	if (!defined $keyid) {
-	    $keyid = access_cfg('keyid','RETURN-UNDEF');
-	}
-	unlink $tfn->('.tmp.asc') or $!==&ENOENT or die $!;
-	my @sign_cmd = (@gpg, qw(--clearsign --armor));
-	push @sign_cmd, qw(-u),$keyid if defined $keyid;
-	push @sign_cmd, $tfn->('.tmp');
-	runcmd_ordryrun @sign_cmd;
-	if (!$dry
-	runcmd_ordryrun @
-    }
     if (!check_for_git()) {
 	create_remote_git_repo();
     }
@@ -1009,20 +1062,10 @@ END
     if (!$dryrun) {
 	rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
     } else {
-	print "[new .dsc left in $dscfn.tmp]\n";
+	progress "[new .dsc left in $dscfn.tmp]";
     }
 
     if ($sign) {
-	if (!$as_remote) {
-	    my @tag_cmd = (@git, qw(tag -a -m),
-			   );
-	    push @tag_cmd, $tag;
-	    runcmd_ordryrun @tag_cmd;
-	} else {
-	}
-
-	push @tag_cmd, qw(-u),$keyid if defined $keyid;
-
 	my @debsign_cmd = @debsign;
 	push @debsign_cmd, "-k$keyid" if defined $keyid;
 	push @debsign_cmd, $changesfile;
@@ -1032,7 +1075,7 @@ END
     my $host = access_cfg('upload-host','RETURN-UNDEF');
     my @hostarg = defined($host) ? ($host,) : ();
     runcmd_ordryrun @dput, @hostarg, $changesfile;
-    printdone "pushed and uploaded $dversion";
+    printdone "pushed and uploaded $cversion";
 }
 
 sub cmd_clone {
@@ -1076,7 +1119,7 @@ sub fetchpullargs () {
 	    $isuite = getfield $clogp, 'Distribution';
 	}
 	canonicalise_suite();
-	print "fetching from suite $csuite\n";
+	progress "fetching from suite $csuite";
     } elsif (@ARGV==1) {
 	($isuite) = @ARGV;
 	canonicalise_suite();
@@ -1103,15 +1146,24 @@ sub cmd_push {
     check_not_dirty();
     my $clogp = parsechangelog();
     $package = getfield $clogp, 'Source';
+    my $specsuite;
     if (@ARGV==0) {
-	$isuite = getfield $clogp, 'Distribution';
-	if ($new_package) {
-	    local ($package) = $existing_package; # this is a hack
-	    canonicalise_suite();
-	}
+    } elsif (@ARGV==1) {
+	($specsuite) = (@ARGV);
     } else {
 	badusage "incorrect arguments to dgit push";
     }
+    $isuite = getfield $clogp, 'Distribution';
+    if ($new_package) {
+	local ($package) = $existing_package; # this is a hack
+	canonicalise_suite();
+    }
+    if (defined $specsuite && $specsuite ne $isuite) {
+	canonicalise_suite();
+	$csuite eq $specsuite or
+	    fail "dgit push: changelog specifies $isuite ($csuite)".
+	        " but command line specifies $specsuite";
+    }
     if (check_for_git()) {
 	git_fetch_us();
     }