X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=3e746d2cce9808bbc3ca1e74a48c4577e2ff7ee9;hb=6359817c2baf67249782dc428c34c97e6a633b3b;hp=ef815997de84c0e581f3f4d7bf3347ebcb64dd08;hpb=612c3e10d7d797a48798fa82578760eea2231103;p=dgit.git

diff --git a/dgit b/dgit
index ef815997..3e746d2c 100755
--- a/dgit
+++ b/dgit
@@ -67,6 +67,7 @@ our $rmchanges;
 our $overwrite_version; # undef: not specified; '': check changelog
 our $quilt_mode;
 our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied';
+our $split_brain_save;
 our $we_are_responder;
 our $initiator_tempdir;
 our $patches_applied_dirtily = 00;
@@ -2981,6 +2982,18 @@ sub madformat_wantfixup ($) {
     return 1;
 }
 
+sub maybe_split_brain_save ($$$) {
+    my ($headref, $dgitview, $msg) = @_;
+    # => message fragment "$saved" describing disposition of $dgitview
+    return "commit id $dgitview" unless defined $split_brain_save;
+    my @cmd = (shell_cmd "cd ../../../..",
+	       @git, qw(update-ref -m),
+	       "dgit --dgit-view-save $msg HEAD=$headref",
+	       $split_brain_save, $dgitview);
+    runcmd @cmd;
+    return "and left in $split_brain_save";
+}
+
 # An "infopair" is a tuple [ $thing, $what ]
 # (often $thing is a commit hash; $what is a description)
 
@@ -3141,6 +3154,8 @@ END_OVERWR
 Make fast forward from $i_arch_v->[0]
 END_MAKEFF
 
+    maybe_split_brain_save $maintview, $r, "pseudomerge";
+
     progress "Made pseudo-merge of $i_arch_v->[0] into dgit view.";
     return $r;
 }	
@@ -4159,9 +4174,10 @@ END
     runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
 	$dgitview;
 
-    progress "dgit view: created (commit id $dgitview)";
-
     changedir '.git/dgit/unpack/work';
+
+    my $saved = maybe_split_brain_save $headref, $dgitview, "converted";
+    progress "dgit view: created ($saved)";
 }
 
 sub quiltify ($$$$) {
@@ -4631,8 +4647,9 @@ sub quilt_check_splitbrain_cache ($$) {
 	    
 	my $cachehit = $1;
 	quilt_fixup_mkwork($headref);
+	my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
 	if ($cachehit ne $headref) {
-	    progress "dgit view: found cached (commit id $cachehit)";
+	    progress "dgit view: found cached ($saved)";
 	    runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
 	    $split_brain = 1;
 	    return ($cachehit, $splitbrain_cachekey);
@@ -5276,6 +5293,19 @@ sub cmd_quilt_fixup {
 }
 
 sub cmd_import_dsc {
+    my $needsig = 0;
+
+    while (@ARGV) {
+	last unless $ARGV[0] =~ m/^-/;
+	$_ = shift @ARGV;
+	last if m/^--?$/;
+	if (m/^--require-valid-signature$/) {
+	    $needsig = 1;
+	} else {
+	    badusage "unknown dgit import-dsc sub-option \`$_'";
+	}
+    }
+
     badusage "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH" unless @ARGV==2;
     my ($dscfn, $dstbranch) = @ARGV;
 
@@ -5304,6 +5334,25 @@ sub cmd_import_dsc {
     $dscdata = do { local $/ = undef; <D>; };
     D->error and fail "read $dscfn: $!";
     close C;
+
+    # we don't normally need this so import it here
+    use Dpkg::Source::Package;
+    my $dp = new Dpkg::Source::Package filename => $dscfn,
+	require_valid_signature => $needsig;
+    {
+	local $SIG{__WARN__} = sub {
+	    print STDERR $_[0];
+	    return unless $needsig;
+	    fail "import-dsc signature check failed";
+	};
+	if (!$dp->is_signed()) {
+	    warn "$us: warning: importing unsigned .dsc\n";
+	} else {
+	    my $r = $dp->check_signature();
+	    die "->check_signature => $r" if $needsig && $r;
+	}
+    }
+
     parse_dscdata();
 
     my $dgit_commit = $dsc->{$ourdscfield[0]};
@@ -5549,6 +5598,10 @@ sub parseopts () {
 	    } elsif (m/^--overwrite=(.+)$/s) {
 		push @ropts, $_;
 		$overwrite_version = $1;
+	    } elsif (m/^--dgit-view-save=(.+)$/s) {
+		push @ropts, $_;
+		$split_brain_save = $1;
+		$split_brain_save =~ s#^(?!refs/)#refs/heads/#;
 	    } elsif (m/^--(no-)?rm-old-changes$/s) {
 		push @ropts, $_;
 		$rmchanges = !$1;