X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=0c351a474459471abd8ec66b9a5a3c3ffac48bba;hb=4f753d1e7e9916352bf2f8670f56c1fa20791915;hp=83abc3b2002e55ef16df7d0e602c41f41bda79b7;hpb=12a135919628ab710b3da22aca356726ea80bd39;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 83abc3b2..0c351a47 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -41,6 +41,8 @@ our ($opt_defaultcmd_interactive);
 
 our $us = qw(git-debrebase);
 
+$|=1;
+
 sub badusage ($) {
     my ($m) = @_;
     print STDERR "bad usage: $m\n";
@@ -276,6 +278,11 @@ sub snags_maybe_bail () {
     }
     $snags_summarised = $snags_forced + $snags_tripped;
 }
+sub snags_maybe_bail_early () {
+    # useful to bail out early without doing a lot of work;
+    # not a substitute for snags_maybe_bail.
+    snags_maybe_bail() if $snags_tripped && !$opt_force;
+}
 sub any_snags () {
     return $snags_forced || $snags_tripped;
 }
@@ -672,10 +679,11 @@ sub walk ($;$$) {
 	if ($nogenerate) {
 	    return (undef,undef);
 	}
-	die "commit $cur: Cannot cope with this commit (d.".
+	fail "found unprocessable commit, cannot cope:".
+	    (defined $cl->{Why} ? "; $cl->{Why}": '').
+	    " (commit $cur) (d.".
 	    (join ' ', map { sprintf "%#x", $_->{Differs} }
 	     @{ $cl->{Parents} }).
-	    (defined $cl->{Why} ? "; $cl->{Why}": '').
 		 ")";
     };
 
@@ -963,7 +971,8 @@ sub defaultcmd_rebase () {
 }
 
 sub cmd_analyse () {
-    die if ($ARGV[0]//'') =~ m/^-/;
+    badusage "analyse does not support any options"
+	if @ARGV and $ARGV[0] =~ m/^-/;
     badusage "too many arguments to analyse" if @ARGV>1;
     my ($old) = @ARGV;
     if (defined $old) {
@@ -1616,7 +1625,42 @@ sub cmd_convert_from_gbp () {
 	    "upstream ($upstream) contains debian/ directory";
     }
 
-    snags_maybe_bail();
+    my $previous_dgit_view = eval {
+	my @clogcmd = qw(dpkg-parsechangelog --format rfc822 -n2);
+	my ($lvsn, $suite);
+	parsechangelog_loop \@clogcmd, 'debian/changelog', sub {
+	    my ($stz, $desc) = @_;
+	    no warnings qw(exiting);
+	    printdebug 'CHANGELOG ', Dumper($desc, $stz);
+	    next unless $stz->{Date};
+	    next unless $stz->{Distribution} ne 'UNRELEASED';
+	    $lvsn = $stz->{Version};
+	    $suite = $stz->{Distribution};
+	    last;
+	};
+	die "neither of the first two changelog entries are released\n"
+	    unless defined $lvsn;
+	print "last finished-looking changelog entry: ($lvsn) $suite\n";
+	my $mtag_pat = debiantag_maintview $lvsn, '*';
+	my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
+	    $mtag_pat;
+	die "could not find suitable maintainer view tag $mtag_pat\n"
+	    unless $mtag_pat =~ m{/};
+	is_fast_fwd $mtag, 'HEAD' or
+	    die "HEAD is not FF from maintainer tag $mtag!";
+	my $dtag = "archive/$mtag";
+	is_fast_fwd $mtag, $dtag or
+	    die "dgit view tag $dtag is not FF from maintainer tag $mtag";
+	print "will stitch in dgit view, $dtag\n";
+	git_rev_parse $dtag;
+    };
+    if (!$previous_dgit_view) {
+	$@ =~ s/^\n+//;
+	chomp $@;
+	print STDERR "cannot stitch in dgit view: $@\n";
+    }
+
+    snags_maybe_bail_early();
 
     my $work;
 
@@ -1645,8 +1689,17 @@ sub cmd_convert_from_gbp () {
 	runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal);
 	runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal);
 	$work = git_rev_parse 'HEAD';
+
+	if ($previous_dgit_view) {
+	    $work = make_commit [$work, $previous_dgit_view], [
+ 'git-debrebase import: declare ff from dgit archive view',
+ '[git-debrebase pseudomerge: import-from-gbp]',
+            ];
+	}
     };
 
+    ffq_check $work;
+    snags_maybe_bail();
     update_head_checkout $old_head, $work, 'convert-from-gbp';
 }