X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=9e8d7075d42e32bb24a270ecaf9db217162c4ad0;hp=c180a2946c28c50c10f806c54b7e7d922b99449f;hb=375a065009f11f786116a81d8d3a1edde32fe96b;hpb=39e84f67e266f87368e4bce44d4b4b469ef7165a

diff --git a/git-debrebase b/git-debrebase
index c180a294..9e8d7075 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -19,6 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
+use Debian::Dgit::GDR;
 use Debian::Dgit::ExitStatus;
 
 use strict;
@@ -973,19 +974,8 @@ sub cmd_analyse () {
 }
 
 sub ffq_prev_branchinfo () {
-    # => ('status', "message", [$current, $ffq_prev, $gdrlast])
-    # 'status' may be
-    #    branch         message is undef
-    #    weird-symref   } no $current,
-    #    notbranch      }  no $ffq_prev
     my $current = git_get_symref();
-    return ('detached', 'detached HEAD') unless defined $current;
-    return ('weird-symref', 'HEAD symref is not to refs/')
-	unless $current =~ m{^refs/};
-    my $ffq_prev = "refs/$ffq_refprefix/$'";
-    my $gdrlast = "refs/$gdrlast_refprefix/$'";
-    printdebug "ffq_prev_branchinfo branch current $current\n";
-    return ('branch', undef, $current, $ffq_prev, $gdrlast);
+    return gdr_ffq_prev_branchinfo($current);
 }
 
 sub record_ffq_prev_deferred () {
@@ -1029,7 +1019,7 @@ sub record_ffq_prev_deferred () {
 	}
 	return if $invert;
 	my $lrval = git_get_ref $lrref;
-	return unless defined $lrval;
+	return unless length $lrval;
 
 	if (is_fast_fwd $lrval, $currentval) {
 	    print "OK, you are ahead of $lrref\n" or die $!;
@@ -1139,7 +1129,7 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
-sub cmd_new_upstream_v0 () {
+sub cmd_new_upstream () {
     # automatically and unconditionally launders before rebasing
     # if rebase --abort is used, laundering has still been done
 
@@ -1151,7 +1141,23 @@ sub cmd_new_upstream_v0 () {
     my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
     my $new_upstream_version = $new_version->version();
 
-    my $new_upstream = git_rev_parse (shift @ARGV // 'upstream');
+    my $new_upstream = shift @ARGV;
+    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 $new_upstream_version);
+	    $new_upstream = git_get_ref "refs/tags/$tag";
+	    last if length $new_upstream;
+	    push @tried, $tag;
+	}
+	if (!length $new_upstream) {
+	    fail "Could not determine appropriate upstream commitish.\n".
+		" (Tried these tags: @tried)\n".
+		" Check version, and specify upstream commitish explicitly.";
+	}
+    }
+    $new_upstream = git_rev_parse $new_upstream;
 
     record_ffq_auto();
 
@@ -1369,6 +1375,87 @@ sub cmd_breakwater () {
     print "$bw\n" or die $!;
 }
 
+sub cmd_status () {
+    badusage "no arguments allowed" if @ARGV;
+
+    # todo: gdr status should print divergence 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 $newest;
+    my $note = sub {
+	my ($badness, $ourmsg, $snagname, $kcmsg, $cl) = @_;
+	if ($oldest->[0] < $badness) {
+	    $oldest = $newest = undef;
+	}
+	$oldest = \@_; # we're walking backwards
+	$newest //= \@_;
+    };
+    my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
+	sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
+	sub { $note->(2, 'branch is unlaundered', @_); },
+	sub { $note->(3, 'branch needs laundering', @_); },
+	sub { $note->(4, 'branch not in git-debrebase form', @_); };
+
+    my $prcommitinfo = sub {
+	my ($cid) = @_;
+	flush STDOUT or die $!;
+	runcmd @git, qw(--no-pager log -n1),
+	    '--pretty=format:    %h %s%n',
+	    $cid;
+    };
+
+    print "current branch contents, in git-debrebase terms:\n";
+    if (!$oldest->[0]) {
+	print "  branch is laundered\n";
+    } else {
+	print "  $oldest->[1]\n";
+	my $printed = '';
+	foreach my $info ($oldest, $newest) {
+	    my $cid = $info->[4]{CommitId};
+	    next if $cid eq $printed;
+	    $printed = $cid;
+	    print "  $info->[3]\n";
+	    $prcommitinfo->($cid);
+	}
+    }
+
+    my $prab = sub {
+	my ($cid, $what) = @_;
+	if (!defined $cid) {
+	    print "  $what is not well-defined\n";
+	} else {
+	    print "  $what\n";
+	    $prcommitinfo->($cid);
+	}
+    };
+    print "key git-debrebase commits:\n";
+    $prab->($anchor, 'anchor');
+    $prab->($bw, 'breakwater');
+
+    my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
+	ffq_prev_branchinfo();
+
+    print "branch and ref status, in git-debrebase terms:\n";
+    if ($ffq_msg) {
+	print "  $ffq_msg\n";
+    } else {
+	$ffq_prev = git_get_ref $ffq_prev;
+	$gdrlast = git_get_ref $gdrlast;
+	if ($ffq_prev) {
+	    print "  unstitched; previous tip was:\n";
+	    $prcommitinfo->($ffq_prev);
+	} elsif (!$gdrlast) {
+	    print "  stitched? (no record of git-debrebase work)\n";
+	} elsif (is_fast_fwd $gdrlast, 'HEAD') {
+	    print "  stitched\n";
+	} else {
+	    print "  not git-debrebase (diverged since last stitch)\n"
+	}
+    }
+}
+
 sub cmd_stitch () {
     my $prose = 'stitch';
     GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
@@ -1424,28 +1511,31 @@ sub make_patches ($) {
             '[git-debrebase: export and commit patches]',
         ];
     };
-    my $d = get_differs $head, $out;
-    if ($d == 0) {
-	return undef; # nothing to do
-    } elsif ($d == D_PAT_ADD) {
-	return $out; # OK
-    } else {
-	fail "Patch export produced patch amendments".
-	    " (abandoned output commit $out).".
-	    "  Try laundering first.";
-    }
+    return $out;
 }
 
 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");
     badusage "no arguments allowed" if @ARGV;
     my $old_head = get_head();
     my $new = make_patches $old_head;
-    snags_maybe_bail();
-    if (!$new) {
+    my $d = get_differs $old_head, $new;
+    if ($d == 0) {
 	fail "No (more) patches to export." unless $opt_noop_ok;
 	return;
+    } elsif ($d == D_PAT_ADD) {
+	snags_maybe_bail();
+	update_head_checkout $old_head, $new, 'make-patches';
+    } else {
+	print STDERR failmsg
+	    "Patch export produced patch amendments".
+	    " (abandoned output commit $new).".
+	    "  Try laundering first."
+	    unless $opt_quiet_would_amend;
+	finish 7;
     }
-    update_head_checkout $old_head, $new, 'make-patches';
 }
 
 sub cmd_convert_from_gbp () {