X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=863104bfd709bb32e601772cc1976c3bcc3ad5a9;hp=c1615e8a44f6a2c7b91d3b5a945bddd0c573d900;hb=f97a00d63b1d302cb23c5ffb090efea80fd8d42f;hpb=5805198637ef23ec8d8303f4b3b1b7a0df188309

diff --git a/dgit b/dgit
index c1615e8a..863104bf 100755
--- a/dgit
+++ b/dgit
@@ -32,7 +32,6 @@ use POSIX;
 use IPC::Open2;
 use Digest::SHA;
 use Digest::MD5;
-use Config;
 
 use Debian::Dgit;
 
@@ -53,7 +52,7 @@ our $new_package = 0;
 our $ignoredirty = 0;
 our $rmonerror = 1;
 our @deliberatelies;
-our %supersedes;
+our %previously;
 our $existing_package = 'dpkg';
 our $cleanmode = 'dpkg-source';
 our $changes_since_version;
@@ -112,6 +111,8 @@ sub lref () { return "refs/heads/".lbranch(); }
 sub lrref () { return "refs/remotes/$remotename/".server_branch($csuite); }
 sub rrref () { return server_ref($csuite); }
 
+sub lrfetchrefs () { return "refs/dgit-fetch/$isuite"; }
+
 sub stripepoch ($) {
     my ($vsn) = @_;
     $vsn =~ s/^\d+\://;
@@ -140,30 +141,6 @@ END {
     }
 };
 
-our @signames = split / /, $Config{sig_name};
-
-sub waitstatusmsg () {
-    if (!$?) {
-	return "terminated, reporting successful completion";
-    } elsif (!($? & 255)) {
-	return "failed with error exit status ".WEXITSTATUS($?);
-    } elsif (WIFSIGNALED($?)) {
-	my $signum=WTERMSIG($?);
-	return "died due to fatal signal ".
-	    ($signames[$signum] // "number $signum").
-	    ($? & 128 ? " (core dumped)" : ""); # POSIX(3pm) has no WCOREDUMP
-    } else {
-	return "failed with unknown wait status ".$?;
-    }
-}
-
-sub fail { 
-    my $s = "@_\n";
-    my $prefix = $us.($we_are_responder ? " (build host)" : "").": ";
-    $s =~ s/^/$prefix/gm;
-    die $s;
-}
-
 sub badcfg { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
 
 sub no_such_package () {
@@ -183,7 +160,14 @@ sub changedir ($) {
 }
 
 sub deliberately ($) {
-    return !!grep { $_[0] eq $_ } @deliberatelies;
+    my ($enquiry) = @_;
+    return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
+}
+
+sub deliberately_not_fast_forward () {
+    foreach (qw(not-fast-forward fresh-repo)) {
+	return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_");
+    }
 }
 
 #---------- remote protocol support, common ----------
@@ -374,17 +358,6 @@ sub url_get {
 
 our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
 
-sub failedcmd {
-    { local ($!); printcmd \*STDERR, "$us: failed command:", @_ or die $!; };
-    if ($!) {
-	fail "failed to fork/exec: $!";
-    } elsif ($?) {
-	fail "subprocess ".waitstatusmsg();
-    } else {
-	fail "subprocess produced invalid output";
-    }
-}
-
 sub runcmd {
     debugcmd "+",@_;
     $!=0; $?=0;
@@ -402,27 +375,6 @@ sub printdone {
     }
 }
 
-sub cmdoutput_errok {
-    die Dumper(\@_)." ?" if grep { !defined } @_;
-    debugcmd "|",@_;
-    open P, "-|", @_ or die $!;
-    my $d;
-    $!=0; $?=0;
-    { local $/ = undef; $d = <P>; }
-    die $! if P->error;
-    if (!close P) { printdebug "=>!$?\n"; return undef; }
-    chomp $d;
-    $d =~ m/^.*/;
-    printdebug "=> \`$&'",(length $' ? '...' : ''),"\n" if $debuglevel>0; #';
-    return $d;
-}
-
-sub cmdoutput {
-    my $d = cmdoutput_errok @_;
-    defined $d or failedcmd @_;
-    return $d;
-}
-
 sub dryrun_report {
     printcmd(\*STDERR,$debugprefix."#",@_);
 }
@@ -531,8 +483,7 @@ sub cfg {
 	my @cmd = (@git, qw(config --), $c);
 	my $v;
 	{
-	    local ($Debian::Dgit::debuglevel) = $debuglevel-1;
-	    *debug = *Debian::Dgit::debuglevel; # nnng
+	    local ($debuglevel) = $debuglevel-2;
 	    $v = cmdoutput_errok @cmd;
 	};
 	if ($?==0) {
@@ -724,23 +675,6 @@ sub parsechangelog {
     return $c;
 }
 
-sub git_get_ref ($) {
-    my ($refname) = @_;
-    my $got = cmdoutput_errok @git, qw(show-ref --), $refname;
-    if (!defined $got) {
-	$?==256 or fail "git show-ref failed (status $?)";
-	printdebug "ref $refname= [show-ref exited 1]\n";
-	return '';
-    }
-    if ($got =~ m/^(\w+) \Q$refname\E$/m) {
-	printdebug "ref $refname=$1\n";
-	return $1;
-    } else {
-	printdebug "ref $refname= [no match]\n";
-	return '';
-    }
-}
-
 sub must_getcwd () {
     my $d = getcwd();
     defined $d or fail "getcwd failed: $!";
@@ -1328,24 +1262,13 @@ sub ensure_we_have_orig () {
     }
 }
 
-sub rev_parse ($) {
-    return cmdoutput @git, qw(rev-parse), "$_[0]~0";
-}
-
-sub is_fast_fwd ($$) {
-    my ($ancestor,$child) = @_;
-    my @cmd = (@git, qw(merge-base), $ancestor, $child);
-    my $mb = cmdoutput_errok @cmd;
-    if (defined $mb) {
-	return rev_parse($mb) eq rev_parse($ancestor);
-    } else {
-	$?==256 or failedcmd @cmd;
-	return 0;
-    }
-}
-
 sub git_fetch_us () {
     runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
+    if (deliberately_not_fast_forward) {
+	runcmd_ordryrun_local @git, qw(fetch -p), access_giturl(),
+	    map { "+refs/$_/*:".lrfetchrefs."/$_/*" }
+	    qw(tags heads);
+    }
 }
 
 sub fetch_from_archive () {
@@ -1619,9 +1542,9 @@ tagger $authline
 $package release $cversion for $clogsuite ($csuite) [dgit]
 [dgit distro=$declaredistro$delibs]
 END
-    foreach my $ref (sort keys %supersedes) {
+    foreach my $ref (sort keys %previously) {
 		    print TO <<END or die $!;
-[dgit supersede:$ref=$supersedes{$ref}]
+[dgit previously:$ref=$previously{$ref}]
 END
     }
 
@@ -1658,7 +1581,8 @@ sub sign_changes ($) {
     }
 }
 
-sub dopush () {
+sub dopush ($) {
+    my ($forceflag) = @_;
     printdebug "actually entering push\n";
     prep_ud();
 
@@ -1714,7 +1638,7 @@ sub dopush () {
 #    runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
 #        map { lref($_).":".rref($_) }
 #        (uploadbranch());
-    my $head = rev_parse('HEAD');
+    my $head = git_rev_parse('HEAD');
     if (!$changesfile) {
 	my $multi = "$buildproductsdir/".
 	    "${package}_".(stripepoch $cversion)."_multi.changes";
@@ -1737,12 +1661,12 @@ sub dopush () {
     responder_send_command("param head $head");
     responder_send_command("param csuite $csuite");
 
-    my $forceflag = deliberately('not-fast-forward') ? '+' : '';
-    if ($forceflag && defined $lastpush_hash) {
-	git_for_each_tag_referring($lastpush_hash, sub {
-	    my ($objid,$fullrefname,$tagname) = @_;
-	    responder_send_command("supersedes $fullrefname=$objid");
-	    $supersedes{$fullrefname} = $objid;
+    if (deliberately_not_fast_forward) {
+	git_for_each_ref(lrfetchrefs, sub {
+	    my ($objid,$objtype,$lrfetchrefname,$reftail) = @_;
+	    my $rrefname= substr($lrfetchrefname, length(lrfetchrefs) + 1);
+	    responder_send_command("previously $rrefname=$objid");
+	    $previously{$rrefname} = $objid;
 	});
     }
 
@@ -1902,17 +1826,26 @@ sub cmd_push {
     if (check_for_git()) {
 	git_fetch_us();
     }
+    my $forceflag = '';
     if (fetch_from_archive()) {
-	is_fast_fwd(lrref(), 'HEAD') or
+	if (is_fast_fwd(lrref(), 'HEAD')) {
+	    # ok
+	} elsif (deliberately_not_fast_forward) {
+	    $forceflag = '+';
+	} else {
 	    fail "dgit push: HEAD is not a descendant".
 	        " of the archive's version.\n".
-		"$us: To overwrite it, use git merge -s ours ".lrref().".";
+		"dgit: To overwrite its contents,".
+		" use git merge -s ours ".lrref().".\n".
+		"dgit: To rewind history, if permitted by the archive,".
+		" use --deliberately-not-fast-forward";
+	}
     } else {
 	$new_package or
 	    fail "package appears to be new in this suite;".
 	        " if this is intentional, use --new";
     }
-    dopush();
+    dopush($forceflag);
 }
 
 #---------- remote commands' implementation ----------
@@ -1928,6 +1861,7 @@ sub cmd_remote_push_build_host {
     # offered several)
     $debugprefix = ' ';
     $we_are_responder = 1;
+    $us .= " (build host)";
 
     open PI, "<&STDIN" or die $!;
     open STDIN, "/dev/null" or die $!;
@@ -2050,12 +1984,12 @@ sub i_resp_param ($) {
     $i_param{$1} = $2;
 }
 
-sub i_resp_supersedes ($) {
+sub i_resp_previously ($) {
     $_[0] =~ m#^(refs/tags/\S+)=(\w+)$#
-	or badproto \*RO, "bad supersedes spec";
+	or badproto \*RO, "bad previously spec";
     my $r = system qw(git check-ref-format), $1;
-    die "bad supersedes ref spec ($r)" if $r;
-    $supersedes{$1} = $2;
+    die "bad previously ref spec ($r)" if $r;
+    $previously{$1} = $2;
 }
 
 our %i_wanted;
@@ -2449,7 +2383,7 @@ sub build_maybe_quilt_fixup () {
     #     6. Back in the main tree, fast forward to the new HEAD
 
     my $clogp = parsechangelog();
-    my $headref = rev_parse('HEAD');
+    my $headref = git_rev_parse('HEAD');
 
     prep_ud();
     changedir $ud;
@@ -2698,6 +2632,7 @@ sub cmd_archive_api_query {
     badusage "need only 1 subpath argument" unless @ARGV==1;
     my ($subpath) = @ARGV;
     my @cmd = archive_api_query_cmd($subpath);
+    debugcmd ">",@cmd;
     exec @cmd or fail "exec curl: $!\n";
 }
 
@@ -2784,7 +2719,7 @@ sub parseopts () {
 	    } elsif (m/^--no-rm-on-error$/s) {
 		push @ropts, $_;
 		$rmonerror = 0;
-	    } elsif (m/^--deliberately-($suite_re)$/s) {
+	    } elsif (m/^--deliberately-($deliberately_re)$/s) {
 		push @ropts, $_;
 		push @deliberatelies, $&;
 	    } else {