git-debrebase: ffq_check: Move defaults for $ff and $notff into sub

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 04befff5484477c888825954b20ae53c760ce983..a79b4867b63def9888baadee4be3cc8563d51655 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -270,7 +270,7 @@ sub snags_maybe_bail () {
                $us, $snags_tripped;
        } else {
            fail sprintf
                $us, $snags_tripped;
        } else {
            fail sprintf

-  "%s: snags: %d blockers (you could -f<tag>, or --force)",
+  "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",

                $us, $snags_tripped;
        }
     }
                $us, $snags_tripped;
        }
     }


@@ -568,11 +568,12 @@ sub keycommits ($;$$$$) {
     my $cl;
     $fatal //= sub { fail $_[2]; };
     my $x = sub {
     my $cl;
     $fatal //= sub { fail $_[2]; };
     my $x = sub {

-       my ($cb, $tagsfx, $why) = @_;
+       my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
+       my $why = $mainwhy.$xwhy;

        my $m = "branch needs laundering (run git-debrebase): $why";
        fail $m unless defined $cb;
        return unless $cb;
        my $m = "branch needs laundering (run git-debrebase): $why";
        fail $m unless defined $cb;
        return unless $cb;

-       $cb->("unclean-$tagsfx", $why, $cl);
+       $cb->("unclean-$tagsfx", $why, $cl, $mainwhy);

     };
     for (;;) {
        $cl = classify $head;
     };
     for (;;) {
        $cl = classify $head;


@@ -593,27 +594,27 @@ sub keycommits ($;$$$$) {
            last;
        } elsif ($ty eq 'Upstream') {
            $x->($unclean, 'ordering',
            last;
        } elsif ($ty eq 'Upstream') {
            $x->($unclean, 'ordering',

- "packaging change ($breakwater) follows upstream change (eg $head)")
+ "packaging change ($breakwater) follows upstream change"," (eg $head)")

                if defined $breakwater;
            $clogonly = undef;
            $breakwater = undef;
        } elsif ($ty eq 'Mixed') {
            $x->($unclean, 'mixed',
                if defined $breakwater;
            $clogonly = undef;
            $breakwater = undef;
        } elsif ($ty eq 'Mixed') {
            $x->($unclean, 'mixed',

-                "found mixed upstream/packaging commit ($head)");
+                "found mixed upstream/packaging commit"," ($head)");

            $clogonly = undef;
            $breakwater = undef;
        } elsif ($ty eq 'Pseudomerge' or
                 $ty eq 'AddPatches') {
            $x->($furniture, (lc $ty),
            $clogonly = undef;
            $breakwater = undef;
        } elsif ($ty eq 'Pseudomerge' or
                 $ty eq 'AddPatches') {
            $x->($furniture, (lc $ty),

-                "found interchange bureaucracy commit ($ty, $head)");
+                "found interchange bureaucracy commit ($ty)"," ($head)");

        } elsif ($ty eq 'DgitImportUnpatched') {
            $x->($trouble, 'dgitimport',
                 "found dgit dsc import ($head)");
            return (undef,undef);
        } else {
            $x->($fatal, 'unprocessable',
        } elsif ($ty eq 'DgitImportUnpatched') {
            $x->($trouble, 'dgitimport',
                 "found dgit dsc import ($head)");
            return (undef,undef);
        } else {
            $x->($fatal, 'unprocessable',

-                "found unprocessable commit, cannot cope: $head; $cl->{Why}"
-               );
+                "found unprocessable commit, cannot cope: $cl->{Why}",
+                " ($head)");

            return (undef,undef);
        }
        $head = $cl->{Parents}[0]{CommitId};
            return (undef,undef);
        }
        $head = $cl->{Parents}[0]{CommitId};


@@ -979,24 +980,27 @@ sub ffq_prev_branchinfo () {
     return gdr_ffq_prev_branchinfo($current);
 }
 
     return gdr_ffq_prev_branchinfo($current);
 }
 

-sub record_ffq_prev_deferred () {
-    # => ('status', "message")
-    # 'status' may be
-    #    deferred          message is undef
+sub ffq_check ($;$$) {
+    # calls $ff and/or $notff zero or more times
+    # then returns either (status,message) where status is

     #    exists
     #    detached
     #    weird-symref
     #    notbranch
     #    exists
     #    detached
     #    weird-symref
     #    notbranch

-    # if not ff from some branch we should be ff from, is an snag
-    # if "deferred", will have added something about that to
-    #   @deferred_update_messages, and also maybe printed (already)
-    #   some messages about ff checks
+    # or (undef,undef, $ffq_prev,$gdrlast)
+    # $ff and $notff are called like this:
+    #   $ff->("message for stdout\n");
+    #   $notff->('snag-name', $message);
+    # 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';
 
     my ($status, $message, $current, $ffq_prev, $gdrlast)
        = ffq_prev_branchinfo();
     return ($status, $message) unless $status eq 'branch';
 

-    my $currentval = get_head();
-

     my $exists = git_get_ref $ffq_prev;
     return ('exists',"$ffq_prev already exists") if $exists;
 
     my $exists = git_get_ref $ffq_prev;
     return ('exists',"$ffq_prev already exists") if $exists;
 


@@ -1023,14 +1027,14 @@ sub record_ffq_prev_deferred () {
        return unless length $lrval;
 
        if (is_fast_fwd $lrval, $currentval) {
        return unless length $lrval;
 
        if (is_fast_fwd $lrval, $currentval) {

-           print "OK, you are ahead of $lrref\n" or die $!;
+           $ff->("OK, you are ahead of $lrref\n");

            $checked{$lrref} = 1;
        } elsif (is_fast_fwd $currentval, $lrval) {
            $checked{$lrref} = -1;
            $checked{$lrref} = 1;
        } elsif (is_fast_fwd $currentval, $lrval) {
            $checked{$lrref} = -1;

-           snag 'behind', "you are behind $lrref, divergence risk";
+           $notff->('behind', "you are behind $lrref, divergence risk");

        } else {
            $checked{$lrref} = -1;
        } else {
            $checked{$lrref} = -1;

-           snag 'diverged', "you have diverged from $lrref";
+           $notff->('diverged', "you have diverged from $lrref");

        }
     };
 
        }
     };
 


@@ -1055,6 +1059,25 @@ sub record_ffq_prev_deferred () {
     } elsif ($branch =~ m{^master$}) {
        $check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid');
     }
     } elsif ($branch =~ m{^master$}) {
        $check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid');
     }

+    return (undef, undef, $ffq_prev, $gdrlast);
+}
+
+sub record_ffq_prev_deferred () {
+    # => ('status', "message")
+    # 'status' may be
+    #    deferred          message is undef
+    #    exists
+    #    detached
+    #    weird-symref
+    #    notbranch
+    # if not ff from some branch we should be ff from, is an snag
+    # if "deferred", will have added something about that to
+    #   @deferred_update_messages, and also maybe printed (already)
+    #   some messages about ff checks
+    my $currentval = get_head();
+
+    my ($status,$message, $ffq_prev,$gdrlast) = ffq_check $currentval;
+    return ($status,$message) if defined $status;

 
     snags_maybe_bail();
 
 
     snags_maybe_bail();
 


@@ -1139,7 +1162,11 @@ sub cmd_new_upstream () {
     badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
 
     # parse args - low commitment
     badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
 
     # parse args - low commitment

-    my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
+    my $spec_version = shift @ARGV;
+    my $new_version = (new Dpkg::Version $spec_version, check => 1);
+    if ($new_version->is_native()) {
+       $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
+    }

     my $new_upstream_version = $new_version->version();
 
     my $new_upstream = shift @ARGV;
     my $new_upstream_version = $new_version->version();
 
     my $new_upstream = shift @ARGV;


@@ -1388,15 +1415,20 @@ sub cmd_status () {
     # todo: gdr status should print upstream component(s) info
     # todo: gdr should leave/maintain some refs with this kind of info ?
 
     # todo: gdr status should print upstream component(s) info
     # todo: gdr should leave/maintain some refs with this kind of info ?
 

-    my $oldest = [ 0 ];
+    my $oldest = { Badness => 0 };

     my $newest;
     my $note = sub {
     my $newest;
     my $note = sub {

-       my ($badness, $ourmsg, $snagname, $kcmsg, $cl) = @_;
-       if ($oldest->[0] < $badness) {
+       my ($badness, $ourmsg, $snagname, $dummy, $cl, $kcmsg) = @_;
+       if ($oldest->{Badness} < $badness) {

            $oldest = $newest = undef;
        }
            $oldest = $newest = undef;
        }

-       $oldest = \@_; # we're walking backwards
-       $newest //= \@_;
+       $oldest = {
+                  Badness => $badness,
+                  CommitId => $cl->{CommitId},
+                  OurMsg => $ourmsg,
+                  KcMsg => $kcmsg,
+                 };
+       $newest //= $oldest;

     };
     my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
        sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
     };
     my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
        sub { $note->(1, 'branch contains furniture (not laundered)', @_); },


@@ -1413,16 +1445,16 @@ sub cmd_status () {
     };
 
     print "current branch contents, in git-debrebase terms:\n";
     };
 
     print "current branch contents, in git-debrebase terms:\n";

-    if (!$oldest->[0]) {
+    if (!$oldest->{Badness}) {

        print "  branch is laundered\n";
     } else {
        print "  branch is laundered\n";
     } else {

-       print "  $oldest->[1]\n";
+       print "  $oldest->{OurMsg}\n";

        my $printed = '';
        foreach my $info ($oldest, $newest) {
        my $printed = '';
        foreach my $info ($oldest, $newest) {

-           my $cid = $info->[4]{CommitId};
+           my $cid = $info->{CommitId};

            next if $cid eq $printed;
            $printed = $cid;
            next if $cid eq $printed;
            $printed = $cid;

-           print "  $info->[3]\n";
+           print "  $info->{KcMsg}\n";

            $prcommitinfo->($cid);
        }
     }
            $prcommitinfo->($cid);
        }
     }