X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=b51c7148e53f663251372c145953a884c2b736a1;hb=69aae724c3d05a20219e5a9642e162dd65ef2fe9;hp=a28b910bdcba08f2dd1c8f8b242917e27474ec8f;hpb=e8d0e4e6c4a5c34798d6be4e6b5be2349301d584;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index a28b910b..b51c7148 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -114,6 +114,7 @@ our $rd;
 our $workarea;
 
 our @git = qw(git);
+our @dgit = qw(dgit);
 
 sub in_workarea ($) {
     my ($sub) = @_;
@@ -595,6 +596,7 @@ sub keycommits ($;$$$$) {
     my ($anchor, $breakwater);
     my $clogonly;
     my $cl;
+    my $found_pm;
     $fatal //= sub { fail $_[1]; };
     my $x = sub {
 	my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
@@ -634,12 +636,20 @@ sub keycommits ($;$$$$) {
 	    $breakwater = undef;
 	} elsif ($ty eq 'Pseudomerge' or
 		 $ty eq 'AddPatches') {
+	    my $found_pm = 1;
 	    $x->($furniture, (lc $ty),
 		 "found interchange bureaucracy commit ($ty)"," ($head)");
 	} elsif ($ty eq 'DgitImportUnpatched') {
-	    $x->($trouble, 'dgitimport',
-		 "found dgit dsc import ($head)");
-	    return (undef,undef);
+	    if ($found_pm) {
+		$x->($trouble, 'dgitimport',
+		     "found dgit dsc import"," ($head)");
+		return (undef,undef);
+	    } else {
+		$x->($fatal, 'unprocessable',
+		     "found bare dgit dsc import with no prior history",
+		     " ($head)");
+		return (undef,undef);
+	    }
 	} else {
 	    $x->($fatal, 'unprocessable',
 		 "found unprocessable commit, cannot cope: $cl->{Why}",
@@ -701,8 +711,8 @@ sub walk ($;$$) {
 	if ($nogenerate) {
 	    return (undef,undef);
 	}
-	fail "found unprocessable commit, cannot cope:".
-	    (defined $cl->{Why} ? "; $cl->{Why}": '').
+	fail "found unprocessable commit, cannot cope".
+	    (defined $cl->{Why} ? "; $cl->{Why}:": ':').
 	    " (commit $cur) (d.".
 	    (join ' ', map { sprintf "%#x", $_->{Differs} }
 	     @{ $cl->{Parents} }).
@@ -814,13 +824,12 @@ sub walk ($;$$) {
 		next;
 	    } else {
 		# Everything is from this import.  This kind of import
-		# is already in valid breakwater format, with the
-		# patches as commits.
-		printf $report " NoPM" if $report;
-		# last thing we processed will have been the first patch,
-		# if there is one; which is fine, so no need to rewrite
-		# on account of this import
-		$build_start->("ImportOrigin", $cur);
+		# is already nearly in valid breakwater format, with the
+		# patches as commits.  Unfortunately it contains
+		# debian/patches/.
+		printdebug "*** WALK BOMB bare dgit import\n";
+		$cl->{Why} = "bare dgit dsc import";
+		return $bomb->();
 	    }
 	    die "$ty ?";
         } else {
@@ -1184,18 +1193,23 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
+sub upstream_commitish_search ($$) {
+    my ($upstream_version, $tried) = @_;
+    # todo: at some point maybe use git-deborig to do this
+    foreach my $tagpfx ('', 'v', 'upstream/') {
+	my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
+	my $new_upstream = git_get_ref "refs/tags/$tag";
+	push @$tried, $tag;
+	return $new_upstream if length $new_upstream;
+    }
+}
+
 sub resolve_upstream_version ($$) {
     my ($new_upstream, $upstream_version) = @_;
 
     if (!defined $new_upstream) {
 	my @tried;
-	# todo: at some point maybe use git-deborig to do this
-	foreach my $tagpfx ('', 'v', 'upstream/') {
-	    my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
-	    $new_upstream = git_get_ref "refs/tags/$tag";
-	    last if length $new_upstream;
-	    push @tried, $tag;
-	}
+	$new_upstream = upstream_commitish_search $upstream_version, \@tried;
 	if (!length $new_upstream) {
 	    fail "Could not determine appropriate upstream commitish.\n".
 		" (Tried these tags: @tried)\n".
@@ -1829,6 +1843,7 @@ getoptions_main
 	   'noop-ok', => \$opt_noop_ok,
 	   'f=s' => \@snag_force_opts,
 	   'anchor=s' => \@opt_anchors,
+	   '--dgit=s' => \($dgit[0]),
 	   'force!',
 	   '-i:s' => sub {
 	       my ($opt,$val) = @_;