3 # Script helping make fast-forwarding histories while still rebasing
4 # upstream deltas when working on Debian packaging
6 # Copyright (C)2017,2018 Ian Jackson
8 # This program is free software: you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10 # the Free Software Foundation, either version 3 of the License, or
11 # (at your option) any later version.
13 # This program is distributed in the hope that it will be useful,
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 # GNU General Public License for more details.
18 # You should have received a copy of the GNU General Public License
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
21 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
22 use Debian::Dgit::ExitStatus;
26 use Debian::Dgit qw(:DEFAULT :playground);
33 use Getopt::Long qw(:config posix_default gnu_compat bundling);
35 use File::FnMatch qw(:fnmatch);
37 our ($opt_force, $opt_noop_ok, @opt_anchors);
38 our ($opt_defaultcmd_interactive);
40 our $us = qw(git-debrebase);
44 print STDERR "bad usage: $m\n";
49 my ($k, $optional) = @_;
51 my @cmd = qw(git config -z);
52 push @cmd, qw(--get-all) if wantarray;
54 my $out = cmdoutput_errok @cmd;
56 fail "missing required git config $k" unless $optional;
59 my @l = split /\0/, $out;
60 return wantarray ? @l : $l[0];
67 my $dd = new Data::Dumper [ $v ];
68 Terse $dd 1; Indent $dd 0; Useqq $dd 1;
74 my $data = (git_cat_file $objid, 'commit');
75 $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
79 sub D_UPS () { 0x02; } # upstream files
80 sub D_PAT_ADD () { 0x04; } # debian/patches/ extra patches at end
81 sub D_PAT_OTH () { 0x08; } # debian/patches other changes
82 sub D_DEB_CLOG () { 0x10; } # debian/ (not patches/ or changelog)
83 sub D_DEB_OTH () { 0x20; } # debian/changelog
84 sub DS_DEB () { D_DEB_CLOG | D_DEB_OTH; } # debian/ (not patches/)
86 our $playprefix = 'debrebase';
95 my $r = eval { $sub->(); };
96 { local $@; changedir $maindir; }
100 sub fresh_workarea () {
101 $workarea = fresh_playground "$playprefix/work";
102 in_workarea sub { playtree_setup };
105 our $snags_forced = 0;
106 our $snags_tripped = 0;
107 our $snags_summarised = 0;
108 our @deferred_updates;
109 our @deferred_update_messages;
111 sub all_snags_summarised () {
112 $snags_forced + $snags_tripped == $snags_summarised;
114 sub run_deferred_updates ($) {
117 confess 'dangerous internal error' unless all_snags_summarised();
119 my @upd_cmd = (@git, qw(update-ref --stdin -m), "debrebase: $mrest");
120 debugcmd '>|', @upd_cmd;
121 open U, "|-", @upd_cmd or die $!;
122 foreach (@deferred_updates) {
123 printdebug ">= ", $_, "\n";
124 print U $_, "\n" or die $!;
127 close U or failedcmd @upd_cmd;
129 print $_, "\n" foreach @deferred_update_messages;
131 @deferred_updates = ();
132 @deferred_update_messages = ();
135 sub get_differs ($$) {
137 # This resembles quiltify_trees_differ, in dgit, a bit.
138 # But we don't care about modes, or dpkg-source-unrepresentable
139 # changes, and we don't need the plethora of different modes.
140 # Conversely we need to distinguish different kinds of changes to
141 # debian/ and debian/patches/.
146 my ($opts, $limits, $fn) = @_;
147 my @cmd = (@git, qw(diff-tree -z --no-renames));
149 push @cmd, "$_:" foreach $x, $y;
150 push @cmd, '--', @$limits;
151 my $diffs = cmdoutput @cmd;
152 foreach (split /\0/, $diffs) { $fn->(); }
155 $rundiff->([qw(--name-only)], [], sub {
156 $differs |= $_ eq 'debian' ? DS_DEB : D_UPS;
159 if ($differs & DS_DEB) {
161 $rundiff->([qw(--name-only -r)], [qw(debian)], sub {
163 m{^debian/patches/} ? D_PAT_OTH :
164 $_ eq 'debian/changelog' ? D_DEB_CLOG :
167 die "mysterious debian changes $x..$y"
168 unless $differs & (D_PAT_OTH|DS_DEB);
171 if ($differs & D_PAT_OTH) {
173 $differs &= ~D_PAT_OTH;
175 $differs |= D_PAT_OTH;
176 no warnings qw(exiting); last;
178 $rundiff->([qw(--name-status -r)], [qw(debian/patches/)], sub {
179 no warnings qw(exiting);
180 if (!defined $mode) {
183 die unless s{^debian/patches/}{};
185 if ($mode eq 'A' && !m/\.series$/s) {
187 } elsif ($mode eq 'M' && $_ eq 'series') {
188 my $x_s = (git_cat_file "$x:debian/patches/series", 'blob');
189 my $y_s = (git_cat_file "$y:debian/patches/series", 'blob');
190 chomp $x_s; $x_s .= "\n";
191 $ok = $x_s eq substr($y_s, 0, length $x_s);
196 $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
198 die "mysterious debian/patches changes $x..$y"
199 unless $differs & (D_PAT_ADD|D_PAT_OTH);
202 printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs;
207 sub commit_pr_info ($) {
209 return Data::Dumper->dump([$r], [qw(commit)]);
212 sub calculate_committer_authline () {
213 my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
214 'DUMMY COMMIT (git-debrebase)', "HEAD:";
215 my ($h,$m) = get_commit $c;
216 $h =~ m/^committer .*$/m or confess "($h) ?";
220 sub rm_subdir_cached ($) {
222 runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
225 sub read_tree_subdir ($$) {
226 my ($subdir, $new_tree_object) = @_;
227 rm_subdir_cached $subdir;
228 runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object;
231 sub make_commit ($$) {
232 my ($parents, $message_paras) = @_;
233 my $tree = cmdoutput @git, qw(write-tree);
234 my @cmd = (@git, qw(commit-tree), $tree);
235 push @cmd, qw(-p), $_ foreach @$parents;
236 push @cmd, qw(-m), $_ foreach @$message_paras;
237 return cmdoutput @cmd;
240 our @snag_force_opts;
242 my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits
243 if (grep { $_ eq $tag } @snag_force_opts) {
245 print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n";
248 print STDERR "git-debrebase: snag detected (-f$tag): $msg\n";
252 # Important: all mainline code must call snags_maybe_bail after
253 # any point where snag might be called, but before making changes
254 # (eg before any call to run_deferred_updates). snags_maybe_bail
255 # may be called more than once if necessary (but this is not ideal
256 # because then the messages about number of snags may be confusing).
257 sub snags_maybe_bail () {
258 return if all_snags_summarised();
261 "%s: snags: %d overriden by individual -f options\n",
264 if ($snags_tripped) {
267 "%s: snags: %d overriden by global --force\n",
271 "%s: snags: %d blockers (you could -f<tag>, or --force)",
275 $snags_summarised = $snags_forced + $snags_tripped;
278 return $snags_forced || $snags_tripped;
281 # classify returns an info hash like this
283 # Hdr => # commit headers, including 1 final newline
284 # Msg => # commit message (so one newline is dropped)
286 # Type => (see below)
288 # Ix => $index # ie 0, 1, 2, ...
290 # Differs => return value from get_differs
292 # IsDggitImport => 'orig' 'tarball' 'unpatched' 'package' (as from dgit)
294 # NewMsg => # commit message, but with any [dgit import ...] edited
295 # # to say "[was: ...]"
305 # has additional entres in classification result
306 # Overwritten = [ subset of Parents ]
307 # Contributor = $the_remaining_Parent
309 # DgitImportUnpatched
310 # has additional entry in classification result
311 # OrigParents = [ subset of Parents ]
314 # has additional entry in classification result
315 # OrigParents = [ subset of Parents ] # singleton list
322 # has additional entry in classification result
325 sub parsecommit ($;$) {
326 my ($objid, $p_ref) = @_;
327 # => hash with CommitId Hdr Msg Tree Parents
328 # Parents entries have only Ix CommitId
329 # $p_ref, if provided, must be [] and is used as a base for Parents
334 my ($h,$m) = get_commit $objid;
336 my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
337 my (@ph) = $h =~ m/^parent (\w+)$/mg;
347 foreach my $ph (@ph) {
349 Ix => scalar @$p_ref,
361 my $r = parsecommit($objid, \@p);
365 $p->{Differs} = (get_differs $p->{CommitId}, $t),
368 printdebug "classify $objid \$t=$t \@p",
369 (map { sprintf " %s/%#x", $_->{CommitId}, $_->{Differs} } @p),
373 my ($type, @rest) = @_;
374 $r = { %$r, Type => $type, @rest };
376 printdebug " = $type ".(dd $r)."\n";
382 $r = { %$r, Type => qw(Unknown), Why => $why };
383 printdebug " ** Unknown\n";
387 if (grep { $_ eq $objid } @opt_anchors) {
388 return $classify->('TreatAsAnchor');
391 my @identical = grep { !$_->{Differs} } @p;
392 my ($stype, $series) = git_cat_file "$t:debian/patches/series";
393 my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
395 if ($r->{Msg} =~ m{^\[git-debrebase anchor.*\]$}m) {
396 # multi-orig upstreams are represented with an anchor merge
397 # from a single upstream commit which combines the orig tarballs
399 # Every anchor tagged this way must be a merge.
400 # We are relying on the
401 # [git-debrebase anchor: ...]
402 # commit message annotation in "declare" anchor merges (which
403 # do not have any upstream changes), to distinguish those
404 # anchor merges from ordinary pseudomerges (which we might
405 # just try to strip).
407 # However, the user is going to be doing git-rebase a lot. We
408 # really don't want them to rewrite an anchor commit.
409 # git-rebase trips up on merges, so that is a useful safety
412 # BreakwaterStart commits are also anchors in the terminology
413 # of git-debrebase(5), but they are untagged (and always
414 # manually generated).
416 # We cannot not tolerate any tagged linear commit (ie,
417 # BreakwaterStart commits tagged `[anchor:') because such a
418 # thing could result from an erroneous linearising raw git
419 # rebase of a merge anchor. That would represent a corruption
420 # of the branch. and we want to detect and reject the results
421 # of such corruption before it makes it out anywhere. If we
422 # reject it here then we avoid making the pseudomerge which
423 # would be needed to push it.
425 my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); };
426 @p == 2 or return $badanchor->("has other than two parents");
427 $haspatches and return $badanchor->("contains debian/patches");
429 # How to decide about l/r ordering of anchors ? git
430 # --topo-order prefers to expand 2nd parent first. There's
431 # already an easy rune to look for debian/ history anyway (git log
432 # debian/) so debian breakwater branch should be 1st parent; that
433 # way also there's also an easy rune to look for the upstream
434 # patches (--topo-order).
436 # Also this makes --first-parent be slightly more likely to
437 # be useful - it makes it provide a linearised breakwater history.
439 # Of course one can say somthing like
440 # gitk -- ':/' ':!/debian'
441 # to get _just_ the commits touching upstream files, and by
442 # the TREESAME logic in git-rev-list this will leave the
443 # breakwater into upstream at the first anchor. But that
444 # doesn't report debian/ changes at all.
446 # Other observations about gitk: by default, gitk seems to
447 # produce output in a different order to git-rev-list. I
448 # can't seem to find this documented anywhere. gitk
449 # --date-order DTRT. But, gitk always seems to put the
450 # parents from left to right, in order, so it's easy to see
451 # which way round a pseudomerge is.
453 $p[0]{IsOrigin} and $badanchor->("is an origin commit");
454 $p[1]{Differs} & ~DS_DEB and
455 $badanchor->("upstream files differ from left parent");
456 $p[0]{Differs} & ~D_UPS and
457 $badanchor->("debian/ differs from right parent");
459 return $classify->(qw(Anchor),
460 OrigParents => [ $p[1] ]);
464 my $d = $r->{Parents}[0]{Differs};
465 if ($d == D_PAT_ADD) {
466 return $classify->(qw(AddPatches));
467 } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
468 return $unknown->("edits debian/patches");
469 } elsif ($d & DS_DEB and !($d & ~DS_DEB)) {
470 my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian";
472 if ($d == D_DEB_CLOG) {
473 return $classify->(qw(Changelog));
475 return $classify->(qw(Packaging));
477 } elsif ($ty eq 'missing') {
478 return $classify->(qw(BreakwaterStart));
480 return $unknown->("parent's debian is not a directory");
482 } elsif ($d == D_UPS) {
483 return $classify->(qw(Upstream));
484 } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) {
485 return $classify->(qw(Mixed));
487 return $unknown->("no changes");
489 confess "internal error $objid ?";
493 return $unknown->("origin commit");
496 if (@p == 2 && @identical == 1) {
497 my @overwritten = grep { $_->{Differs} } @p;
498 confess "internal error $objid ?" unless @overwritten==1;
499 return $classify->(qw(Pseudomerge),
500 Overwritten => [ $overwritten[0] ],
501 Contributor => $identical[0]);
503 if (@p == 2 && @identical == 2) {
505 my ($ph,$pm) = get_commit $_[0]{CommitId};
506 $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
510 my $order = $get_t->($bytime[0]) <=> $get_t->($bytime[1]);
511 if ($order > 0) { # newer first
512 } elsif ($order < 0) {
513 @bytime = reverse @bytime;
515 # same age, default to order made by -s ours
516 # that is, commit was made by someone who preferred L
518 return $classify->(qw(Pseudomerge),
519 SubType => qw(Ambiguous),
520 Contributor => $bytime[0],
521 Overwritten => [ $bytime[1] ]);
524 my ($p_h, $p_m) = get_commit $p->{CommitId};
525 $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
526 ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
528 my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
530 if (!(grep { !$_->{IsOrigin} } @p) and
531 (@orig_ps >= @p - 1) and
532 $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
534 return $classify->(qw(DgitImportUnpatched),
535 OrigParents => \@orig_ps);
538 return $unknown->("complex merge");
541 sub keycommits ($;$$$$) {
542 my ($head, $furniture, $unclean, $trouble, $fatal) = @_;
543 # => ($anchor, $breakwater)
545 # $unclean->("unclean-$tagsfx", $msg, $cl)
546 # $furniture->("unclean-$tagsfx", $msg, $cl)
547 # $dgitimport->("unclean-$tagsfx", $msg, $cl))
548 # is callled for each situation or commit that
549 # wouldn't be found in a laundered branch
550 # $furniture is for furniture commits such as might be found on an
551 # interchange branch (pseudomerge, d/patches, changelog)
552 # $trouble is for things whnich prevent the return of
553 # anchor and breakwater information; if that is ignored,
554 # then keycommits returns (undef, undef) instead.
555 # $fatal is for unprocessable commits, and should normally cause
556 # a failure. If ignored, agaion, (undef, undef) is returned.
558 # If a callback is undef, fail is called instead.
559 # If a callback is defined but false, the situation is ignored.
561 # no warnings qw(exiting); last;
562 # if the answer is no longer wanted.
564 my ($anchor, $breakwater);
567 $fatal //= sub { fail $_[2]; };
569 my ($cb, $tagsfx, $why) = @_;
570 my $m = "branch needs laundering (run git-debrebase): $why";
571 fail $m unless defined $cb;
573 $cb->("unclean-$tagsfx", $why, $cl);
576 $cl = classify $head;
577 my $ty = $cl->{Type};
578 if ($ty eq 'Packaging') {
579 $breakwater //= $clogonly;
580 $breakwater //= $head;
581 } elsif ($ty eq 'Changelog') {
582 # this is going to count as the tip of the breakwater
583 # only if it has no upstream stuff before it
585 } elsif ($ty eq 'Anchor' or
586 $ty eq 'TreatAsAnchor' or
587 $ty eq 'BreakwaterStart') {
589 $breakwater //= $clogonly;
590 $breakwater //= $head;
592 } elsif ($ty eq 'Upstream') {
593 $x->($unclean, 'ordering',
594 "packaging change ($breakwater) follows upstream change (eg $head)")
595 if defined $breakwater;
598 } elsif ($ty eq 'Mixed') {
599 $x->($unclean, 'mixed',
600 "found mixed upstream/packaging commit ($head)");
603 } elsif ($ty eq 'Pseudomerge' or
604 $ty eq 'AddPatches') {
605 $x->($furniture, (lc $ty),
606 "found interchange bureaucracy commit ($ty, $head)");
607 } elsif ($ty eq 'DgitImportUnpatched') {
608 $x->($trouble, 'dgitimport',
609 "found dgit dsc import ($head)");
610 return (undef,undef);
612 $x->($fatal, 'unprocessable',
613 "found unprocessable commit, cannot cope: $head; $cl->{Why}"
615 return (undef,undef);
617 $head = $cl->{Parents}[0]{CommitId};
619 return ($anchor, $breakwater);
625 $nogenerate,$report) = @_;
626 # => ($tip, $breakwater_tip, $last_anchor)
627 # (or nothing, if $nogenerate)
629 printdebug "*** WALK $input ".($nogenerate//0)." ".($report//'-')."\n";
631 # go through commits backwards
632 # we generate two lists of commits to apply:
633 # breakwater branch and upstream patches
634 my (@brw_cl, @upp_cl, @processed);
641 my ($prose, $info) = @_;
645 $ms .= "\n\n[git-debrebase$info: $prose]\n";
648 my $rewrite_from_here = sub {
650 my $sp_cl = { SpecialMethod => 'StartRewrite' };
652 push @processed, $sp_cl;
657 my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; };
660 return unless $report;
661 print $report $prdelim, @_;
665 my $bomb = sub { # usage: return $bomb->();
666 print $report " Unprocessable" if $report;
667 print $report " ($cl->{Why})" if $report && defined $cl->{Why};
670 return (undef,undef);
672 die "commit $cur: Cannot cope with this commit (d.".
673 (join ' ', map { sprintf "%#x", $_->{Differs} }
674 @{ $cl->{Parents} }).
675 (defined $cl->{Why} ? "; $cl->{Why}": '').
682 my $build_start = sub {
683 my ($msg, $parent) = @_;
686 no warnings qw(exiting); last;
693 my $ty = $cl->{Type};
694 my $st = $cl->{SubType};
695 $prline->("$cl->{CommitId} $cl->{Type}");
696 $found{$ty. ( defined($st) ? "-$st" : '' )}++;
697 push @processed, $cl;
698 my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
699 if ($ty eq 'AddPatches') {
701 $rewrite_from_here->(\@upp_cl);
703 } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') {
707 } elsif ($ty eq 'BreakwaterStart') {
709 $build_start->('FirstPackaging', $cur);
710 } elsif ($ty eq 'Upstream') {
714 } elsif ($ty eq 'Mixed') {
717 my $cls = { %$cl, $xmsg->("split mixed commit: $wh part") };
720 $queue->(\@brw_cl, "debian");
721 $queue->(\@upp_cl, "upstream");
722 $rewrite_from_here->(\@brw_cl);
725 } elsif ($ty eq 'Pseudomerge') {
726 my $contrib = $cl->{Contributor}{CommitId};
727 print $report " Contributor=$contrib" if $report;
728 push @pseudomerges, $cl;
729 $rewrite_from_here->(\@upp_cl);
732 } elsif ($ty eq 'Anchor' or $ty eq 'TreatAsAnchor') {
734 $build_start->("Anchor", $cur);
735 } elsif ($ty eq 'DgitImportUnpatched') {
736 my $pm = $pseudomerges[-1];
738 # To an extent, this is heuristic. Imports don't have
739 # a useful history of the debian/ branch. We assume
740 # that the first pseudomerge after an import has a
741 # useful history of debian/, and ignore the histories
742 # from later pseudomerges. Often the first pseudomerge
743 # will be the dgit import of the upload to the actual
744 # suite intended by the non-dgit NMUer, and later
745 # pseudomerges may represent in-archive copies.
746 my $ovwrs = $pm->{Overwritten};
747 printf $report " PM=%s \@Overwr:%d",
748 $pm->{CommitId}, (scalar @$ovwrs)
751 printdebug "*** WALK BOMB DgitImportUnpatched\n";
754 my $ovwr = $ovwrs->[0]{CommitId};
755 printf $report " Overwr=%s", $ovwr if $report;
756 # This import has a tree which is just like a
757 # breakwater tree, but it has the wrong history. It
758 # ought to have the previous breakwater (which the
759 # pseudomerge overwrote) as an ancestor. That will
760 # make the history of the debian/ files correct. As
761 # for the upstream version: either it's the same as
762 # was ovewritten (ie, same as the previous
763 # breakwater), in which case that history is precisely
764 # right; or, otherwise, it was a non-gitish upload of a
765 # new upstream version. We can tell these apart by
766 # looking at the tree of the supposed upstream.
769 SpecialMethod => 'DgitImportDebianUpdate',
770 $xmsg->("convert dgit import: debian changes")
773 SpecialMethod => 'DgitImportUpstreamUpdate',
774 $xmsg->("convert dgit import: upstream update",
777 $prline->(" Import");
778 $rewrite_from_here->(\@brw_cl);
779 $upp_limit //= $#upp_cl; # further, deeper, patches discarded
783 # Everything is from this import. This kind of import
784 # is already in valid breakwater format, with the
785 # patches as commits.
786 printf $report " NoPM" if $report;
787 # last thing we processed will have been the first patch,
788 # if there is one; which is fine, so no need to rewrite
789 # on account of this import
790 $build_start->("ImportOrigin", $cur);
794 printdebug "*** WALK BOMB unrecognised\n";
800 printdebug "*** WALK prep done cur=$cur".
801 " brw $#brw_cl upp $#upp_cl proc $#processed pm $#pseudomerges\n";
803 return if $nogenerate;
805 # Now we build it back up again
811 my $read_tree_debian = sub {
813 read_tree_subdir 'debian', "$treeish:debian";
814 rm_subdir_cached 'debian/patches';
816 my $read_tree_upstream = sub {
818 runcmd @git, qw(read-tree), $treeish;
819 $read_tree_debian->($build);
822 $#upp_cl = $upp_limit if defined $upp_limit;
824 my $committer_authline = calculate_committer_authline();
826 printdebug "WALK REBUILD $build ".(scalar @processed)."\n";
828 confess "internal error" unless $build eq (pop @processed)->{CommitId};
831 mkdir $rd or $!==EEXIST or die $!;
833 runcmd @git, qw(read-tree), $build;
834 foreach my $cl (qw(Debian), (reverse @brw_cl),
835 { SpecialMethod => 'RecordBreakwaterTip' },
836 qw(Upstream), (reverse @upp_cl)) {
838 $current_method = $cl;
841 my $method = $cl->{SpecialMethod} // $current_method;
842 my @parents = ($build);
843 my $cltree = $cl->{CommitId};
844 printdebug "WALK BUILD ".($cltree//'undef').
845 " $method (rewriting=$rewriting)\n";
846 if ($method eq 'Debian') {
847 $read_tree_debian->($cltree);
848 } elsif ($method eq 'Upstream') {
849 $read_tree_upstream->($cltree);
850 } elsif ($method eq 'StartRewrite') {
853 } elsif ($method eq 'RecordBreakwaterTip') {
854 $breakwater = $build;
856 } elsif ($method eq 'DgitImportDebianUpdate') {
857 $read_tree_debian->($cltree);
858 } elsif ($method eq 'DgitImportUpstreamUpdate') {
859 confess unless $rewriting;
860 my $differs = (get_differs $build, $cltree);
861 next unless $differs & D_UPS;
862 $read_tree_upstream->($cltree);
863 push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
868 my $procd = (pop @processed) // 'UNDEF';
871 printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n";
874 my $newtree = cmdoutput @git, qw(write-tree);
876 $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
877 $ch =~ s{^parent .*\n}{}mg;
878 $ch =~ s{(?=^author)}{
879 join '', map { "parent $_\n" } @parents
880 }me or confess "$ch ?";
882 $ch =~ s{^committer .*$}{$committer_authline}m
885 my $cf = "$rd/m$rewriting";
886 open CD, ">", $cf or die $!;
887 print CD $ch, "\n", $cl->{Msg} or die $!;
889 my @cmd = (@git, qw(hash-object));
890 push @cmd, qw(-w) if $rewriting;
891 push @cmd, qw(-t commit), $cf;
892 my $newcommit = cmdoutput @cmd;
893 confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId};
895 if (grep { $method eq $_ } qw(DgitImportUpstreamUpdate)) {
901 my $final_check = get_differs $build, $input;
902 die sprintf "internal error %#x %s %s", $final_check, $build, $input
903 if $final_check & ~D_PAT_ADD;
905 my @r = ($build, $breakwater, $last_anchor);
906 printdebug "*** WALK RETURN @r\n";
911 git_check_unmodified();
912 return git_rev_parse qw(HEAD);
915 sub update_head ($$$) {
916 my ($old, $new, $mrest) = @_;
917 push @deferred_updates, "update HEAD $new $old";
918 run_deferred_updates $mrest;
921 sub update_head_checkout ($$$) {
922 my ($old, $new, $mrest) = @_;
923 update_head $old, $new, $mrest;
924 runcmd @git, qw(reset --hard);
927 sub update_head_postlaunder ($$$) {
928 my ($old, $tip, $reflogmsg) = @_;
929 return if $tip eq $old;
930 print "git-debrebase: laundered (head was $old)\n";
931 update_head $old, $tip, $reflogmsg;
932 # no tree changes except debian/patches
933 runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
936 sub do_launder_head ($) {
937 my ($reflogmsg) = @_;
938 my $old = get_head();
940 my ($tip,$breakwater) = walk $old;
942 update_head_postlaunder $old, $tip, $reflogmsg;
943 return ($tip,$breakwater);
946 sub cmd_launder_v0 () {
947 badusage "no arguments to launder-v0 allowed" if @ARGV;
948 my $old = get_head();
949 my ($tip,$breakwater,$last_anchor) = walk $old;
950 update_head_postlaunder $old, $tip, 'launder';
951 printf "# breakwater tip\n%s\n", $breakwater;
952 printf "# working tip\n%s\n", $tip;
953 printf "# last anchor\n%s\n", $last_anchor;
956 sub defaultcmd_rebase () {
957 push @ARGV, @{ $opt_defaultcmd_interactive // [] };
958 my ($tip,$breakwater) = do_launder_head 'launder for rebase';
959 runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
963 die if ($ARGV[0]//'') =~ m/^-/;
964 badusage "too many arguments to analyse" if @ARGV>1;
967 $old = git_rev_parse $old;
969 $old = git_rev_parse 'HEAD';
971 my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
972 STDOUT->error and die $!;
975 sub ffq_prev_branchinfo () {
976 # => ('status', "message", [$current, $ffq_prev, $gdrlast])
978 # branch message is undef
979 # weird-symref } no $current,
980 # notbranch } no $ffq_prev
981 my $current = git_get_symref();
982 return ('detached', 'detached HEAD') unless defined $current;
983 return ('weird-symref', 'HEAD symref is not to refs/')
984 unless $current =~ m{^refs/};
985 my $ffq_prev = "refs/$ffq_refprefix/$'";
986 my $gdrlast = "refs/$gdrlast_refprefix/$'";
987 printdebug "ffq_prev_branchinfo branch current $current\n";
988 return ('branch', undef, $current, $ffq_prev, $gdrlast);
991 sub record_ffq_prev_deferred () {
992 # => ('status', "message")
994 # deferred message is undef
999 # if not ff from some branch we should be ff from, is an snag
1000 # if "deferred", will have added something about that to
1001 # @deferred_update_messages, and also maybe printed (already)
1002 # some messages about ff checks
1003 my ($status, $message, $current, $ffq_prev, $gdrlast)
1004 = ffq_prev_branchinfo();
1005 return ($status, $message) unless $status eq 'branch';
1007 my $currentval = get_head();
1009 my $exists = git_get_ref $ffq_prev;
1010 return ('exists',"$ffq_prev already exists") if $exists;
1012 return ('not-branch', 'HEAD symref is not to refs/heads/')
1013 unless $current =~ m{^refs/heads/};
1016 my @check_specs = split /\;/, (cfg "branch.$branch.ffq-ffrefs",1) // '*';
1019 printdebug "ffq check_specs @check_specs\n";
1022 my ($lrref, $desc) = @_;
1023 printdebug "ffq might check $lrref ($desc)\n";
1025 for my $chk (@check_specs) {
1027 $invert = $glob =~ s{^[!^]}{};
1028 last if fnmatch $glob, $lrref;
1031 my $lrval = git_get_ref $lrref;
1032 return unless defined $lrval;
1034 if (is_fast_fwd $lrval, $currentval) {
1035 print "OK, you are ahead of $lrref\n" or die $!;
1036 $checked{$lrref} = 1;
1037 } elsif (is_fast_fwd $currentval, $lrval) {
1038 $checked{$lrref} = -1;
1039 snag 'behind', "you are behind $lrref, divergence risk";
1041 $checked{$lrref} = -1;
1042 snag 'diverged', "you have diverged from $lrref";
1046 my $merge = cfg "branch.$branch.merge",1;
1047 if (defined $merge and $merge =~ m{^refs/heads/}) {
1049 printdebug "ffq merge $rhs\n";
1050 my $check_remote = sub {
1051 my ($remote, $desc) = @_;
1052 printdebug "ffq check_remote ".($remote//'undef')." $desc\n";
1053 return unless defined $remote;
1054 $check->("refs/remotes/$remote/$rhs", $desc);
1056 $check_remote->((scalar cfg "branch.$branch.remote",1),
1057 'remote fetch/merge branch');
1058 $check_remote->((scalar cfg "branch.$branch.pushRemote",1) //
1059 (scalar cfg "branch.$branch.pushDefault",1),
1060 'remote push branch');
1062 if ($branch =~ m{^dgit/}) {
1063 $check->("refs/remotes/dgit/$branch", 'remote dgit branch');
1064 } elsif ($branch =~ m{^master$}) {
1065 $check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid');
1070 push @deferred_updates, "update $ffq_prev $currentval $git_null_obj";
1071 push @deferred_updates, "delete $gdrlast";
1072 push @deferred_update_messages, "Recorded current head for preservation";
1073 return ('deferred', undef);
1076 sub record_ffq_auto () {
1077 my ($status, $message) = record_ffq_prev_deferred();
1078 if ($status eq 'deferred' || $status eq 'exists') {
1080 snag $status, "could not record ffq-prev: $message";
1085 sub ffq_prev_info () {
1086 # => ($ffq_prev, $gdrlast, $ffq_prev_commitish)
1087 my ($status, $message, $current, $ffq_prev, $gdrlast)
1088 = ffq_prev_branchinfo();
1089 if ($status ne 'branch') {
1090 snag $status, "could not check ffq-prev: $message";
1093 my $ffq_prev_commitish = $ffq_prev && git_get_ref $ffq_prev;
1094 return ($ffq_prev, $gdrlast, $ffq_prev_commitish);
1097 sub stitch ($$$$$) {
1098 my ($old_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose) = @_;
1100 push @deferred_updates, "delete $ffq_prev $ffq_prev_commitish";
1102 if (is_fast_fwd $old_head, $ffq_prev_commitish) {
1103 my $differs = get_differs $old_head, $ffq_prev_commitish;
1104 unless ($differs & ~D_PAT_ADD) {
1105 # ffq-prev is ahead of us, and the only tree changes it has
1106 # are possibly addition of things in debian/patches/.
1107 # Just wind forwards rather than making a pointless pseudomerge.
1108 push @deferred_updates,
1109 "update $gdrlast $ffq_prev_commitish $git_null_obj";
1110 update_head_checkout $old_head, $ffq_prev_commitish,
1111 "stitch (fast forward)";
1116 # We make pseudomerges with L as the contributing parent.
1117 # This makes git rev-list --first-parent work properly.
1118 my $new_head = make_commit [ $old_head, $ffq_prev ], [
1119 'Declare fast forward / record previous work',
1120 "[git-debrebase pseudomerge: $prose]",
1122 push @deferred_updates, "update $gdrlast $new_head $git_null_obj";
1123 update_head $old_head, $new_head, "stitch: $prose";
1126 sub do_stitch ($;$) {
1127 my ($prose, $unclean) = @_;
1129 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
1130 if (!$ffq_prev_commitish) {
1131 fail "No ffq-prev to stitch." unless $opt_noop_ok;
1134 my $dangling_head = get_head();
1136 keycommits $dangling_head, $unclean,$unclean,$unclean;
1139 stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
1142 sub cmd_new_upstream_v0 () {
1143 # automatically and unconditionally launders before rebasing
1144 # if rebase --abort is used, laundering has still been done
1148 badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
1150 # parse args - low commitment
1151 my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
1152 my $new_upstream_version = $new_version->version();
1154 my $new_upstream = git_rev_parse (shift @ARGV // 'upstream');
1159 my ($n, @x) = @_; # may be ''
1160 my $pc = $pieces{$n} //= {
1162 Desc => ($n ? "upstream piece \`$n'" : "upstream (main piece"),
1164 while (my $k = shift @x) { $pc->{$k} = shift @x; }
1169 my $newpiece = sub {
1170 my ($n, @x) = @_; # may be ''
1171 my $pc = $piece->($n, @x, NewIx => (scalar @newpieces));
1172 push @newpieces, $pc;
1177 New => $new_upstream,
1179 while (@ARGV && $ARGV[0] !~ m{^-}) {
1180 my $n = shift @ARGV;
1182 badusage "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
1183 unless @ARGV && $ARGV[0] !~ m{^-};
1185 my $c = git_rev_parse shift @ARGV;
1186 die unless $n =~ m/^$extra_orig_namepart_re$/;
1187 $newpiece->($n, New => $c);
1190 # now we need to investigate the branch this generates the
1191 # laundered version but we don't switch to it yet
1192 my $old_head = get_head();
1193 my ($old_laundered_tip,$old_bw,$old_anchor) = walk $old_head;
1195 my $old_bw_cl = classify $old_bw;
1196 my $old_anchor_cl = classify $old_anchor;
1198 if (!$old_anchor_cl->{OrigParents}) {
1199 snag 'anchor-treated',
1200 'old anchor is recognised due to --anchor, cannot check upstream';
1202 $old_upstream = parsecommit
1203 $old_anchor_cl->{OrigParents}[0]{CommitId};
1204 $piece->('', Old => $old_upstream->{CommitId});
1207 if ($old_upstream && $old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
1208 if ($old_upstream->{Msg} =~
1209 m{^\[git-debrebase upstream-combine (\.(?: $extra_orig_namepart_re)+)\:.*\]$}m
1211 my @oldpieces = (split / /, $1);
1212 my $old_n_parents = scalar @{ $old_upstream->{Parents} };
1213 if (@oldpieces != $old_n_parents) {
1214 snag 'upstream-confusing', sprintf
1215 "previous upstream combine %s".
1216 " mentions %d pieces (each implying one orig commit)".
1217 " but has %d parents",
1218 $old_upstream->{CommitId},
1219 (scalar @oldpieces),
1221 } elsif ($oldpieces[0] ne '.') {
1222 snag 'upstream-confusing', sprintf
1223 "previous upstream combine %s".
1224 " first piece is not \`.'",
1228 foreach my $i (0..$#oldpieces) {
1229 my $n = $oldpieces[$i];
1230 $piece->($n, Old => $old_upstream->{CommitId}.'^'.($i+1));
1234 snag 'upstream-confusing',
1235 "previous upstream $old_upstream->{CommitId} is from".
1236 " git-debrebase but not an \`upstream-combine' commit";
1240 foreach my $pc (values %pieces) {
1241 if (!$old_upstream) {
1242 # we have complained already
1243 } elsif (!$pc->{Old}) {
1244 snag 'upstream-new-piece',
1245 "introducing upstream piece \`$pc->{Name}'";
1246 } elsif (!$pc->{New}) {
1247 snag 'upstream-rm-piece',
1248 "dropping upstream piece \`$pc->{Name}'";
1249 } elsif (!is_fast_fwd $pc->{Old}, $pc->{New}) {
1250 snag 'upstream-not-ff',
1251 "not fast forward: $pc->{Name} $pc->{Old}..$pc->{New}";
1255 printdebug "%pieces = ", (dd \%pieces), "\n";
1256 printdebug "\@newpieces = ", (dd \@newpieces), "\n";
1264 my @upstream_merge_parents;
1267 push @upstream_merge_parents, $old_upstream->{CommitId};
1270 foreach my $pc (@newpieces) { # always has '' first
1272 read_tree_subdir $pc->{Name}, $pc->{New};
1274 runcmd @git, qw(read-tree), $pc->{New};
1276 push @upstream_merge_parents, $pc->{New};
1279 # index now contains the new upstream
1281 if (@newpieces > 1) {
1282 # need to make the upstream subtree merge commit
1283 $new_upstream = make_commit \@upstream_merge_parents,
1284 [ "Combine upstreams for $new_upstream_version",
1285 ("[git-debrebase upstream-combine . ".
1286 (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]).
1291 # $new_upstream is either the single upstream commit, or the
1292 # combined commit we just made. Either way it will be the
1293 # "upstream" parent of the anchor merge.
1295 read_tree_subdir 'debian', "$old_bw:debian";
1297 # index now contains the anchor merge contents
1298 $new_bw = make_commit [ $old_bw, $new_upstream ],
1299 [ "Update to upstream $new_upstream_version",
1300 "[git-debrebase anchor: new upstream $new_upstream_version, merge]",
1303 my $clogsignoff = cmdoutput qw(git show),
1304 '--pretty=format:%an <%ae> %aD',
1307 # Now we have to add a changelog stanza so the Debian version
1309 die if unlink "debian";
1310 die $! unless $!==ENOENT or $!==ENOTEMPTY;
1311 unlink "debian/changelog" or $!==ENOENT or die $!;
1312 mkdir "debian" or die $!;
1313 open CN, ">", "debian/changelog" or die $!;
1314 my $oldclog = git_cat_file ":debian/changelog";
1315 $oldclog =~ m/^($package_re) \(\S+\) / or
1316 fail "cannot parse old changelog to get package name";
1318 print CN <<END, $oldclog or die $!;
1319 $p ($new_version) UNRELEASED; urgency=medium
1321 * Update to new upstream version $new_upstream_version.
1327 runcmd @git, qw(update-index --add --replace), 'debian/changelog';
1329 # Now we have the final new breakwater branch in the index
1330 $new_bw = make_commit [ $new_bw ],
1331 [ "Update changelog for new upstream $new_upstream_version",
1332 "[git-debrebase: new upstream $new_upstream_version, changelog]",
1336 # we have constructed the new breakwater. we now need to commit to
1337 # the laundering output, because git-rebase can't easily be made
1338 # to make a replay list which is based on some other branch
1340 update_head_postlaunder $old_head, $old_laundered_tip,
1341 'launder for new upstream';
1343 my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);
1345 # now it's for the user to sort out
1348 sub cmd_record_ffq_prev () {
1349 badusage "no arguments allowed" if @ARGV;
1350 my ($status, $msg) = record_ffq_prev_deferred();
1351 if ($status eq 'exists' && $opt_noop_ok) {
1352 print "Previous head already recorded\n" or die $!;
1353 } elsif ($status eq 'deferred') {
1354 run_deferred_updates 'record-ffq-prev';
1356 fail "Could not preserve: $msg";
1361 badusage "no arguments allowed" if @ARGV;
1362 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
1363 print "$bw\n" or die $!;
1366 sub cmd_breakwater () {
1367 badusage "no arguments allowed" if @ARGV;
1368 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
1369 print "$bw\n" or die $!;
1373 badusage "no arguments allowed" if @ARGV;
1378 my ($badness, $ourmsg, $snagname, $kcmsg, $cl) = @_;
1379 if ($oldest->[0] < $badness) {
1380 $oldest = $newest = undef;
1382 $oldest = \@_; # we're walking backwards
1385 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
1386 sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
1387 sub { $note->(2, 'branch is unlaundered', @_); },
1388 sub { $note->(3, 'branch needs laundering', @_); },
1389 sub { $note->(4, 'branch not in git-debrebase form', @_); };
1391 my $prcommitinfo = sub {
1393 flush STDOUT or die $!;
1394 runcmd @git, qw(--no-pager log -n1),
1395 '--pretty=format: %h %s%n',
1399 print "current branch contents, in git-debrebase terms:\n";
1400 if (!$oldest->[0]) {
1401 print " branch is laundered\n";
1403 print " $oldest->[1]\n";
1405 foreach my $info ($oldest, $newest) {
1406 my $cid = $info->[4]{CommitId};
1407 next if $cid eq $printed;
1409 print " $info->[3]\n";
1410 $prcommitinfo->($cid);
1415 my ($cid, $what) = @_;
1416 if (!defined $cid) {
1417 print " $what is not well-defined\n";
1420 $prcommitinfo->($cid);
1423 print "key git-debrebase commits:\n";
1424 $prab->($anchor, 'anchor');
1425 $prab->($bw, 'breakwater');
1427 my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
1428 ffq_prev_branchinfo();
1430 print "branch and ref status, in git-debrebase terms:\n";
1432 print " $ffq_msg\n";
1434 $ffq_prev = git_get_ref $ffq_prev;
1435 $gdrlast = git_get_ref $gdrlast;
1437 print " unstitched; previous tip was:\n";
1438 $prcommitinfo->($ffq_prev);
1439 } elsif (!$gdrlast) {
1440 print " stitched? (no record of git-debrebase work)\n";
1441 } elsif (is_fast_fwd $gdrlast, 'HEAD') {
1442 print " stitched\n";
1444 print " not git-debrebase (diverged since last stitch)\n"
1450 my $prose = 'stitch';
1451 GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
1452 badusage "no arguments allowed" if @ARGV;
1453 do_stitch $prose, 0;
1455 sub cmd_prepush () { cmd_stitch(); }
1458 badusage "no arguments allowed" if @ARGV;
1459 do_launder_head 'launder for git-debrebase quick';
1463 sub cmd_conclude () {
1464 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
1465 if (!$ffq_prev_commitish) {
1466 fail "No ongoing git-debrebase session." unless $opt_noop_ok;
1469 my $dangling_head = get_head();
1471 badusage "no arguments allowed" if @ARGV;
1472 do_launder_head 'launder for git-debrebase quick';
1476 sub make_patches_staged ($) {
1478 # Produces the patches that would result from $head if it were
1480 my ($secret_head, $secret_bw, $last_anchor) = walk $head;
1483 runcmd @git, qw(checkout -q -b bw), $secret_bw;
1484 runcmd @git, qw(checkout -q -b patch-queue/bw), $secret_head;
1485 runcmd qw(gbp pq export);
1486 runcmd @git, qw(add debian/patches);
1490 sub make_patches ($) {
1492 keycommits $head, 0, \&snag;
1493 make_patches_staged $head;
1496 my $ptree = cmdoutput @git, qw(write-tree --prefix=debian/patches/);
1497 runcmd @git, qw(read-tree), $head;
1498 read_tree_subdir 'debian/patches', $ptree;
1499 $out = make_commit [$head], [
1500 'Commit patch queue (exported by git-debrebase)',
1501 '[git-debrebase: export and commit patches]',
1504 my $d = get_differs $head, $out;
1506 return undef; # nothing to do
1507 } elsif ($d == D_PAT_ADD) {
1510 fail "Patch export produced patch amendments".
1511 " (abandoned output commit $out).".
1512 " Try laundering first.";
1516 sub cmd_make_patches () {
1517 badusage "no arguments allowed" if @ARGV;
1518 my $old_head = get_head();
1519 my $new = make_patches $old_head;
1522 fail "No (more) patches to export." unless $opt_noop_ok;
1525 update_head_checkout $old_head, $new, 'make-patches';
1528 sub cmd_convert_from_gbp () {
1529 badusage "needs 1 optional argument, the upstream git rev"
1531 my ($upstream_spec) = @ARGV;
1532 $upstream_spec //= 'refs/heads/upstream';
1533 my $upstream = git_rev_parse $upstream_spec;
1534 my $old_head = get_head();
1536 my $upsdiff = get_differs $upstream, $old_head;
1537 if ($upsdiff & D_UPS) {
1538 runcmd @git, qw(--no-pager diff),
1539 $upstream, $old_head,
1540 qw( -- :!/debian :/);
1541 fail "upstream ($upstream_spec) and HEAD are not identical in upstream files";
1544 if (!is_fast_fwd $upstream, $old_head) {
1545 snag 'upstream-not-ancestor',
1546 "upstream ($upstream) is not an ancestor of HEAD";
1548 my $wrong = cmdoutput
1549 (@git, qw(rev-list --ancestry-path), "$upstream..HEAD",
1550 qw(-- :/ :!/debian));
1551 if (length $wrong) {
1552 snag 'unexpected-upstream-changes',
1553 "history between upstream ($upstream) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?";
1554 print STDERR "list expected changes with: git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'\n";
1558 if ((git_cat_file "$upstream:debian")[0] ne 'missing') {
1559 snag 'upstream-has-debian',
1560 "upstream ($upstream) contains debian/ directory";
1569 runcmd @git, qw(checkout -q -b gdr-internal), $old_head;
1570 # make a branch out of the patch queue - we'll want this in a mo
1571 runcmd qw(gbp pq import);
1572 # strip the patches out
1573 runcmd @git, qw(checkout -q gdr-internal~0);
1574 rm_subdir_cached 'debian/patches';
1575 $work = make_commit ['HEAD'], [
1576 'git-debrebase convert-from-gbp: drop patches from tree',
1577 'Delete debian/patches, as part of converting to git-debrebase format.',
1578 '[git-debrebase convert-from-gbp: drop patches from tree]'
1580 # make the anchor merge
1581 # the tree is already exactly right
1582 $work = make_commit [$work, $upstream], [
1583 'git-debrebase import: declare upstream',
1584 'First breakwater merge.',
1585 '[git-debrebase anchor: declare upstream]'
1588 # rebase the patch queue onto the new breakwater
1589 runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal);
1590 runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal);
1591 $work = git_rev_parse 'HEAD';
1594 update_head_checkout $old_head, $work, 'convert-from-gbp';
1597 sub cmd_convert_to_gbp () {
1598 badusage "no arguments allowed" if @ARGV;
1599 my $head = get_head();
1600 my (undef, undef, undef, $ffq, $gdrlast) = ffq_prev_branchinfo();
1601 keycommits $head, 0;
1603 make_patches_staged $head;
1605 $out = make_commit ['HEAD'], [
1606 'Commit patch queue (converted from git-debrebase format)',
1607 '[git-debrebase convert-to-gbp: commit patches]',
1611 push @deferred_updates, "delete $ffq";
1612 push @deferred_updates, "delete $gdrlast";
1615 update_head_checkout $head, $out, "convert to gbp (v0)";
1616 print <<END or die $!;
1617 git-debrebase: converted to git-buildpackage branch format
1618 git-debrebase: WARNING: do not now run "git-debrebase" any more
1619 git-debrebase: WARNING: doing so would drop all upstream patches!
1623 sub cmd_downstream_rebase_launder_v0 () {
1624 badusage "needs 1 argument, the baseline" unless @ARGV==1;
1626 $base = git_rev_parse $base;
1627 my $old_head = get_head();
1628 my $current = $old_head;
1631 if ($current eq $base) {
1632 $topmost_keep //= $current;
1633 print " $current BASE stop\n";
1636 my $cl = classify $current;
1637 print " $current $cl->{Type}";
1639 my $p0 = $cl->{Parents}[0]{CommitId};
1641 if ($cl->{Type} eq 'Pseudomerge') {
1642 print " ^".($cl->{Contributor}{Ix}+1);
1643 $next = $cl->{Contributor}{CommitId};
1644 } elsif ($cl->{Type} eq 'AddPatches' or
1645 $cl->{Type} eq 'Changelog') {
1655 $topmost_keep //= $current;
1657 die "to-be stripped changes not on top of the branch\n"
1662 if ($topmost_keep eq $old_head) {
1663 print "unchanged\n";
1665 print "updating to $topmost_keep\n";
1666 update_head_checkout
1667 $old_head, $topmost_keep,
1668 'downstream-rebase-launder-v0';
1672 GetOptions("D+" => \$debuglevel,
1673 'noop-ok', => \$opt_noop_ok,
1674 'f=s' => \@snag_force_opts,
1675 'anchor=s' => \@opt_anchors,
1678 my ($opt,$val) = @_;
1679 badusage "git-debrebase: no cuddling to -i for git-rebase"
1681 die if $opt_defaultcmd_interactive; # should not happen
1682 $opt_defaultcmd_interactive = [ qw(-i) ];
1683 # This access to @ARGV is excessive familiarity with
1684 # Getopt::Long, but there isn't another sensible
1685 # approach. '-i=s{0,}' does not work with bundling.
1686 push @$opt_defaultcmd_interactive, @ARGV;
1688 }) or die badusage "bad options\n";
1689 initdebug('git-debrebase ');
1690 enabledebug if $debuglevel;
1692 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
1693 chdir $toplevel or die "chdir $toplevel: $!";
1695 $rd = fresh_playground "$playprefix/misc";
1697 @opt_anchors = map { git_rev_parse $_ } @opt_anchors;
1699 if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
1700 defaultcmd_rebase();
1702 my $cmd = shift @ARGV;
1705 $cmdfn = ${*::}{"cmd_$cmdfn"};
1707 $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";