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::GDR;
23 use Debian::Dgit::ExitStatus;
27 use Debian::Dgit qw(:DEFAULT :playground);
34 use Getopt::Long qw(:config posix_default gnu_compat bundling);
36 use File::FnMatch qw(:fnmatch);
39 our ($opt_force, $opt_noop_ok, @opt_anchors);
40 our ($opt_defaultcmd_interactive);
42 our $us = qw(git-debrebase);
46 print STDERR "bad usage: $m\n";
51 my ($k, $optional) = @_;
53 my @cmd = qw(git config -z);
54 push @cmd, qw(--get-all) if wantarray;
56 my $out = cmdoutput_errok @cmd;
58 fail "missing required git config $k" unless $optional;
61 my @l = split /\0/, $out;
62 return wantarray ? @l : $l[0];
69 my $dd = new Data::Dumper [ $v ];
70 Terse $dd 1; Indent $dd 0; Useqq $dd 1;
76 my $data = (git_cat_file $objid, 'commit');
77 $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
81 sub D_UPS () { 0x02; } # upstream files
82 sub D_PAT_ADD () { 0x04; } # debian/patches/ extra patches at end
83 sub D_PAT_OTH () { 0x08; } # debian/patches other changes
84 sub D_DEB_CLOG () { 0x10; } # debian/ (not patches/ or changelog)
85 sub D_DEB_OTH () { 0x20; } # debian/changelog
86 sub DS_DEB () { D_DEB_CLOG | D_DEB_OTH; } # debian/ (not patches/)
88 our $playprefix = 'debrebase';
97 my $r = eval { $sub->(); };
98 { local $@; changedir $maindir; }
102 sub fresh_workarea () {
103 $workarea = fresh_playground "$playprefix/work";
104 in_workarea sub { playtree_setup };
107 our $snags_forced = 0;
108 our $snags_tripped = 0;
109 our $snags_summarised = 0;
110 our @deferred_updates;
111 our @deferred_update_messages;
113 sub all_snags_summarised () {
114 $snags_forced + $snags_tripped == $snags_summarised;
116 sub run_deferred_updates ($) {
119 confess 'dangerous internal error' unless all_snags_summarised();
121 my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin));
122 debugcmd '>|', @upd_cmd;
123 open U, "|-", @upd_cmd or die $!;
124 foreach (@deferred_updates) {
125 printdebug ">= ", $_, "\n";
126 print U $_, "\n" or die $!;
129 close U or failedcmd @upd_cmd;
131 print $_, "\n" foreach @deferred_update_messages;
133 @deferred_updates = ();
134 @deferred_update_messages = ();
137 sub get_differs ($$) {
139 # This resembles quiltify_trees_differ, in dgit, a bit.
140 # But we don't care about modes, or dpkg-source-unrepresentable
141 # changes, and we don't need the plethora of different modes.
142 # Conversely we need to distinguish different kinds of changes to
143 # debian/ and debian/patches/.
148 my ($opts, $limits, $fn) = @_;
149 my @cmd = (@git, qw(diff-tree -z --no-renames));
151 push @cmd, "$_:" foreach $x, $y;
152 push @cmd, '--', @$limits;
153 my $diffs = cmdoutput @cmd;
154 foreach (split /\0/, $diffs) { $fn->(); }
157 $rundiff->([qw(--name-only)], [], sub {
158 $differs |= $_ eq 'debian' ? DS_DEB : D_UPS;
161 if ($differs & DS_DEB) {
163 $rundiff->([qw(--name-only -r)], [qw(debian)], sub {
165 m{^debian/patches/} ? D_PAT_OTH :
166 $_ eq 'debian/changelog' ? D_DEB_CLOG :
169 die "mysterious debian changes $x..$y"
170 unless $differs & (D_PAT_OTH|DS_DEB);
173 if ($differs & D_PAT_OTH) {
175 $differs &= ~D_PAT_OTH;
177 $differs |= D_PAT_OTH;
178 no warnings qw(exiting); last;
180 $rundiff->([qw(--name-status -r)], [qw(debian/patches/)], sub {
181 no warnings qw(exiting);
182 if (!defined $mode) {
185 die unless s{^debian/patches/}{};
187 if ($mode eq 'A' && !m/\.series$/s) {
189 } elsif ($mode eq 'M' && $_ eq 'series') {
190 my $x_s = (git_cat_file "$x:debian/patches/series", 'blob');
191 my $y_s = (git_cat_file "$y:debian/patches/series", 'blob');
192 chomp $x_s; $x_s .= "\n";
193 $ok = $x_s eq substr($y_s, 0, length $x_s);
198 $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
200 die "mysterious debian/patches changes $x..$y"
201 unless $differs & (D_PAT_ADD|D_PAT_OTH);
204 printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs;
209 sub commit_pr_info ($) {
211 return Data::Dumper->dump([$r], [qw(commit)]);
214 sub calculate_committer_authline () {
215 my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
216 'DUMMY COMMIT (git-debrebase)', "HEAD:";
217 my ($h,$m) = get_commit $c;
218 $h =~ m/^committer .*$/m or confess "($h) ?";
222 sub rm_subdir_cached ($) {
224 runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
227 sub read_tree_subdir ($$) {
228 my ($subdir, $new_tree_object) = @_;
229 rm_subdir_cached $subdir;
230 runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object;
233 sub make_commit ($$) {
234 my ($parents, $message_paras) = @_;
235 my $tree = cmdoutput @git, qw(write-tree);
236 my @cmd = (@git, qw(commit-tree), $tree);
237 push @cmd, qw(-p), $_ foreach @$parents;
238 push @cmd, qw(-m), $_ foreach @$message_paras;
239 return cmdoutput @cmd;
242 our @snag_force_opts;
244 my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits
245 if (grep { $_ eq $tag } @snag_force_opts) {
247 print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n";
250 print STDERR "git-debrebase: snag detected (-f$tag): $msg\n";
254 # Important: all mainline code must call snags_maybe_bail after
255 # any point where snag might be called, but before making changes
256 # (eg before any call to run_deferred_updates). snags_maybe_bail
257 # may be called more than once if necessary (but this is not ideal
258 # because then the messages about number of snags may be confusing).
259 sub snags_maybe_bail () {
260 return if all_snags_summarised();
263 "%s: snags: %d overriden by individual -f options\n",
266 if ($snags_tripped) {
269 "%s: snags: %d overriden by global --force\n",
273 "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
277 $snags_summarised = $snags_forced + $snags_tripped;
280 return $snags_forced || $snags_tripped;
283 # classify returns an info hash like this
285 # Hdr => # commit headers, including 1 final newline
286 # Msg => # commit message (so one newline is dropped)
288 # Type => (see below)
290 # Ix => $index # ie 0, 1, 2, ...
292 # Differs => return value from get_differs
294 # IsDggitImport => 'orig' 'tarball' 'unpatched' 'package' (as from dgit)
296 # NewMsg => # commit message, but with any [dgit import ...] edited
297 # # to say "[was: ...]"
307 # has additional entres in classification result
308 # Overwritten = [ subset of Parents ]
309 # Contributor = $the_remaining_Parent
311 # DgitImportUnpatched
312 # has additional entry in classification result
313 # OrigParents = [ subset of Parents ]
316 # has additional entry in classification result
317 # OrigParents = [ subset of Parents ] # singleton list
324 # has additional entry in classification result
327 sub parsecommit ($;$) {
328 my ($objid, $p_ref) = @_;
329 # => hash with CommitId Hdr Msg Tree Parents
330 # Parents entries have only Ix CommitId
331 # $p_ref, if provided, must be [] and is used as a base for Parents
336 my ($h,$m) = get_commit $objid;
338 my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
339 my (@ph) = $h =~ m/^parent (\w+)$/mg;
349 foreach my $ph (@ph) {
351 Ix => scalar @$p_ref,
363 my $r = parsecommit($objid, \@p);
367 $p->{Differs} = (get_differs $p->{CommitId}, $t),
370 printdebug "classify $objid \$t=$t \@p",
371 (map { sprintf " %s/%#x", $_->{CommitId}, $_->{Differs} } @p),
375 my ($type, @rest) = @_;
376 $r = { %$r, Type => $type, @rest };
378 printdebug " = $type ".(dd $r)."\n";
384 $r = { %$r, Type => qw(Unknown), Why => $why };
385 printdebug " ** Unknown\n";
389 if (grep { $_ eq $objid } @opt_anchors) {
390 return $classify->('TreatAsAnchor');
393 my @identical = grep { !$_->{Differs} } @p;
394 my ($stype, $series) = git_cat_file "$t:debian/patches/series";
395 my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
397 if ($r->{Msg} =~ m{^\[git-debrebase anchor.*\]$}m) {
398 # multi-orig upstreams are represented with an anchor merge
399 # from a single upstream commit which combines the orig tarballs
401 # Every anchor tagged this way must be a merge.
402 # We are relying on the
403 # [git-debrebase anchor: ...]
404 # commit message annotation in "declare" anchor merges (which
405 # do not have any upstream changes), to distinguish those
406 # anchor merges from ordinary pseudomerges (which we might
407 # just try to strip).
409 # However, the user is going to be doing git-rebase a lot. We
410 # really don't want them to rewrite an anchor commit.
411 # git-rebase trips up on merges, so that is a useful safety
414 # BreakwaterStart commits are also anchors in the terminology
415 # of git-debrebase(5), but they are untagged (and always
416 # manually generated).
418 # We cannot not tolerate any tagged linear commit (ie,
419 # BreakwaterStart commits tagged `[anchor:') because such a
420 # thing could result from an erroneous linearising raw git
421 # rebase of a merge anchor. That would represent a corruption
422 # of the branch. and we want to detect and reject the results
423 # of such corruption before it makes it out anywhere. If we
424 # reject it here then we avoid making the pseudomerge which
425 # would be needed to push it.
427 my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); };
428 @p == 2 or return $badanchor->("has other than two parents");
429 $haspatches and return $badanchor->("contains debian/patches");
431 # How to decide about l/r ordering of anchors ? git
432 # --topo-order prefers to expand 2nd parent first. There's
433 # already an easy rune to look for debian/ history anyway (git log
434 # debian/) so debian breakwater branch should be 1st parent; that
435 # way also there's also an easy rune to look for the upstream
436 # patches (--topo-order).
438 # Also this makes --first-parent be slightly more likely to
439 # be useful - it makes it provide a linearised breakwater history.
441 # Of course one can say somthing like
442 # gitk -- ':/' ':!/debian'
443 # to get _just_ the commits touching upstream files, and by
444 # the TREESAME logic in git-rev-list this will leave the
445 # breakwater into upstream at the first anchor. But that
446 # doesn't report debian/ changes at all.
448 # Other observations about gitk: by default, gitk seems to
449 # produce output in a different order to git-rev-list. I
450 # can't seem to find this documented anywhere. gitk
451 # --date-order DTRT. But, gitk always seems to put the
452 # parents from left to right, in order, so it's easy to see
453 # which way round a pseudomerge is.
455 $p[0]{IsOrigin} and $badanchor->("is an origin commit");
456 $p[1]{Differs} & ~DS_DEB and
457 $badanchor->("upstream files differ from left parent");
458 $p[0]{Differs} & ~D_UPS and
459 $badanchor->("debian/ differs from right parent");
461 return $classify->(qw(Anchor),
462 OrigParents => [ $p[1] ]);
466 my $d = $r->{Parents}[0]{Differs};
467 if ($d == D_PAT_ADD) {
468 return $classify->(qw(AddPatches));
469 } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
470 return $unknown->("edits debian/patches");
471 } elsif ($d & DS_DEB and !($d & ~DS_DEB)) {
472 my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian";
474 if ($d == D_DEB_CLOG) {
475 return $classify->(qw(Changelog));
477 return $classify->(qw(Packaging));
479 } elsif ($ty eq 'missing') {
480 return $classify->(qw(BreakwaterStart));
482 return $unknown->("parent's debian is not a directory");
484 } elsif ($d == D_UPS) {
485 return $classify->(qw(Upstream));
486 } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) {
487 return $classify->(qw(Mixed));
489 return $unknown->("no changes");
491 confess "internal error $objid ?";
495 return $unknown->("origin commit");
498 if (@p == 2 && @identical == 1) {
499 my @overwritten = grep { $_->{Differs} } @p;
500 confess "internal error $objid ?" unless @overwritten==1;
501 return $classify->(qw(Pseudomerge),
502 Overwritten => [ $overwritten[0] ],
503 Contributor => $identical[0]);
505 if (@p == 2 && @identical == 2) {
507 my ($ph,$pm) = get_commit $_[0]{CommitId};
508 $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
512 my $order = $get_t->($bytime[0]) <=> $get_t->($bytime[1]);
513 if ($order > 0) { # newer first
514 } elsif ($order < 0) {
515 @bytime = reverse @bytime;
517 # same age, default to order made by -s ours
518 # that is, commit was made by someone who preferred L
520 return $classify->(qw(Pseudomerge),
521 SubType => qw(Ambiguous),
522 Contributor => $bytime[0],
523 Overwritten => [ $bytime[1] ]);
526 my ($p_h, $p_m) = get_commit $p->{CommitId};
527 $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
528 ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
530 my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
532 if (!(grep { !$_->{IsOrigin} } @p) and
533 (@orig_ps >= @p - 1) and
534 $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
536 return $classify->(qw(DgitImportUnpatched),
537 OrigParents => \@orig_ps);
540 return $unknown->("complex merge");
543 sub keycommits ($;$$$$) {
544 my ($head, $furniture, $unclean, $trouble, $fatal) = @_;
545 # => ($anchor, $breakwater)
547 # $unclean->("unclean-$tagsfx", $msg, $cl)
548 # $furniture->("unclean-$tagsfx", $msg, $cl)
549 # $dgitimport->("unclean-$tagsfx", $msg, $cl))
550 # is callled for each situation or commit that
551 # wouldn't be found in a laundered branch
552 # $furniture is for furniture commits such as might be found on an
553 # interchange branch (pseudomerge, d/patches, changelog)
554 # $trouble is for things whnich prevent the return of
555 # anchor and breakwater information; if that is ignored,
556 # then keycommits returns (undef, undef) instead.
557 # $fatal is for unprocessable commits, and should normally cause
558 # a failure. If ignored, agaion, (undef, undef) is returned.
560 # If a callback is undef, fail is called instead.
561 # If a callback is defined but false, the situation is ignored.
563 # no warnings qw(exiting); last;
564 # if the answer is no longer wanted.
566 my ($anchor, $breakwater);
569 $fatal //= sub { fail $_[2]; };
571 my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
572 my $why = $mainwhy.$xwhy;
573 my $m = "branch needs laundering (run git-debrebase): $why";
574 fail $m unless defined $cb;
576 $cb->("unclean-$tagsfx", $why, $cl, $mainwhy);
579 $cl = classify $head;
580 my $ty = $cl->{Type};
581 if ($ty eq 'Packaging') {
582 $breakwater //= $clogonly;
583 $breakwater //= $head;
584 } elsif ($ty eq 'Changelog') {
585 # this is going to count as the tip of the breakwater
586 # only if it has no upstream stuff before it
588 } elsif ($ty eq 'Anchor' or
589 $ty eq 'TreatAsAnchor' or
590 $ty eq 'BreakwaterStart') {
592 $breakwater //= $clogonly;
593 $breakwater //= $head;
595 } elsif ($ty eq 'Upstream') {
596 $x->($unclean, 'ordering',
597 "packaging change ($breakwater) follows upstream change"," (eg $head)")
598 if defined $breakwater;
601 } elsif ($ty eq 'Mixed') {
602 $x->($unclean, 'mixed',
603 "found mixed upstream/packaging commit"," ($head)");
606 } elsif ($ty eq 'Pseudomerge' or
607 $ty eq 'AddPatches') {
608 $x->($furniture, (lc $ty),
609 "found interchange bureaucracy commit ($ty)"," ($head)");
610 } elsif ($ty eq 'DgitImportUnpatched') {
611 $x->($trouble, 'dgitimport',
612 "found dgit dsc import ($head)");
613 return (undef,undef);
615 $x->($fatal, 'unprocessable',
616 "found unprocessable commit, cannot cope: $cl->{Why}",
618 return (undef,undef);
620 $head = $cl->{Parents}[0]{CommitId};
622 return ($anchor, $breakwater);
628 $nogenerate,$report) = @_;
629 # => ($tip, $breakwater_tip, $last_anchor)
630 # (or nothing, if $nogenerate)
632 printdebug "*** WALK $input ".($nogenerate//0)." ".($report//'-')."\n";
634 # go through commits backwards
635 # we generate two lists of commits to apply:
636 # breakwater branch and upstream patches
637 my (@brw_cl, @upp_cl, @processed);
644 my ($prose, $info) = @_;
648 $ms .= "\n\n[git-debrebase$info: $prose]\n";
651 my $rewrite_from_here = sub {
653 my $sp_cl = { SpecialMethod => 'StartRewrite' };
655 push @processed, $sp_cl;
660 my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; };
663 return unless $report;
664 print $report $prdelim, @_;
668 my $bomb = sub { # usage: return $bomb->();
669 print $report " Unprocessable" if $report;
670 print $report " ($cl->{Why})" if $report && defined $cl->{Why};
673 return (undef,undef);
675 die "commit $cur: Cannot cope with this commit (d.".
676 (join ' ', map { sprintf "%#x", $_->{Differs} }
677 @{ $cl->{Parents} }).
678 (defined $cl->{Why} ? "; $cl->{Why}": '').
685 my $build_start = sub {
686 my ($msg, $parent) = @_;
689 no warnings qw(exiting); last;
696 my $ty = $cl->{Type};
697 my $st = $cl->{SubType};
698 $prline->("$cl->{CommitId} $cl->{Type}");
699 $found{$ty. ( defined($st) ? "-$st" : '' )}++;
700 push @processed, $cl;
701 my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
702 if ($ty eq 'AddPatches') {
704 $rewrite_from_here->(\@upp_cl);
706 } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') {
710 } elsif ($ty eq 'BreakwaterStart') {
712 $build_start->('FirstPackaging', $cur);
713 } elsif ($ty eq 'Upstream') {
717 } elsif ($ty eq 'Mixed') {
720 my $cls = { %$cl, $xmsg->("split mixed commit: $wh part") };
723 $queue->(\@brw_cl, "debian");
724 $queue->(\@upp_cl, "upstream");
725 $rewrite_from_here->(\@brw_cl);
728 } elsif ($ty eq 'Pseudomerge') {
729 my $contrib = $cl->{Contributor}{CommitId};
730 print $report " Contributor=$contrib" if $report;
731 push @pseudomerges, $cl;
732 $rewrite_from_here->(\@upp_cl);
735 } elsif ($ty eq 'Anchor' or $ty eq 'TreatAsAnchor') {
737 $build_start->("Anchor", $cur);
738 } elsif ($ty eq 'DgitImportUnpatched') {
739 my $pm = $pseudomerges[-1];
741 # To an extent, this is heuristic. Imports don't have
742 # a useful history of the debian/ branch. We assume
743 # that the first pseudomerge after an import has a
744 # useful history of debian/, and ignore the histories
745 # from later pseudomerges. Often the first pseudomerge
746 # will be the dgit import of the upload to the actual
747 # suite intended by the non-dgit NMUer, and later
748 # pseudomerges may represent in-archive copies.
749 my $ovwrs = $pm->{Overwritten};
750 printf $report " PM=%s \@Overwr:%d",
751 $pm->{CommitId}, (scalar @$ovwrs)
754 printdebug "*** WALK BOMB DgitImportUnpatched\n";
757 my $ovwr = $ovwrs->[0]{CommitId};
758 printf $report " Overwr=%s", $ovwr if $report;
759 # This import has a tree which is just like a
760 # breakwater tree, but it has the wrong history. It
761 # ought to have the previous breakwater (which the
762 # pseudomerge overwrote) as an ancestor. That will
763 # make the history of the debian/ files correct. As
764 # for the upstream version: either it's the same as
765 # was ovewritten (ie, same as the previous
766 # breakwater), in which case that history is precisely
767 # right; or, otherwise, it was a non-gitish upload of a
768 # new upstream version. We can tell these apart by
769 # looking at the tree of the supposed upstream.
772 SpecialMethod => 'DgitImportDebianUpdate',
773 $xmsg->("convert dgit import: debian changes")
776 SpecialMethod => 'DgitImportUpstreamUpdate',
777 $xmsg->("convert dgit import: upstream update",
780 $prline->(" Import");
781 $rewrite_from_here->(\@brw_cl);
782 $upp_limit //= $#upp_cl; # further, deeper, patches discarded
786 # Everything is from this import. This kind of import
787 # is already in valid breakwater format, with the
788 # patches as commits.
789 printf $report " NoPM" if $report;
790 # last thing we processed will have been the first patch,
791 # if there is one; which is fine, so no need to rewrite
792 # on account of this import
793 $build_start->("ImportOrigin", $cur);
797 printdebug "*** WALK BOMB unrecognised\n";
803 printdebug "*** WALK prep done cur=$cur".
804 " brw $#brw_cl upp $#upp_cl proc $#processed pm $#pseudomerges\n";
806 return if $nogenerate;
808 # Now we build it back up again
814 my $read_tree_debian = sub {
816 read_tree_subdir 'debian', "$treeish:debian";
817 rm_subdir_cached 'debian/patches';
819 my $read_tree_upstream = sub {
821 runcmd @git, qw(read-tree), $treeish;
822 $read_tree_debian->($build);
825 $#upp_cl = $upp_limit if defined $upp_limit;
827 my $committer_authline = calculate_committer_authline();
829 printdebug "WALK REBUILD $build ".(scalar @processed)."\n";
831 confess "internal error" unless $build eq (pop @processed)->{CommitId};
834 mkdir $rd or $!==EEXIST or die $!;
836 runcmd @git, qw(read-tree), $build;
837 foreach my $cl (qw(Debian), (reverse @brw_cl),
838 { SpecialMethod => 'RecordBreakwaterTip' },
839 qw(Upstream), (reverse @upp_cl)) {
841 $current_method = $cl;
844 my $method = $cl->{SpecialMethod} // $current_method;
845 my @parents = ($build);
846 my $cltree = $cl->{CommitId};
847 printdebug "WALK BUILD ".($cltree//'undef').
848 " $method (rewriting=$rewriting)\n";
849 if ($method eq 'Debian') {
850 $read_tree_debian->($cltree);
851 } elsif ($method eq 'Upstream') {
852 $read_tree_upstream->($cltree);
853 } elsif ($method eq 'StartRewrite') {
856 } elsif ($method eq 'RecordBreakwaterTip') {
857 $breakwater = $build;
859 } elsif ($method eq 'DgitImportDebianUpdate') {
860 $read_tree_debian->($cltree);
861 } elsif ($method eq 'DgitImportUpstreamUpdate') {
862 confess unless $rewriting;
863 my $differs = (get_differs $build, $cltree);
864 next unless $differs & D_UPS;
865 $read_tree_upstream->($cltree);
866 push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
871 my $procd = (pop @processed) // 'UNDEF';
874 printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n";
877 my $newtree = cmdoutput @git, qw(write-tree);
879 $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
880 $ch =~ s{^parent .*\n}{}mg;
881 $ch =~ s{(?=^author)}{
882 join '', map { "parent $_\n" } @parents
883 }me or confess "$ch ?";
885 $ch =~ s{^committer .*$}{$committer_authline}m
888 my $cf = "$rd/m$rewriting";
889 open CD, ">", $cf or die $!;
890 print CD $ch, "\n", $cl->{Msg} or die $!;
892 my @cmd = (@git, qw(hash-object));
893 push @cmd, qw(-w) if $rewriting;
894 push @cmd, qw(-t commit), $cf;
895 my $newcommit = cmdoutput @cmd;
896 confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId};
898 if (grep { $method eq $_ } qw(DgitImportUpstreamUpdate)) {
904 my $final_check = get_differs $build, $input;
905 die sprintf "internal error %#x %s %s", $final_check, $build, $input
906 if $final_check & ~D_PAT_ADD;
908 my @r = ($build, $breakwater, $last_anchor);
909 printdebug "*** WALK RETURN @r\n";
914 git_check_unmodified();
915 return git_rev_parse qw(HEAD);
918 sub update_head ($$$) {
919 my ($old, $new, $mrest) = @_;
920 push @deferred_updates, "update HEAD $new $old";
921 run_deferred_updates $mrest;
924 sub update_head_checkout ($$$) {
925 my ($old, $new, $mrest) = @_;
926 update_head $old, $new, $mrest;
927 runcmd @git, qw(reset --hard);
930 sub update_head_postlaunder ($$$) {
931 my ($old, $tip, $reflogmsg) = @_;
932 return if $tip eq $old;
933 print "git-debrebase: laundered (head was $old)\n";
934 update_head $old, $tip, $reflogmsg;
935 # no tree changes except debian/patches
936 runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
939 sub do_launder_head ($) {
940 my ($reflogmsg) = @_;
941 my $old = get_head();
943 my ($tip,$breakwater) = walk $old;
945 update_head_postlaunder $old, $tip, $reflogmsg;
946 return ($tip,$breakwater);
949 sub cmd_launder_v0 () {
950 badusage "no arguments to launder-v0 allowed" if @ARGV;
951 my $old = get_head();
952 my ($tip,$breakwater,$last_anchor) = walk $old;
953 update_head_postlaunder $old, $tip, 'launder';
954 printf "# breakwater tip\n%s\n", $breakwater;
955 printf "# working tip\n%s\n", $tip;
956 printf "# last anchor\n%s\n", $last_anchor;
959 sub defaultcmd_rebase () {
960 push @ARGV, @{ $opt_defaultcmd_interactive // [] };
961 my ($tip,$breakwater) = do_launder_head 'launder for rebase';
962 runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
966 die if ($ARGV[0]//'') =~ m/^-/;
967 badusage "too many arguments to analyse" if @ARGV>1;
970 $old = git_rev_parse $old;
972 $old = git_rev_parse 'HEAD';
974 my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
975 STDOUT->error and die $!;
978 sub ffq_prev_branchinfo () {
979 my $current = git_get_symref();
980 return gdr_ffq_prev_branchinfo($current);
983 sub ffq_check ($$$) {
984 # calls $ff and/or $notff zero or more times
985 # then returns either (status,message) where status is
990 # or (undef,undef, $ffq_prev,$gdrlast)
991 # $ff and $notff are called like this:
992 # $ff->("message for stdout\n");
993 # $notff->('snag-name', $message);
994 # normally $currentval should be HEAD
995 my ($currentval, $ff, $notff) =@_;
997 my ($status, $message, $current, $ffq_prev, $gdrlast)
998 = ffq_prev_branchinfo();
999 return ($status, $message) unless $status eq 'branch';
1001 my $exists = git_get_ref $ffq_prev;
1002 return ('exists',"$ffq_prev already exists") if $exists;
1004 return ('not-branch', 'HEAD symref is not to refs/heads/')
1005 unless $current =~ m{^refs/heads/};
1008 my @check_specs = split /\;/, (cfg "branch.$branch.ffq-ffrefs",1) // '*';
1011 printdebug "ffq check_specs @check_specs\n";
1014 my ($lrref, $desc) = @_;
1015 printdebug "ffq might check $lrref ($desc)\n";
1017 for my $chk (@check_specs) {
1019 $invert = $glob =~ s{^[!^]}{};
1020 last if fnmatch $glob, $lrref;
1023 my $lrval = git_get_ref $lrref;
1024 return unless length $lrval;
1026 if (is_fast_fwd $lrval, $currentval) {
1027 $ff->("OK, you are ahead of $lrref\n");
1028 $checked{$lrref} = 1;
1029 } elsif (is_fast_fwd $currentval, $lrval) {
1030 $checked{$lrref} = -1;
1031 $notff->('behind', "you are behind $lrref, divergence risk");
1033 $checked{$lrref} = -1;
1034 $notff->('diverged', "you have diverged from $lrref");
1038 my $merge = cfg "branch.$branch.merge",1;
1039 if (defined $merge and $merge =~ m{^refs/heads/}) {
1041 printdebug "ffq merge $rhs\n";
1042 my $check_remote = sub {
1043 my ($remote, $desc) = @_;
1044 printdebug "ffq check_remote ".($remote//'undef')." $desc\n";
1045 return unless defined $remote;
1046 $check->("refs/remotes/$remote/$rhs", $desc);
1048 $check_remote->((scalar cfg "branch.$branch.remote",1),
1049 'remote fetch/merge branch');
1050 $check_remote->((scalar cfg "branch.$branch.pushRemote",1) //
1051 (scalar cfg "branch.$branch.pushDefault",1),
1052 'remote push branch');
1054 if ($branch =~ m{^dgit/}) {
1055 $check->("refs/remotes/dgit/$branch", 'remote dgit branch');
1056 } elsif ($branch =~ m{^master$}) {
1057 $check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid');
1059 return (undef, undef, $ffq_prev, $gdrlast);
1062 sub record_ffq_prev_deferred () {
1063 # => ('status', "message")
1065 # deferred message is undef
1070 # if not ff from some branch we should be ff from, is an snag
1071 # if "deferred", will have added something about that to
1072 # @deferred_update_messages, and also maybe printed (already)
1073 # some messages about ff checks
1074 my $currentval = get_head();
1076 my ($status,$message, $ffq_prev,$gdrlast) =
1077 ffq_check $currentval, sub { print $_[0] or die $!; }, \&snag;
1078 return ($status,$message) if defined $status;
1082 push @deferred_updates, "update $ffq_prev $currentval $git_null_obj";
1083 push @deferred_updates, "delete $gdrlast";
1084 push @deferred_update_messages, "Recorded current head for preservation";
1085 return ('deferred', undef);
1088 sub record_ffq_auto () {
1089 my ($status, $message) = record_ffq_prev_deferred();
1090 if ($status eq 'deferred' || $status eq 'exists') {
1092 snag $status, "could not record ffq-prev: $message";
1097 sub ffq_prev_info () {
1098 # => ($ffq_prev, $gdrlast, $ffq_prev_commitish)
1099 my ($status, $message, $current, $ffq_prev, $gdrlast)
1100 = ffq_prev_branchinfo();
1101 if ($status ne 'branch') {
1102 snag $status, "could not check ffq-prev: $message";
1105 my $ffq_prev_commitish = $ffq_prev && git_get_ref $ffq_prev;
1106 return ($ffq_prev, $gdrlast, $ffq_prev_commitish);
1109 sub stitch ($$$$$) {
1110 my ($old_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose) = @_;
1112 push @deferred_updates, "delete $ffq_prev $ffq_prev_commitish";
1114 if (is_fast_fwd $old_head, $ffq_prev_commitish) {
1115 my $differs = get_differs $old_head, $ffq_prev_commitish;
1116 unless ($differs & ~D_PAT_ADD) {
1117 # ffq-prev is ahead of us, and the only tree changes it has
1118 # are possibly addition of things in debian/patches/.
1119 # Just wind forwards rather than making a pointless pseudomerge.
1120 push @deferred_updates,
1121 "update $gdrlast $ffq_prev_commitish $git_null_obj";
1122 update_head_checkout $old_head, $ffq_prev_commitish,
1123 "stitch (fast forward)";
1128 # We make pseudomerges with L as the contributing parent.
1129 # This makes git rev-list --first-parent work properly.
1130 my $new_head = make_commit [ $old_head, $ffq_prev ], [
1131 'Declare fast forward / record previous work',
1132 "[git-debrebase pseudomerge: $prose]",
1134 push @deferred_updates, "update $gdrlast $new_head $git_null_obj";
1135 update_head $old_head, $new_head, "stitch: $prose";
1138 sub do_stitch ($;$) {
1139 my ($prose, $unclean) = @_;
1141 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
1142 if (!$ffq_prev_commitish) {
1143 fail "No ffq-prev to stitch." unless $opt_noop_ok;
1146 my $dangling_head = get_head();
1148 keycommits $dangling_head, $unclean,$unclean,$unclean;
1151 stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
1154 sub cmd_new_upstream () {
1155 # automatically and unconditionally launders before rebasing
1156 # if rebase --abort is used, laundering has still been done
1160 badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
1162 # parse args - low commitment
1163 my $spec_version = shift @ARGV;
1164 my $new_version = (new Dpkg::Version $spec_version, check => 1);
1165 if ($new_version->is_native()) {
1166 $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
1168 my $new_upstream_version = $new_version->version();
1170 my $new_upstream = shift @ARGV;
1171 if (!defined $new_upstream) {
1173 # todo: at some point maybe use git-deborig to do this
1174 foreach my $tagpfx ('', 'v', 'upstream/') {
1175 my $tag = $tagpfx.(dep14_version_mangle $new_upstream_version);
1176 $new_upstream = git_get_ref "refs/tags/$tag";
1177 last if length $new_upstream;
1180 if (!length $new_upstream) {
1181 fail "Could not determine appropriate upstream commitish.\n".
1182 " (Tried these tags: @tried)\n".
1183 " Check version, and specify upstream commitish explicitly.";
1186 $new_upstream = git_rev_parse $new_upstream;
1191 my ($n, @x) = @_; # may be ''
1192 my $pc = $pieces{$n} //= {
1194 Desc => ($n ? "upstream piece \`$n'" : "upstream (main piece"),
1196 while (my $k = shift @x) { $pc->{$k} = shift @x; }
1201 my $newpiece = sub {
1202 my ($n, @x) = @_; # may be ''
1203 my $pc = $piece->($n, @x, NewIx => (scalar @newpieces));
1204 push @newpieces, $pc;
1209 New => $new_upstream,
1211 while (@ARGV && $ARGV[0] !~ m{^-}) {
1212 my $n = shift @ARGV;
1214 badusage "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
1215 unless @ARGV && $ARGV[0] !~ m{^-};
1217 my $c = git_rev_parse shift @ARGV;
1218 die unless $n =~ m/^$extra_orig_namepart_re$/;
1219 $newpiece->($n, New => $c);
1222 # now we need to investigate the branch this generates the
1223 # laundered version but we don't switch to it yet
1224 my $old_head = get_head();
1225 my ($old_laundered_tip,$old_bw,$old_anchor) = walk $old_head;
1227 my $old_bw_cl = classify $old_bw;
1228 my $old_anchor_cl = classify $old_anchor;
1230 if (!$old_anchor_cl->{OrigParents}) {
1231 snag 'anchor-treated',
1232 'old anchor is recognised due to --anchor, cannot check upstream';
1234 $old_upstream = parsecommit
1235 $old_anchor_cl->{OrigParents}[0]{CommitId};
1236 $piece->('', Old => $old_upstream->{CommitId});
1239 if ($old_upstream && $old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
1240 if ($old_upstream->{Msg} =~
1241 m{^\[git-debrebase upstream-combine (\.(?: $extra_orig_namepart_re)+)\:.*\]$}m
1243 my @oldpieces = (split / /, $1);
1244 my $old_n_parents = scalar @{ $old_upstream->{Parents} };
1245 if ($old_n_parents != @oldpieces &&
1246 $old_n_parents != @oldpieces + 1) {
1247 snag 'upstream-confusing', sprintf
1248 "previous upstream combine %s".
1249 " mentions %d pieces (each implying one parent)".
1250 " but has %d parents".
1251 " (one per piece plus maybe a previous combine)",
1252 $old_upstream->{CommitId},
1253 (scalar @oldpieces),
1255 } elsif ($oldpieces[0] ne '.') {
1256 snag 'upstream-confusing', sprintf
1257 "previous upstream combine %s".
1258 " first piece is not \`.'",
1262 foreach my $i (0..$#oldpieces) {
1263 my $n = $oldpieces[$i];
1264 my $hat = 1 + $i + ($old_n_parents - @oldpieces);
1265 $piece->($n, Old => $old_upstream->{CommitId}.'^'.$hat);
1269 snag 'upstream-confusing',
1270 "previous upstream $old_upstream->{CommitId} is from".
1271 " git-debrebase but not an \`upstream-combine' commit";
1275 foreach my $pc (values %pieces) {
1276 if (!$old_upstream) {
1277 # we have complained already
1278 } elsif (!$pc->{Old}) {
1279 snag 'upstream-new-piece',
1280 "introducing upstream piece \`$pc->{Name}'";
1281 } elsif (!$pc->{New}) {
1282 snag 'upstream-rm-piece',
1283 "dropping upstream piece \`$pc->{Name}'";
1284 } elsif (!is_fast_fwd $pc->{Old}, $pc->{New}) {
1285 snag 'upstream-not-ff',
1286 "not fast forward: $pc->{Name} $pc->{Old}..$pc->{New}";
1290 printdebug "%pieces = ", (dd \%pieces), "\n";
1291 printdebug "\@newpieces = ", (dd \@newpieces), "\n";
1299 my @upstream_merge_parents;
1302 push @upstream_merge_parents, $old_upstream->{CommitId};
1305 foreach my $pc (@newpieces) { # always has '' first
1307 read_tree_subdir $pc->{Name}, $pc->{New};
1309 runcmd @git, qw(read-tree), $pc->{New};
1311 push @upstream_merge_parents, $pc->{New};
1314 # index now contains the new upstream
1316 if (@newpieces > 1) {
1317 # need to make the upstream subtree merge commit
1318 $new_upstream = make_commit \@upstream_merge_parents,
1319 [ "Combine upstreams for $new_upstream_version",
1320 ("[git-debrebase upstream-combine . ".
1321 (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]).
1326 # $new_upstream is either the single upstream commit, or the
1327 # combined commit we just made. Either way it will be the
1328 # "upstream" parent of the anchor merge.
1330 read_tree_subdir 'debian', "$old_bw:debian";
1332 # index now contains the anchor merge contents
1333 $new_bw = make_commit [ $old_bw, $new_upstream ],
1334 [ "Update to upstream $new_upstream_version",
1335 "[git-debrebase anchor: new upstream $new_upstream_version, merge]",
1338 my $clogsignoff = cmdoutput qw(git show),
1339 '--pretty=format:%an <%ae> %aD',
1342 # Now we have to add a changelog stanza so the Debian version
1344 die if unlink "debian";
1345 die $! unless $!==ENOENT or $!==ENOTEMPTY;
1346 unlink "debian/changelog" or $!==ENOENT or die $!;
1347 mkdir "debian" or die $!;
1348 open CN, ">", "debian/changelog" or die $!;
1349 my $oldclog = git_cat_file ":debian/changelog";
1350 $oldclog =~ m/^($package_re) \(\S+\) / or
1351 fail "cannot parse old changelog to get package name";
1353 print CN <<END, $oldclog or die $!;
1354 $p ($new_version) UNRELEASED; urgency=medium
1356 * Update to new upstream version $new_upstream_version.
1362 runcmd @git, qw(update-index --add --replace), 'debian/changelog';
1364 # Now we have the final new breakwater branch in the index
1365 $new_bw = make_commit [ $new_bw ],
1366 [ "Update changelog for new upstream $new_upstream_version",
1367 "[git-debrebase: new upstream $new_upstream_version, changelog]",
1371 # we have constructed the new breakwater. we now need to commit to
1372 # the laundering output, because git-rebase can't easily be made
1373 # to make a replay list which is based on some other branch
1375 update_head_postlaunder $old_head, $old_laundered_tip,
1376 'launder for new upstream';
1378 my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);
1379 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
1380 "debrebase new-upstream $new_version: rebase";
1382 # now it's for the user to sort out
1385 sub cmd_record_ffq_prev () {
1386 badusage "no arguments allowed" if @ARGV;
1387 my ($status, $msg) = record_ffq_prev_deferred();
1388 if ($status eq 'exists' && $opt_noop_ok) {
1389 print "Previous head already recorded\n" or die $!;
1390 } elsif ($status eq 'deferred') {
1391 run_deferred_updates 'record-ffq-prev';
1393 fail "Could not preserve: $msg";
1398 badusage "no arguments allowed" if @ARGV;
1399 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
1400 print "$bw\n" or die $!;
1403 sub cmd_breakwater () {
1404 badusage "no arguments allowed" if @ARGV;
1405 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
1406 print "$bw\n" or die $!;
1410 badusage "no arguments allowed" if @ARGV;
1412 # todo: gdr status should print divergence info
1413 # todo: gdr status should print upstream component(s) info
1414 # todo: gdr should leave/maintain some refs with this kind of info ?
1416 my $oldest = { Badness => 0 };
1419 my ($badness, $ourmsg, $snagname, $dummy, $cl, $kcmsg) = @_;
1420 if ($oldest->{Badness} < $badness) {
1421 $oldest = $newest = undef;
1424 Badness => $badness,
1425 CommitId => $cl->{CommitId},
1429 $newest //= $oldest;
1431 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
1432 sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
1433 sub { $note->(2, 'branch is unlaundered', @_); },
1434 sub { $note->(3, 'branch needs laundering', @_); },
1435 sub { $note->(4, 'branch not in git-debrebase form', @_); };
1437 my $prcommitinfo = sub {
1439 flush STDOUT or die $!;
1440 runcmd @git, qw(--no-pager log -n1),
1441 '--pretty=format: %h %s%n',
1445 print "current branch contents, in git-debrebase terms:\n";
1446 if (!$oldest->{Badness}) {
1447 print " branch is laundered\n";
1449 print " $oldest->{OurMsg}\n";
1451 foreach my $info ($oldest, $newest) {
1452 my $cid = $info->{CommitId};
1453 next if $cid eq $printed;
1455 print " $info->{KcMsg}\n";
1456 $prcommitinfo->($cid);
1461 my ($cid, $what) = @_;
1462 if (!defined $cid) {
1463 print " $what is not well-defined\n";
1466 $prcommitinfo->($cid);
1469 print "key git-debrebase commits:\n";
1470 $prab->($anchor, 'anchor');
1471 $prab->($bw, 'breakwater');
1473 my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
1474 ffq_prev_branchinfo();
1476 print "branch and ref status, in git-debrebase terms:\n";
1478 print " $ffq_msg\n";
1480 $ffq_prev = git_get_ref $ffq_prev;
1481 $gdrlast = git_get_ref $gdrlast;
1483 print " unstitched; previous tip was:\n";
1484 $prcommitinfo->($ffq_prev);
1485 } elsif (!$gdrlast) {
1486 print " stitched? (no record of git-debrebase work)\n";
1487 } elsif (is_fast_fwd $gdrlast, 'HEAD') {
1488 print " stitched\n";
1490 print " not git-debrebase (diverged since last stitch)\n"
1496 my $prose = 'stitch';
1497 GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
1498 badusage "no arguments allowed" if @ARGV;
1499 do_stitch $prose, 0;
1501 sub cmd_prepush () { cmd_stitch(); }
1504 badusage "no arguments allowed" if @ARGV;
1505 do_launder_head 'launder for git-debrebase quick';
1509 sub cmd_conclude () {
1510 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
1511 if (!$ffq_prev_commitish) {
1512 fail "No ongoing git-debrebase session." unless $opt_noop_ok;
1515 my $dangling_head = get_head();
1517 badusage "no arguments allowed" if @ARGV;
1518 do_launder_head 'launder for git-debrebase quick';
1522 sub make_patches_staged ($) {
1524 # Produces the patches that would result from $head if it were
1526 my ($secret_head, $secret_bw, $last_anchor) = walk $head;
1529 runcmd @git, qw(checkout -q -b bw), $secret_bw;
1530 runcmd @git, qw(checkout -q -b patch-queue/bw), $secret_head;
1531 my @gbp_cmd = (qw(gbp pq export));
1532 my $r = system shell_cmd 'exec >../gbp-pq-err 2>&1', @gbp_cmd;
1534 { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
1537 runcmd @git, qw(add -f debian/patches);
1541 sub make_patches ($) {
1543 keycommits $head, 0, \&snag;
1544 make_patches_staged $head;
1547 my $ptree = cmdoutput @git, qw(write-tree --prefix=debian/patches/);
1548 runcmd @git, qw(read-tree), $head;
1549 read_tree_subdir 'debian/patches', $ptree;
1550 $out = make_commit [$head], [
1551 'Commit patch queue (exported by git-debrebase)',
1552 '[git-debrebase: export and commit patches]',
1558 sub cmd_make_patches () {
1559 my $opt_quiet_would_amend;
1560 GetOptions('quiet-would-amend!', \$opt_quiet_would_amend)
1561 or die badusage("bad options to make-patches");
1562 badusage "no arguments allowed" if @ARGV;
1563 my $old_head = get_head();
1564 my $new = make_patches $old_head;
1565 my $d = get_differs $old_head, $new;
1567 fail "No (more) patches to export." unless $opt_noop_ok;
1569 } elsif ($d == D_PAT_ADD) {
1571 update_head_checkout $old_head, $new, 'make-patches';
1573 print STDERR failmsg
1574 "Patch export produced patch amendments".
1575 " (abandoned output commit $new).".
1576 " Try laundering first."
1577 unless $opt_quiet_would_amend;
1582 sub cmd_convert_from_gbp () {
1583 badusage "needs 1 optional argument, the upstream git rev"
1585 my ($upstream_spec) = @ARGV;
1586 $upstream_spec //= 'refs/heads/upstream';
1587 my $upstream = git_rev_parse $upstream_spec;
1588 my $old_head = get_head();
1590 my $upsdiff = get_differs $upstream, $old_head;
1591 if ($upsdiff & D_UPS) {
1592 runcmd @git, qw(--no-pager diff),
1593 $upstream, $old_head,
1594 qw( -- :!/debian :/);
1595 fail "upstream ($upstream_spec) and HEAD are not identical in upstream files";
1598 if (!is_fast_fwd $upstream, $old_head) {
1599 snag 'upstream-not-ancestor',
1600 "upstream ($upstream) is not an ancestor of HEAD";
1602 my $wrong = cmdoutput
1603 (@git, qw(rev-list --ancestry-path), "$upstream..HEAD",
1604 qw(-- :/ :!/debian));
1605 if (length $wrong) {
1606 snag 'unexpected-upstream-changes',
1607 "history between upstream ($upstream) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?";
1608 print STDERR "list expected changes with: git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'\n";
1612 if ((git_cat_file "$upstream:debian")[0] ne 'missing') {
1613 snag 'upstream-has-debian',
1614 "upstream ($upstream) contains debian/ directory";
1623 runcmd @git, qw(checkout -q -b gdr-internal), $old_head;
1624 # make a branch out of the patch queue - we'll want this in a mo
1625 runcmd qw(gbp pq import);
1626 # strip the patches out
1627 runcmd @git, qw(checkout -q gdr-internal~0);
1628 rm_subdir_cached 'debian/patches';
1629 $work = make_commit ['HEAD'], [
1630 'git-debrebase convert-from-gbp: drop patches from tree',
1631 'Delete debian/patches, as part of converting to git-debrebase format.',
1632 '[git-debrebase convert-from-gbp: drop patches from tree]'
1634 # make the anchor merge
1635 # the tree is already exactly right
1636 $work = make_commit [$work, $upstream], [
1637 'git-debrebase import: declare upstream',
1638 'First breakwater merge.',
1639 '[git-debrebase anchor: declare upstream]'
1642 # rebase the patch queue onto the new breakwater
1643 runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal);
1644 runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal);
1645 $work = git_rev_parse 'HEAD';
1648 update_head_checkout $old_head, $work, 'convert-from-gbp';
1651 sub cmd_convert_to_gbp () {
1652 badusage "no arguments allowed" if @ARGV;
1653 my $head = get_head();
1654 my (undef, undef, undef, $ffq, $gdrlast) = ffq_prev_branchinfo();
1655 keycommits $head, 0;
1657 make_patches_staged $head;
1659 $out = make_commit ['HEAD'], [
1660 'Commit patch queue (converted from git-debrebase format)',
1661 '[git-debrebase convert-to-gbp: commit patches]',
1665 push @deferred_updates, "delete $ffq";
1666 push @deferred_updates, "delete $gdrlast";
1669 update_head_checkout $head, $out, "convert to gbp (v0)";
1670 print <<END or die $!;
1671 git-debrebase: converted to git-buildpackage branch format
1672 git-debrebase: WARNING: do not now run "git-debrebase" any more
1673 git-debrebase: WARNING: doing so would drop all upstream patches!
1677 sub cmd_downstream_rebase_launder_v0 () {
1678 badusage "needs 1 argument, the baseline" unless @ARGV==1;
1680 $base = git_rev_parse $base;
1681 my $old_head = get_head();
1682 my $current = $old_head;
1685 if ($current eq $base) {
1686 $topmost_keep //= $current;
1687 print " $current BASE stop\n";
1690 my $cl = classify $current;
1691 print " $current $cl->{Type}";
1693 my $p0 = $cl->{Parents}[0]{CommitId};
1695 if ($cl->{Type} eq 'Pseudomerge') {
1696 print " ^".($cl->{Contributor}{Ix}+1);
1697 $next = $cl->{Contributor}{CommitId};
1698 } elsif ($cl->{Type} eq 'AddPatches' or
1699 $cl->{Type} eq 'Changelog') {
1709 $topmost_keep //= $current;
1711 die "to-be stripped changes not on top of the branch\n"
1716 if ($topmost_keep eq $old_head) {
1717 print "unchanged\n";
1719 print "updating to $topmost_keep\n";
1720 update_head_checkout
1721 $old_head, $topmost_keep,
1722 'downstream-rebase-launder-v0';
1726 GetOptions("D+" => \$debuglevel,
1727 'noop-ok', => \$opt_noop_ok,
1728 'f=s' => \@snag_force_opts,
1729 'anchor=s' => \@opt_anchors,
1732 my ($opt,$val) = @_;
1733 badusage "git-debrebase: no cuddling to -i for git-rebase"
1735 die if $opt_defaultcmd_interactive; # should not happen
1736 $opt_defaultcmd_interactive = [ qw(-i) ];
1737 # This access to @ARGV is excessive familiarity with
1738 # Getopt::Long, but there isn't another sensible
1739 # approach. '-i=s{0,}' does not work with bundling.
1740 push @$opt_defaultcmd_interactive, @ARGV;
1742 }) or die badusage "bad options\n";
1743 initdebug('git-debrebase ');
1744 enabledebug if $debuglevel;
1746 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
1747 chdir $toplevel or die "chdir $toplevel: $!";
1749 $rd = fresh_playground "$playprefix/misc";
1751 @opt_anchors = map { git_rev_parse $_ } @opt_anchors;
1753 if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
1754 defaultcmd_rebase();
1756 my $cmd = shift @ARGV;
1759 $cmdfn = ${*::}{"cmd_$cmdfn"};
1761 $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";