git-debrebase: provide --anchor option

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index dbbf51b4faba14f304d7ce503041d7e6bfcc25dd..cdd6348a122efc405a6de50d3338d6b1356da12d 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -22,9 +22,9 @@
 # usages:
 #
 #    git-debrebase [<options>] new-upstream-v0 \
-#             <new-version> <orig-commitish> \
+#             <new-version> [<orig-commitish> \
 #            [<extra-orig-name> <extra-orig-commitish> ...] \
-#            [<git-rebase options>...]
+#            [<git-rebase options>...]]
 #
 #    git-debrebase [<options> --] [<git-rebase options...>]
 #    git-debrebase [<options>] analyse
@@ -91,7 +91,7 @@ use Getopt::Long qw(:config posix_default gnu_compat bundling);
 use Dpkg::Version;
 use File::FnMatch qw(:fnmatch);
 
-our ($opt_force, $opt_noop_ok);
+our ($opt_force, $opt_noop_ok, @opt_anchors);
 
 our $us = qw(git-debrebase);
 
@@ -356,6 +356,8 @@ sub any_fproblems () {
 #     has additional entry in classification result
 #       OrigParents = [ subset of Parents ]  # singleton list
 #
+#   TreatAsAnchor
+#
 #   BreakwaterStart
 #
 #   Unknown
@@ -424,6 +426,10 @@ sub classify ($) {
        return $r;
     };
 
+    if (grep { $_ eq $objid } @opt_anchors) {
+       return $classify->('TreatAsAnchor');
+    }
+
     my @identical = grep { !$_->{Differs} } @p;
     my ($stype, $series) = git_cat_file "$t:debian/patches/series";
     my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
@@ -545,6 +551,7 @@ sub breakwater_of ($) {
            $ty eq 'Changelog') {
            $breakwater //= $head;
        } elsif ($ty eq 'Anchor' or
+                $ty eq 'TreatAsAnchor' or
                 $ty eq 'BreakwaterStart') {
            $breakwater //= $head;
            last;
@@ -677,7 +684,7 @@ sub walk ($;$$) {
            $rewrite_from_here->(\@upp_cl);
            $cur = $contrib;
            next;
-       } elsif ($ty eq 'Anchor') {
+       } elsif ($ty eq 'Anchor' or $ty eq 'TreatAsAnchor') {
             $last_anchor = $cur;
            $build_start->("Anchor", $cur);
        } elsif ($ty eq 'DgitImportUnpatched') {
@@ -893,12 +900,7 @@ sub cmd_launder_v0 () {
 
 sub defaultcmd_rebase () {
     my $old = get_head();
-    my ($status, $message) = record_ffq_prev_deferred();
-    if ($status eq 'deferred' || $status eq 'exists') {
-    } else {
-       fproblem $status, "could not record ffq-prev: $message";
-       fproblems_maybe_bail();
-    }
+    record_ffq_auto();
     my ($tip,$breakwater) = walk $old;
     update_head_postlaunder $old, $tip, 'launder for rebase';
     runcmd @git, qw(rebase), @ARGV, $breakwater;
@@ -1015,19 +1017,30 @@ sub record_ffq_prev_deferred () {
     return ('deferred', undef);
 }
 
+sub record_ffq_auto () {
+    my ($status, $message) = record_ffq_prev_deferred();
+    if ($status eq 'deferred' || $status eq 'exists') {
+    } else {
+       fproblem $status, "could not record ffq-prev: $message";
+       fproblems_maybe_bail();
+    }
+}
+
 sub cmd_new_upstream_v0 () {
     # automatically and unconditionally launders before rebasing
     # if rebase --abort is used, laundering has still been done
 
     my %pieces;
 
-    badusage "need NEW-VERSION UPS-COMMITTISH" unless @ARGV >= 2;
+    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 $new_upstream_version = $new_version->version();
 
-    my $new_upstream = git_rev_parse shift @ARGV;
+    my $new_upstream = git_rev_parse (shift @ARGV // 'upstream');
+
+    record_ffq_auto();
 
     my $piece = sub {
         my ($n, @x) = @_; # may be ''
@@ -1068,13 +1081,17 @@ sub cmd_new_upstream_v0 () {
 
     my $old_bw_cl = classify $old_bw;
     my $old_anchor_cl = classify $old_anchor;
-    confess unless $old_anchor_cl->{OrigParents};
-    my $old_upstream = parsecommit
-        $old_anchor_cl->{OrigParents}[0]{CommitId};
-
-    $piece->('', Old => $old_upstream->{CommitId});
+    my $old_upstream;
+    if (!$old_anchor_cl->{OrigParents}) {
+       fproblem 'anchor-treated',
+           'old anchor is recognised due to --anchor, cannot check upstream';
+    } else {
+       $old_upstream = parsecommit
+           $old_anchor_cl->{OrigParents}[0]{CommitId};
+       $piece->('', Old => $old_upstream->{CommitId});
+    }
 
-    if ($old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
+    if ($old_upstream && $old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
        if ($old_upstream->{Msg} =~
  m{^\[git-debrebase upstream-combine \.((?: $extra_orig_namepart_re)+)\:.*\]$}m
           ) {
@@ -1092,7 +1109,9 @@ sub cmd_new_upstream_v0 () {
     }
 
     foreach my $pc (values %pieces) {
-       if (!$pc->{Old}) {
+       if (!$old_upstream) {
+           # we have complained already
+       } elsif (!$pc->{Old}) {
            fproblem 'upstream-new-piece',
                "introducing upstream piece \`$pc->{Name}'";
        } elsif (!$pc->{New}) {
@@ -1394,6 +1413,7 @@ sub cmd_downstream_rebase_launder_v0 () {
 GetOptions("D+" => \$debuglevel,
           'noop-ok', => \$opt_noop_ok,
           'f=s' => \@fproblem_force_opts,
+          'anchor=s' => \@opt_anchors,
           'force!') or die badusage "bad options\n";
 initdebug('git-debrebase ');
 enabledebug if $debuglevel;
@@ -1403,6 +1423,8 @@ chdir $toplevel or die "chdir $toplevel: $!";
 
 $rd = fresh_playground "$playprefix/misc";
 
+@opt_anchors = map { git_rev_parse $_ } @opt_anchors;
+
 if (!@ARGV || $ARGV[0] =~ m{^-}) {
     defaultcmd_rebase();
 } else {