X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=759df20e5df761a58e05418538283e48003ebb07;hp=8db03b3f5ee8737b55a50b1c8c585c66c0ea1ec0;hb=fb73b55ade7687b65727b1146b860ea892425cc6;hpb=1f7cd634c8922afa99cf917951b5499962ee897e

diff --git a/dgit b/dgit
index 8db03b3f..759df20e 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;
 
@@ -140,30 +139,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 +158,8 @@ sub changedir ($) {
 }
 
 sub deliberately ($) {
-    return !!grep { $_[0] eq $_ } @deliberatelies;
+    my ($enquiry) = @_;
+    return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
 }
 
 #---------- remote protocol support, common ----------
@@ -374,17 +350,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 +367,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."#",@_);
 }
@@ -723,23 +667,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: $!";
@@ -1327,22 +1254,6 @@ 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();
 }
@@ -1657,7 +1568,8 @@ sub sign_changes ($) {
     }
 }
 
-sub dopush () {
+sub dopush ($) {
+    my ($forceflag) = @_;
     printdebug "actually entering push\n";
     prep_ud();
 
@@ -1713,7 +1625,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";
@@ -1736,12 +1648,11 @@ 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;
+	    my ($tagobjid,$refobjid,$fullrefname,$tagname) = @_;
+	    responder_send_command("supersedes $fullrefname=$tagobjid");
+	    $supersedes{$fullrefname} = $tagobjid;
 	});
     }
 
@@ -1901,17 +1812,27 @@ 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') ||
+		 deliberately('TEST-not-fast-forward-dgit-only')) {
+	    $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 ----------
@@ -1927,6 +1848,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 $!;
@@ -2448,7 +2370,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;
@@ -2784,7 +2706,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 {