git-debrebase: walk: unprocessable: use fail, not die, and clean up

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index b029e5cff9d1789673d4be8cbb359b85da1043dc..0c351a474459471abd8ec66b9a5a3c3ffac48bba 100755 (executable)
--- 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) {
@@ -980,7 +989,7 @@ sub ffq_prev_branchinfo () {
     return gdr_ffq_prev_branchinfo($current);
 }
 
-sub ffq_check ($$$) {
+sub ffq_check ($;$$) {
     # calls $ff and/or $notff zero or more times
     # then returns either (status,message) where status is
     #    exists
@@ -994,6 +1003,9 @@ sub ffq_check ($$$) {
     # normally $currentval should be HEAD
     my ($currentval, $ff, $notff) =@_;
 
+    $ff //= sub { print $_[0] or die $!; };
+    $notff //= \&snag;
+
     my ($status, $message, $current, $ffq_prev, $gdrlast)
        = ffq_prev_branchinfo();
     return ($status, $message) unless $status eq 'branch';
@@ -1073,8 +1085,7 @@ sub record_ffq_prev_deferred () {
     #   some messages about ff checks
     my $currentval = get_head();
 
-    my ($status,$message, $ffq_prev,$gdrlast) =
-       ffq_check $currentval, sub { print $_[0] or die $!; }, \&snag;
+    my ($status,$message, $ffq_prev,$gdrlast) = ffq_check $currentval;
     return ($status,$message) if defined $status;
 
     snags_maybe_bail();
@@ -1494,7 +1505,7 @@ sub cmd_status () {
 
 sub cmd_stitch () {
     my $prose = 'stitch';
-    GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
+    GetOptions('prose=s', \$prose) or badusage("bad options to stitch");
     badusage "no arguments allowed" if @ARGV;
     do_stitch $prose, 0;
 }
@@ -1558,7 +1569,7 @@ sub make_patches ($) {
 sub cmd_make_patches () {
     my $opt_quiet_would_amend;
     GetOptions('quiet-would-amend!', \$opt_quiet_would_amend)
-       or die badusage("bad options to make-patches");
+       or badusage("bad options to make-patches");
     badusage "no arguments allowed" if @ARGV;
     my $old_head = get_head();
     my $new = make_patches $old_head;
@@ -1614,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;
 
@@ -1643,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';
 }
 
@@ -1739,7 +1794,7 @@ GetOptions("D+" => \$debuglevel,
               # approach.  '-i=s{0,}' does not work with bundling.
               push @$opt_defaultcmd_interactive, @ARGV;
               @ARGV=();
-          }) or die badusage "bad options\n";
+          }) or badusage "bad options\n";
 initdebug('git-debrebase ');
 enabledebug if $debuglevel;