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 $debugcmd_when_debuglevel = 2;
41 our ($usage_message) = <<'END';
43 git-debrebase [<options>] [--|-i <git rebase options...>]
44 git-debrebase [<options>] status
45 git-debrebase [<options>] prepush [--prose=...]
46 git-debrebase [<options>] quick|conclude
47 git-debrebase [<options>] new-upstream <new-version> [<details ...>]
48 git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]
50 See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).
53 our ($opt_force, $opt_noop_ok, @opt_anchors);
54 our ($opt_defaultcmd_interactive);
56 our $us = qw(git-debrebase);
62 print STDERR "$us: bad usage: $m\n";
68 local $SIG{__WARN__}; # GetOptions calls `warn' to print messages
69 GetOptions @_ or badusage $m;
73 getoptions_main "bad options follow \`git-debrebase $sc'", @_;
77 my ($k, $optional) = @_;
79 my @cmd = qw(git config -z);
80 push @cmd, qw(--get-all) if wantarray;
82 my $out = cmdoutput_errok @cmd;
84 fail "missing required git config $k" unless $optional;
87 my @l = split /\0/, $out;
88 return wantarray ? @l : $l[0];
95 my $dd = new Data::Dumper [ $v ];
96 Terse $dd 1; Indent $dd 0; Useqq $dd 1;
102 my $data = (git_cat_file $objid, 'commit');
103 $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
107 sub D_UPS () { 0x02; } # upstream files
108 sub D_PAT_ADD () { 0x04; } # debian/patches/ extra patches at end
109 sub D_PAT_OTH () { 0x08; } # debian/patches other changes
110 sub D_DEB_CLOG () { 0x10; } # debian/ (not patches/ or changelog)
111 sub D_DEB_OTH () { 0x20; } # debian/changelog
112 sub DS_DEB () { D_DEB_CLOG | D_DEB_OTH; } # debian/ (not patches/)
114 our $playprefix = 'debrebase';
119 our @dgit = qw(dgit);
121 sub in_workarea ($) {
124 my $r = eval { $sub->(); };
125 { local $@; changedir $maindir; }
129 sub fresh_workarea () {
130 $workarea = fresh_playground "$playprefix/work";
131 in_workarea sub { playtree_setup };
134 our $snags_forced = 0;
135 our $snags_tripped = 0;
136 our $snags_summarised = 0;
137 our @deferred_updates;
138 our @deferred_update_messages;
140 sub all_snags_summarised () {
141 $snags_forced + $snags_tripped == $snags_summarised;
143 sub run_deferred_updates ($) {
146 confess 'dangerous internal error' unless all_snags_summarised();
148 my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin));
149 debugcmd '>|', @upd_cmd;
150 open U, "|-", @upd_cmd or die $!;
151 foreach (@deferred_updates) {
152 printdebug ">= ", $_, "\n";
153 print U $_, "\n" or die $!;
156 close U or failedcmd @upd_cmd;
158 print $_, "\n" foreach @deferred_update_messages;
160 @deferred_updates = ();
161 @deferred_update_messages = ();
164 sub get_differs ($$) {
166 # This resembles quiltify_trees_differ, in dgit, a bit.
167 # But we don't care about modes, or dpkg-source-unrepresentable
168 # changes, and we don't need the plethora of different modes.
169 # Conversely we need to distinguish different kinds of changes to
170 # debian/ and debian/patches/.
175 my ($opts, $limits, $fn) = @_;
176 my @cmd = (@git, qw(diff-tree -z --no-renames));
178 push @cmd, "$_:" foreach $x, $y;
179 push @cmd, '--', @$limits;
180 my $diffs = cmdoutput @cmd;
181 foreach (split /\0/, $diffs) { $fn->(); }
184 $rundiff->([qw(--name-only)], [], sub {
185 $differs |= $_ eq 'debian' ? DS_DEB : D_UPS;
188 if ($differs & DS_DEB) {
190 $rundiff->([qw(--name-only -r)], [qw(debian)], sub {
192 m{^debian/patches/} ? D_PAT_OTH :
193 $_ eq 'debian/changelog' ? D_DEB_CLOG :
196 die "mysterious debian changes $x..$y"
197 unless $differs & (D_PAT_OTH|DS_DEB);
200 if ($differs & D_PAT_OTH) {
202 $differs &= ~D_PAT_OTH;
204 $differs |= D_PAT_OTH;
205 no warnings qw(exiting); last;
207 $rundiff->([qw(--name-status -r)], [qw(debian/patches/)], sub {
208 no warnings qw(exiting);
209 if (!defined $mode) {
212 die unless s{^debian/patches/}{};
214 if ($mode eq 'A' && !m/\.series$/s) {
216 } elsif ($mode eq 'M' && $_ eq 'series') {
217 my $x_s = (git_cat_file "$x:debian/patches/series", 'blob');
218 my $y_s = (git_cat_file "$y:debian/patches/series", 'blob');
219 chomp $x_s; $x_s .= "\n";
220 $ok = $x_s eq substr($y_s, 0, length $x_s);
225 $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
227 die "mysterious debian/patches changes $x..$y"
228 unless $differs & (D_PAT_ADD|D_PAT_OTH);
231 printdebug sprintf "get_differs %s %s = %#x\n", $x, $y, $differs;
236 sub commit_pr_info ($) {
238 return Data::Dumper->dump([$r], [qw(commit)]);
241 sub calculate_committer_authline () {
242 my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
243 'DUMMY COMMIT (git-debrebase)', "HEAD:";
244 my ($h,$m) = get_commit $c;
245 $h =~ m/^committer .*$/m or confess "($h) ?";
249 sub rm_subdir_cached ($) {
251 runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
254 sub read_tree_subdir ($$) {
255 my ($subdir, $new_tree_object) = @_;
256 rm_subdir_cached $subdir;
257 runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object;
260 sub read_tree_debian ($) {
262 read_tree_subdir 'debian', "$treeish:debian";
263 rm_subdir_cached 'debian/patches';
266 sub read_tree_upstream ($;$$) {
267 my ($treeish, $keep_patches, $tree_with_debian) = @_;
268 # if $tree_with_debian is supplied, will use that for debian/
269 # otherwise will save and restore it.
271 $tree_with_debian ? "$tree_with_debian:debian"
272 : cmdoutput @git, qw(write-tree --prefix=debian/);
273 runcmd @git, qw(read-tree), $treeish;
274 read_tree_subdir 'debian', $debian;
275 rm_subdir_cached 'debian/patches' unless $keep_patches;
278 sub make_commit ($$) {
279 my ($parents, $message_paras) = @_;
280 my $tree = cmdoutput @git, qw(write-tree);
281 my @cmd = (@git, qw(commit-tree), $tree);
282 push @cmd, qw(-p), $_ foreach @$parents;
283 push @cmd, qw(-m), $_ foreach @$message_paras;
284 return cmdoutput @cmd;
287 our @snag_force_opts;
289 my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits
290 if (grep { $_ eq $tag } @snag_force_opts) {
292 print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n";
295 print STDERR "git-debrebase: snag detected (-f$tag): $msg\n";
299 # Important: all mainline code must call snags_maybe_bail after
300 # any point where snag might be called, but before making changes
301 # (eg before any call to run_deferred_updates). snags_maybe_bail
302 # may be called more than once if necessary (but this is not ideal
303 # because then the messages about number of snags may be confusing).
304 sub snags_maybe_bail () {
305 return if all_snags_summarised();
308 "%s: snags: %d overriden by individual -f options\n",
311 if ($snags_tripped) {
314 "%s: snags: %d overriden by global --force\n",
318 "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
322 $snags_summarised = $snags_forced + $snags_tripped;
324 sub snags_maybe_bail_early () {
325 # useful to bail out early without doing a lot of work;
326 # not a substitute for snags_maybe_bail.
327 snags_maybe_bail() if $snags_tripped && !$opt_force;
330 return $snags_forced || $snags_tripped;
333 sub gbp_pq_export ($$$) {
334 my ($bname, $base, $tip) = @_;
335 # must be run in a workarea. $bname and patch-queue/$bname
336 # ought not to exist. Leaves you on patch-queue/$bname with
337 # the patches staged but not committed.
338 printdebug "gbp_pq_export $bname $base $tip\n";
339 runcmd @git, qw(checkout -q -b), $bname, $base;
340 runcmd @git, qw(checkout -q -b), "patch-queue/$bname", $tip;
341 my @gbp_cmd = (qw(gbp pq export));
342 my $r = system shell_cmd 'exec >../gbp-pq-err 2>&1', @gbp_cmd;
344 { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
347 runcmd @git, qw(add -f debian/patches);
351 # xxx allow merge resolution separately from laundering, before git merge
353 # xxx general gdr docs highlight forbidden things
354 # xxx general gdr docs list allowable things ?
355 # xxx general gdr docs explicitly forbid some rebase
357 # xxx provide a way for the user to help
358 # xxx (eg, provide wreckage provide way to continue)
361 # use git-format-patch?
362 # our own patch identification algorithm?
363 # this is an alternative strategy
365 sub merge_series ($$;@) {
366 my ($newbase, $base_q, @input_qs) = @_;
367 # $base_q{SeriesBase} $input_qs[]{SeriesBase}
368 # $base_q{SeriesTip} $input_qs[]{SeriesTip}
369 # ^ specifies several patch series (currently we only support exactly 2)
370 # return value is a commit which is the result of
371 # merging the two versions of the same topic branch
372 # $input_q[0] and $input_q[1]
373 # with respect to the old version
377 # Creates, in *_q, a key MR for its private use
379 printdebug "merge_series newbase=$newbase\n";
381 $input_qs[$_]{MR}{S} = $_ foreach (0..$#input_qs);
382 $base_q->{MR}{S} = 'base';
385 # $prereq{<patch filename>}{<possible prereq}{<S>} = 1 or absent
386 # $prereq{<patch filename>}{<possible prereq} exists or not (later)
387 # $prereq{<patch filename>} exists or not (even later)
391 local $workarea = fresh_playground "$playprefix/merge";
392 my $seriesfile = "debian/patches/series";
395 foreach my $q ($base_q, reverse @input_qs) {
397 gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip};
398 if (open S, $seriesfile) {
400 while (my $patch = <S>) {
401 chomp $patch or die $!;
402 $prereq{$patch} //= {};
403 foreach my $earlier (@earlier) {
404 $prereq{$patch}{$earlier}{$s}++ and die;
406 push @earlier, $patch;
407 stat "debian/patches/$patch" or die "$patch ?";
409 S->error and die "$seriesfile $!";
412 die "$seriesfile $!" unless $!==ENOENT;
414 read_tree_upstream $newbase, 1;
415 my $pec = make_commit [ grep { defined } $base_q->{MR}{PEC} ], [
416 "Convert $s to patch queue for merging",
417 "[git-debrebase merge-innards patch-queue import:".
420 printdebug "merge_series pec $pec ";
421 runcmd @git, qw(rm -q --cached), $seriesfile;
422 $pec = make_commit [ $pec ], [
423 "Drop series file from $s to avoid merge trouble",
424 "[git-debrebase merge-innards patch-queue prep:".
427 printdebug "pec' $pec\n";
428 runcmd @git, qw(reset -q --hard), $pec;
429 $q->{MR}{PEC} = $pec;
431 # now, because of reverse, we are on $input_q->{MR}{OQC}
432 runcmd @git, qw(checkout -q -b merge);
433 printdebug "merge_series merging...\n";
434 my @mergecmd = (@git, qw(merge --quiet --no-edit), "p-1");
435 debugcmd '+', @mergecmd;
437 if (system @mergecmd) {
441 printdebug "merge_series merge ok, series...\n";
442 # We need to construct a new series file
443 # Firstly, resolve prereq
444 foreach my $f (sort keys %prereq) {
445 printdebug "merge_series patch\t$f\t";
446 if (!stat_exists "debian/patches/$f") {
447 print DEBUG " drop\n" if $debuglevel;
448 # git merge deleted it; that's how we tell it's not wanted
452 print DEBUG " keep\n" if $debuglevel;
453 foreach my $g (sort keys %{ $prereq{$f} }) {
454 my $gfp = $prereq{$f}{$g};
455 printdebug "merge_series prereq\t$f\t-> $g\t";
456 if (!!$gfp->{0} == !!$gfp->{1}
459 print DEBUG "\tkeep\n" if $debuglevel;
461 print DEBUG "\tdrop\n" if $debuglevel;
462 delete $prereq{$f}{$g};
469 return scalar keys %{ $prereq{$f} };
472 my $nodate = time + 1;
474 # $authordate{<patch filename>};
475 my $authordate = sub {
477 $authordate{$f} //= do {
478 open PF, "<", "debian/patches/$f" or die "$f $!";
480 return $nodate if m/^$/;
481 last if s{^Date: }{};
484 return cmdoutput qw(date +%s -d), $_;
488 open NS, '>', $seriesfile or die $!;
490 while (keys %prereq) {
492 foreach my $try (sort keys %prereq) {
495 $unsat->($try) <=> $unsat->($best) or
496 $authordate->($try) <=> $authordate->($best) or
502 printdebug "merge_series series next $best\n";
503 print NS "$best\n" or die $!;
504 delete $prereq{$best};
505 foreach my $gp (values %prereq) {
510 runcmd @git, qw(add), $seriesfile;
511 runcmd @git, qw(commit --quiet -m), 'Merged series';
513 printdebug "merge_series series gbp pq import\n";
514 runcmd qw(gbp pq import);
516 # OK now we are on patch-queue/merge, and we need to rebase
517 # onto the intended parent and drop the patches from each one
519 printdebug "merge_series series ok, building...\n";
520 my $build = $newbase;
521 my @lcmd = (@git, qw(rev-list --reverse merge..patch-queue/merge));
522 foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) {
523 my $commit = git_cat_file $c, 'commit';
524 printdebug "merge_series series ok, building $c\n";
525 read_tree_upstream $c;
526 my $tree = cmdoutput @git, qw(write-tree);
527 $commit =~ s{^parent (\S+)$}{parent $build}m or confess;
528 $commit =~ s{^tree (\S+)$}{tree $tree}m or confess;
529 open C, ">", "../mcommit" or die $!;
530 print C $commit or die $!;
532 $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
535 runcmd @git, qw(update-ref refs/heads/result), $result;
537 runcmd @git, qw(checkout -q -b debug);
538 runcmd @git, qw(commit --allow-empty -q -m M-INDEX);
539 runcmd @git, qw(add .);
540 runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
541 printdebug sprintf "merge_series done debug=%s\n",
542 git_rev_parse 'HEAD';
544 printdebug "merge_series returns $result\n";
548 # classify returns an info hash like this
550 # Hdr => # commit headers, including 1 final newline
551 # Msg => # commit message (so one newline is dropped)
553 # Type => (see below)
555 # Ix => $index # ie 0, 1, 2, ...
557 # Differs => return value from get_differs
559 # IsDggitImport => 'orig' 'tarball' 'unpatched' 'package' (as from dgit)
561 # NewMsg => # commit message, but with any [dgit import ...] edited
562 # # to say "[was: ...]"
572 # has additional entres in classification result
573 # Overwritten = [ subset of Parents ]
574 # Contributor = $the_remaining_Parent
576 # DgitImportUnpatched
577 # has additional entry in classification result
578 # OrigParents = [ subset of Parents ]
581 # has additional entry in classification result
582 # OrigParents = [ subset of Parents ] # singleton list
589 # has additional entry in classification result
592 sub parsecommit ($;$) {
593 my ($objid, $p_ref) = @_;
594 # => hash with CommitId Hdr Msg Tree Parents
595 # Parents entries have only Ix CommitId
596 # $p_ref, if provided, must be [] and is used as a base for Parents
601 my ($h,$m) = get_commit $objid;
603 my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
604 my (@ph) = $h =~ m/^parent (\w+)$/mg;
614 foreach my $ph (@ph) {
616 Ix => scalar @$p_ref,
628 my $r = parsecommit($objid, \@p);
632 $p->{Differs} = (get_differs $p->{CommitId}, $t),
635 printdebug "classify $objid \$t=$t \@p",
636 (map { sprintf " %s/%#x", $_->{CommitId}, $_->{Differs} } @p),
640 my ($type, @rest) = @_;
641 $r = { %$r, Type => $type, @rest };
643 printdebug " = $type ".(dd $r)."\n";
649 $r = { %$r, Type => qw(Unknown), Why => $why };
650 printdebug " ** Unknown\n";
654 if (grep { $_ eq $objid } @opt_anchors) {
655 return $classify->('TreatAsAnchor');
658 my @identical = grep { !$_->{Differs} } @p;
659 my ($stype, $series) = git_cat_file "$t:debian/patches/series";
660 my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
662 if ($r->{Msg} =~ m{^\[git-debrebase anchor.*\]$}m) {
663 # multi-orig upstreams are represented with an anchor merge
664 # from a single upstream commit which combines the orig tarballs
666 # Every anchor tagged this way must be a merge.
667 # We are relying on the
668 # [git-debrebase anchor: ...]
669 # commit message annotation in "declare" anchor merges (which
670 # do not have any upstream changes), to distinguish those
671 # anchor merges from ordinary pseudomerges (which we might
672 # just try to strip).
674 # However, the user is going to be doing git-rebase a lot. We
675 # really don't want them to rewrite an anchor commit.
676 # git-rebase trips up on merges, so that is a useful safety
679 # BreakwaterStart commits are also anchors in the terminology
680 # of git-debrebase(5), but they are untagged (and always
681 # manually generated).
683 # We cannot not tolerate any tagged linear commit (ie,
684 # BreakwaterStart commits tagged `[anchor:') because such a
685 # thing could result from an erroneous linearising raw git
686 # rebase of a merge anchor. That would represent a corruption
687 # of the branch. and we want to detect and reject the results
688 # of such corruption before it makes it out anywhere. If we
689 # reject it here then we avoid making the pseudomerge which
690 # would be needed to push it.
692 my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); };
693 @p == 2 or return $badanchor->("has other than two parents");
694 $haspatches and return $badanchor->("contains debian/patches");
696 # How to decide about l/r ordering of anchors ? git
697 # --topo-order prefers to expand 2nd parent first. There's
698 # already an easy rune to look for debian/ history anyway (git log
699 # debian/) so debian breakwater branch should be 1st parent; that
700 # way also there's also an easy rune to look for the upstream
701 # patches (--topo-order).
703 # Also this makes --first-parent be slightly more likely to
704 # be useful - it makes it provide a linearised breakwater history.
706 # Of course one can say somthing like
707 # gitk -- ':/' ':!/debian'
708 # to get _just_ the commits touching upstream files, and by
709 # the TREESAME logic in git-rev-list this will leave the
710 # breakwater into upstream at the first anchor. But that
711 # doesn't report debian/ changes at all.
713 # Other observations about gitk: by default, gitk seems to
714 # produce output in a different order to git-rev-list. I
715 # can't seem to find this documented anywhere. gitk
716 # --date-order DTRT. But, gitk always seems to put the
717 # parents from left to right, in order, so it's easy to see
718 # which way round a pseudomerge is.
720 $p[0]{IsOrigin} and $badanchor->("is an origin commit");
721 $p[1]{Differs} & ~DS_DEB and
722 $badanchor->("upstream files differ from left parent");
723 $p[0]{Differs} & ~D_UPS and
724 $badanchor->("debian/ differs from right parent");
726 return $classify->(qw(Anchor),
727 OrigParents => [ $p[1] ]);
731 my $d = $r->{Parents}[0]{Differs};
732 if ($d == D_PAT_ADD) {
733 return $classify->(qw(AddPatches));
734 } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
735 return $unknown->("edits debian/patches");
736 } elsif ($d & DS_DEB and !($d & ~DS_DEB)) {
737 my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian";
739 if ($d == D_DEB_CLOG) {
740 return $classify->(qw(Changelog));
742 return $classify->(qw(Packaging));
744 } elsif ($ty eq 'missing') {
745 return $classify->(qw(BreakwaterStart));
747 return $unknown->("parent's debian is not a directory");
749 } elsif ($d == D_UPS) {
750 return $classify->(qw(Upstream));
751 } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) {
752 return $classify->(qw(Mixed));
754 return $unknown->("no changes");
756 confess "internal error $objid ?";
760 return $unknown->("origin commit");
763 if (@p == 2 && @identical == 1) {
764 my @overwritten = grep { $_->{Differs} } @p;
765 confess "internal error $objid ?" unless @overwritten==1;
766 return $classify->(qw(Pseudomerge),
767 Overwritten => [ $overwritten[0] ],
768 Contributor => $identical[0]);
770 if (@p == 2 && @identical == 2) {
772 my ($ph,$pm) = get_commit $_[0]{CommitId};
773 $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
777 my $order = $get_t->($bytime[0]) <=> $get_t->($bytime[1]);
778 if ($order > 0) { # newer first
779 } elsif ($order < 0) {
780 @bytime = reverse @bytime;
782 # same age, default to order made by -s ours
783 # that is, commit was made by someone who preferred L
785 return $classify->(qw(Pseudomerge),
786 SubType => qw(Ambiguous),
787 Contributor => $bytime[0],
788 Overwritten => [ $bytime[1] ]);
791 my ($p_h, $p_m) = get_commit $p->{CommitId};
792 $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
793 ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
795 my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
797 if (!(grep { !$_->{IsOrigin} } @p) and
798 (@orig_ps >= @p - 1) and
799 $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
801 return $classify->(qw(DgitImportUnpatched),
802 OrigParents => \@orig_ps);
806 $r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) {
807 # xxx ^ metadata tag needs adding to (5)
808 return $classify->("MergedBreakwaters");
810 if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) {
811 return $unknown->("unknown kind of merge from $1");
814 return $unknown->("octopus merge");
817 if (!$ENV{GIT_DEBREBASE_EXPERIMENTAL_MERGE}) {
818 return $unknown->("general two-parent merge");
821 return $classify->("VanillaMerge");
824 sub keycommits ($;$$$$$);
826 sub mergedbreakwaters_anchor ($) {
829 foreach my $p (@{ $cl->{Parents} }) {
830 my ($panchor, $pbw) = keycommits $p->{CommitId},
831 undef,undef,undef,undef, 1;
832 $best_anchor = $panchor
833 if !defined $best_anchor
834 or is_fast_fwd $best_anchor, $panchor;
839 sub keycommits ($;$$$$$) {
840 my ($head, $furniture, $unclean, $trouble, $fatal, $claimed_bw) = @_;
841 # => ($anchor, $breakwater)
843 # $unclean->("unclean-$tagsfx", $msg, $cl)
844 # $furniture->("unclean-$tagsfx", $msg, $cl)
845 # $dgitimport->("unclean-$tagsfx", $msg, $cl))
846 # is callled for each situation or commit that
847 # wouldn't be found in a laundered branch
848 # $furniture is for furniture commits such as might be found on an
849 # interchange branch (pseudomerge, d/patches, changelog)
850 # $trouble is for things whnich prevent the return of
851 # anchor and breakwater information; if that is ignored,
852 # then keycommits returns (undef, undef) instead.
853 # $fatal is for unprocessable commits, and should normally cause
854 # a failure. If ignored, agaion, (undef, undef) is returned.
856 # If $claimed_bw, this is supposed to be a breakwater commit.
858 # If a callback is undef, fail is called instead.
859 # If a callback is defined but false, the situation is ignored.
861 # no warnings qw(exiting); last;
862 # if the answer is no longer wanted.
864 my ($anchor, $breakwater);
865 $breakwater = $head if $claimed_bw;
869 $fatal //= sub { fail $_[1]; };
871 my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
872 my $why = $mainwhy.$xwhy;
873 my $m = "branch needs laundering (run git-debrebase): $why";
874 fail $m unless defined $cb;
876 $cb->("unclean-$tagsfx", $why, $cl, $mainwhy);
878 my $found_anchor = sub {
880 $breakwater //= $clogonly;
881 $breakwater //= $head;
882 no warnings qw(exiting);
886 $cl = classify $head;
887 my $ty = $cl->{Type};
888 if ($ty eq 'Packaging') {
889 $breakwater //= $clogonly;
890 $breakwater //= $head;
891 } elsif ($ty eq 'Changelog') {
892 # this is going to count as the tip of the breakwater
893 # only if it has no upstream stuff before it
895 } elsif ($ty eq 'Anchor' or
896 $ty eq 'TreatAsAnchor' or
897 $ty eq 'BreakwaterStart') {
898 $found_anchor->($head);
899 } elsif ($ty eq 'Upstream') {
900 $x->($unclean, 'ordering',
901 "packaging change ($breakwater) follows upstream change"," (eg $head)")
902 if defined $breakwater;
905 } elsif ($ty eq 'Mixed') {
906 $x->($unclean, 'mixed',
907 "found mixed upstream/packaging commit"," ($head)");
910 } elsif ($ty eq 'Pseudomerge' or
911 $ty eq 'AddPatches') {
913 $x->($furniture, (lc $ty),
914 "found interchange bureaucracy commit ($ty)"," ($head)");
915 } elsif ($ty eq 'DgitImportUnpatched') {
917 $x->($trouble, 'dgitimport',
918 "found dgit dsc import"," ($head)");
919 return (undef,undef);
921 $x->($fatal, 'unprocessable',
922 "found bare dgit dsc import with no prior history",
924 return (undef,undef);
926 } elsif ($ty eq 'VanillaMerge') {
927 $x->($trouble, 'vanillamerge',
928 "found vanilla merge"," ($head)");
929 return (undef,undef);
930 } elsif ($ty eq 'MergedBreakwaters') {
931 $found_anchor->(mergedbreakwaters_anchor $cl);
933 $x->($fatal, 'unprocessable',
934 "found unprocessable commit, cannot cope: $cl->{Why}",
936 return (undef,undef);
938 $head = $cl->{Parents}[0]{CommitId};
940 return ($anchor, $breakwater);
946 $nogenerate,$report, $report_lprefix) = @_;
947 # => ($tip, $breakwater_tip, $last_anchor)
948 # (or nothing, if $nogenerate)
950 printdebug "*** WALK $input ".($nogenerate//0)." ".($report//'-')."\n";
951 $report_lprefix //= '';
953 # go through commits backwards
954 # we generate two lists of commits to apply:
955 # breakwater branch and upstream patches
956 my (@brw_cl, @upp_cl, @processed);
963 my ($prose, $info) = @_;
967 $ms .= "\n\n[git-debrebase$info: $prose]\n";
970 my $rewrite_from_here = sub {
972 my $sp_cl = { SpecialMethod => 'StartRewrite' };
974 push @processed, $sp_cl;
979 my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; };
982 return unless $report;
983 print $report $prdelim, $report_lprefix, @_;
987 my $bomb = sub { # usage: return $bomb->();
988 print $report " Unprocessable" if $report;
989 print $report " ($cl->{Why})" if $report && defined $cl->{Why};
992 return (undef,undef);
994 fail "found unprocessable commit, cannot cope".
995 (defined $cl->{Why} ? "; $cl->{Why}:": ':').
996 " (commit $cur) (d.".
997 (join ' ', map { sprintf "%#x", $_->{Differs} }
998 @{ $cl->{Parents} }).
1005 my $build_start = sub {
1006 my ($msg, $parent) = @_;
1009 no warnings qw(exiting); last;
1013 fail "something useful about failed merge attempt @_ xxx".Dumper($cl);
1019 $cl = classify $cur;
1020 my $ty = $cl->{Type};
1021 my $st = $cl->{SubType};
1022 $prline->("$cl->{CommitId} $cl->{Type}");
1023 $found{$ty. ( defined($st) ? "-$st" : '' )}++;
1024 push @processed, $cl;
1025 my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
1026 if ($ty eq 'AddPatches') {
1028 $rewrite_from_here->(\@upp_cl);
1030 } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') {
1034 } elsif ($ty eq 'BreakwaterStart') {
1035 $last_anchor = $cur;
1036 $build_start->('FirstPackaging', $cur);
1037 } elsif ($ty eq 'Upstream') {
1041 } elsif ($ty eq 'Mixed') {
1044 my $cls = { %$cl, $xmsg->("split mixed commit: $wh part") };
1047 $queue->(\@brw_cl, "debian");
1048 $queue->(\@upp_cl, "upstream");
1049 $rewrite_from_here->(\@brw_cl);
1052 } elsif ($ty eq 'Pseudomerge') {
1053 my $contrib = $cl->{Contributor}{CommitId};
1054 print $report " Contributor=$contrib" if $report;
1055 push @pseudomerges, $cl;
1056 $rewrite_from_here->(\@upp_cl);
1059 } elsif ($ty eq 'Anchor' or $ty eq 'TreatAsAnchor') {
1060 $last_anchor = $cur;
1061 $build_start->("Anchor", $cur);
1062 } elsif ($ty eq 'DgitImportUnpatched') {
1063 my $pm = $pseudomerges[-1];
1065 # To an extent, this is heuristic. Imports don't have
1066 # a useful history of the debian/ branch. We assume
1067 # that the first pseudomerge after an import has a
1068 # useful history of debian/, and ignore the histories
1069 # from later pseudomerges. Often the first pseudomerge
1070 # will be the dgit import of the upload to the actual
1071 # suite intended by the non-dgit NMUer, and later
1072 # pseudomerges may represent in-archive copies.
1073 my $ovwrs = $pm->{Overwritten};
1074 printf $report " PM=%s \@Overwr:%d",
1075 $pm->{CommitId}, (scalar @$ovwrs)
1078 printdebug "*** WALK BOMB DgitImportUnpatched\n";
1081 my $ovwr = $ovwrs->[0]{CommitId};
1082 printf $report " Overwr=%s", $ovwr if $report;
1083 # This import has a tree which is just like a
1084 # breakwater tree, but it has the wrong history. It
1085 # ought to have the previous breakwater (which the
1086 # pseudomerge overwrote) as an ancestor. That will
1087 # make the history of the debian/ files correct. As
1088 # for the upstream version: either it's the same as
1089 # was ovewritten (ie, same as the previous
1090 # breakwater), in which case that history is precisely
1091 # right; or, otherwise, it was a non-gitish upload of a
1092 # new upstream version. We can tell these apart by
1093 # looking at the tree of the supposed upstream.
1096 SpecialMethod => 'DgitImportDebianUpdate',
1097 $xmsg->("convert dgit import: debian changes")
1100 SpecialMethod => 'DgitImportUpstreamUpdate',
1101 $xmsg->("convert dgit import: upstream update",
1104 $prline->(" Import");
1105 $rewrite_from_here->(\@brw_cl);
1106 $upp_limit //= $#upp_cl; # further, deeper, patches discarded
1110 # Everything is from this import. This kind of import
1111 # is already nearly in valid breakwater format, with the
1112 # patches as commits. Unfortunately it contains
1114 printdebug "*** WALK BOMB bare dgit import\n";
1115 $cl->{Why} = "bare dgit dsc import";
1119 } elsif ($ty eq 'VanillaMerge' or $ty eq 'MergedBreakwaters') {
1120 # User may have merged unstitched branch(es). We will
1121 # have now lost what ffq-prev was then (since the later
1122 # pseudomerge may introduce further changes). The effect
1123 # of resolving such a merge is that we may have to go back
1124 # further in history to find a merge base, since the one
1125 # which was reachable via ffq-prev is no longer findable.
1126 # This is suboptimal, but if it all works we'll have done
1128 # xxx we should warn the user in the docs about this
1132 # We expect to find a dominating anchor amongst the
1133 # inputs' anchors. That will be the new anchor.
1135 # More complicated is finding a merge base for the
1136 # breakwaters. We need a merge base that is a breakwater
1137 # commit. The ancestors of breakwater commits are more
1138 # breakwater commits and possibly upstream commits and the
1139 # ancestors of those upstream. Upstreams might have
1140 # arbitrary ancestors. But any upstream commit U is
1141 # either included in both anchors, in which case the
1142 # earlier anchor is a better merge base than any of U's
1143 # ancestors; or U is not included in the older anchor, in
1144 # which case U is not an ancestor of the vanilla merge at
1145 # all. So no upstream commit, nor any ancestor thereof,
1146 # is a best merge base. As for non-breakwater Debian
1147 # commits: these are never ancestors of any breakwater.
1149 # So any best merge base as found by git-merge-base
1150 # is a suitable breakwater anchor. Usually there will
1153 printdebug "*** MERGE\n";
1155 # xxx avoid calling walk without nogenerate when
1156 # we have a MergedBreakwater; instead call keycommits ?
1158 my @bwbcmd = (@git, qw(merge-base));
1159 my @ibcmd = (@git, qw(merge-base --all));
1160 my $might_be_in_bw = 1;
1162 my $ps = $cl->{Parents};
1164 foreach my $p (@$ps) {
1165 $prline->(" VanillaMerge ".$p->{Ix});
1167 my ($ptip, $pbw, $panchor) =
1168 walk $p->{CommitId}, 0, $report,
1169 $report_lprefix.' ';
1170 $p->{Laundered} = $p->{SeriesTip} = $ptip;
1171 $p->{Breakwater} = $p->{SeriesBase} = $pbw;
1172 $p->{Anchor} = $panchor;
1174 $best_anchor = $panchor if
1175 !defined $best_anchor or
1176 is_fast_fwd $best_anchor, $panchor;
1178 printdebug " MERGE BA best=".($best_anchor//'-').
1182 foreach my $p (@$ps) {
1183 $prline->(" VanillaMerge ".$p->{Ix});
1184 if (!is_fast_fwd $p->{Anchor}, $best_anchor) {
1185 $nomerge->('DivergentAnchor');
1186 } elsif ($p->{Anchor} eq $best_anchor) {
1187 print $report " SameAnchor" if $report;
1189 print $report " SupersededAnchor" if $report;
1191 if ($p->{Breakwater} eq $p->{CommitId}) {
1192 # this parent commit was its own breakwater,
1193 # ie it is part of the breakwater
1194 print $report " Breakwater" if $report;
1196 $might_be_in_bw = 0;
1198 push @bwbcmd, $p->{Breakwater};
1199 push @ibcmd, $p->{CommitId};
1202 if ($ok && $might_be_in_bw) {
1203 $prline->(" VanillaMerge MergedBreakwaters");
1204 $last_anchor = $best_anchor;
1205 $build_start->('MergedBreakwaters', $cur);
1208 $nomerge->("alleged merged-breakwater is not a breakwater")
1209 unless $ty eq 'VanillaMerge';
1211 my $bwb = cmdoutput @bwbcmd;
1213 # OK, now we have a breakwater base, but we need the merge
1214 # base for the interchange branch because we need the delta
1217 # This a the best merge base of our inputs which has the
1218 # breakwater merge base as an ancestor.
1221 grep { is_fast_fwd $bwb, $_ }
1226 or $nomerge->("no suitable interchange merge base");
1228 $prline->(" VanillaMerge Base");
1230 my ($btip, $bbw, $banchor) =
1231 walk $ib, 0, $report, $report_lprefix.' ';
1233 my $ibinfo = { SeriesTip => $btip,
1235 Anchor => $banchor };
1237 or $nomerge->("interchange merge-base ($ib)'s".
1238 " breakwater ($bbw)".
1239 " != breakwaters' merge-base ($bwb)");
1240 grep { $_->{Anchor} eq $ibinfo->{Anchor} } @$ps
1241 or $nomerge->("interchange merge-base ($ib)'s".
1242 " anchor ($ibinfo->{SeriesBase})".
1243 " != any merge input's anchor (".
1244 (join ' ', map { $_->{Anchor} } @$ps).
1248 $cl->{MergeInterchangeBaseInfo} = $ibinfo;
1249 $cl->{MergeBestAnchor} = $best_anchor;
1252 SpecialMethod => 'MergeCreateMergedBreakwaters',
1253 $xmsg->('constructed from vanilla merge',
1254 ' merged-breakwater'),
1258 SpecialMethod => 'MergeMergeSeries',
1260 $build_start->('MergeBreakwaters', $cur);
1262 printdebug "*** WALK BOMB unrecognised\n";
1268 printdebug "*** WALK prep done cur=$cur".
1269 " brw $#brw_cl upp $#upp_cl proc $#processed pm $#pseudomerges\n";
1271 return if $nogenerate;
1273 # Now we build it back up again
1279 $#upp_cl = $upp_limit if defined $upp_limit;
1281 my $committer_authline = calculate_committer_authline();
1283 printdebug "WALK REBUILD $build ".(scalar @processed)."\n";
1285 confess "internal error" unless $build eq (pop @processed)->{CommitId};
1288 mkdir $rd or $!==EEXIST or die $!;
1290 runcmd @git, qw(read-tree), $build;
1291 foreach my $cl (qw(Debian), (reverse @brw_cl),
1292 { SpecialMethod => 'RecordBreakwaterTip' },
1293 qw(Upstream), (reverse @upp_cl)) {
1295 $current_method = $cl;
1298 my $method = $cl->{SpecialMethod} // $current_method;
1299 my @parents = ($build);
1300 my $cltree = $cl->{CommitId};
1301 printdebug "WALK BUILD ".($cltree//'undef').
1302 " $method (rewriting=$rewriting)\n";
1303 if ($method eq 'Debian') {
1304 read_tree_debian($cltree);
1305 } elsif ($method eq 'Upstream') {
1306 read_tree_upstream($cltree);
1307 } elsif ($method eq 'StartRewrite') {
1310 } elsif ($method eq 'RecordBreakwaterTip') {
1311 $breakwater = $build;
1313 } elsif ($method eq 'DgitImportDebianUpdate') {
1314 read_tree_debian($cltree);
1315 } elsif ($method eq 'DgitImportUpstreamUpdate') {
1316 confess unless $rewriting;
1317 my $differs = (get_differs $build, $cltree);
1318 next unless $differs & D_UPS;
1319 read_tree_upstream($cltree);
1320 push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
1321 } elsif ($method eq 'MergeCreateMergedBreakwaters') {
1322 print "Found a general merge, will try to tidy it up.\n";
1324 read_tree_upstream($cl->{MergeBestAnchor});
1325 read_tree_upstream($cl->{MergeBestAnchor});
1326 read_tree_debian($cltree);
1327 @parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
1328 } elsif ($method eq 'MergeMergeSeries') {
1329 print "Running merge resolution for $cl->{CommitId}...\n";
1330 $build = merge_series
1332 $cl->{MergeInterchangeBaseInfo},
1333 @{ $cl->{Parents} };
1334 $last_anchor = $cl->{MergeBestAnchor};
1335 my $check_differs = get_differs $build, $cl->{CommitId};
1336 # Breakwater changes which were in each side of the
1337 # merge should be in MergeCreateMergedBreakwaters
1338 # output. Upstream changes are exactly the result
1339 # of merge_series. So the only difference should
1340 # be potential laundry results.
1342 "merge misresolved: tree is not the same (%s %s d.%#x)",
1343 $cl->{CommitId}, $build, $check_differs)
1344 if $check_differs & ~D_PAT_ADD;
1345 print "Merge resolution successful.\n";
1348 confess "$method ?";
1351 my $procd = (pop @processed) // 'UNDEF';
1352 if ($cl ne $procd) {
1354 printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n";
1357 my $newtree = cmdoutput @git, qw(write-tree);
1358 my $ch = $cl->{Hdr};
1359 $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
1360 $ch =~ s{^parent .*\n}{}mg;
1361 $ch =~ s{(?=^author)}{
1362 join '', map { "parent $_\n" } @parents
1363 }me or confess "$ch ?";
1365 $ch =~ s{^committer .*$}{$committer_authline}m
1368 my $cf = "$rd/m$rewriting";
1369 open CD, ">", $cf or die $!;
1370 print CD $ch, "\n", $cl->{Msg} or die $!;
1372 my @cmd = (@git, qw(hash-object));
1373 push @cmd, qw(-w) if $rewriting;
1374 push @cmd, qw(-t commit), $cf;
1375 my $newcommit = cmdoutput @cmd;
1376 confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId};
1377 $build = $newcommit;
1378 if (grep { $method eq $_ } qw(DgitImportUpstreamUpdate)) {
1379 $last_anchor = $cur;
1384 my $final_check = get_differs $build, $input;
1385 die sprintf "internal error %#x %s %s", $final_check, $input, $build
1386 if $final_check & ~D_PAT_ADD;
1388 my @r = ($build, $breakwater, $last_anchor);
1389 printdebug "*** WALK RETURN @r\n";
1394 git_check_unmodified();
1395 return git_rev_parse qw(HEAD);
1398 sub update_head ($$$) {
1399 my ($old, $new, $mrest) = @_;
1400 push @deferred_updates, "update HEAD $new $old";
1401 run_deferred_updates $mrest;
1404 sub update_head_checkout ($$$) {
1405 my ($old, $new, $mrest) = @_;
1406 update_head $old, $new, $mrest;
1407 runcmd @git, qw(reset --hard);
1410 sub update_head_postlaunder ($$$) {
1411 my ($old, $tip, $reflogmsg) = @_;
1412 return if $tip eq $old;
1413 print "git-debrebase: laundered (head was $old)\n";
1414 update_head $old, $tip, $reflogmsg;
1415 # no tree changes except debian/patches
1416 runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
1419 sub currently_rebasing() {
1420 foreach (qw(rebase-merge rebase-apply)) {
1421 return 1 if stat_exists "$maindir_gitdir/$_";
1426 sub bail_if_rebasing() {
1427 fail "you are in the middle of a git-rebase already"
1428 if currently_rebasing();
1431 sub do_launder_head ($) {
1432 my ($reflogmsg) = @_;
1433 my $old = get_head();
1435 my ($tip,$breakwater) = walk $old;
1437 update_head_postlaunder $old, $tip, $reflogmsg;
1438 return ($tip,$breakwater);
1441 sub cmd_launder_v0 () {
1442 badusage "no arguments to launder-v0 allowed" if @ARGV;
1443 my $old = get_head();
1444 my ($tip,$breakwater,$last_anchor) = walk $old;
1445 update_head_postlaunder $old, $tip, 'launder';
1446 printf "# breakwater tip\n%s\n", $breakwater;
1447 printf "# working tip\n%s\n", $tip;
1448 printf "# last anchor\n%s\n", $last_anchor;
1451 sub defaultcmd_rebase () {
1452 push @ARGV, @{ $opt_defaultcmd_interactive // [] };
1453 my ($tip,$breakwater) = do_launder_head 'launder for rebase';
1454 runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
1457 sub cmd_analyse () {
1458 badusage "analyse does not support any options"
1459 if @ARGV and $ARGV[0] =~ m/^-/;
1460 badusage "too many arguments to analyse" if @ARGV>1;
1463 $old = git_rev_parse $old;
1465 $old = git_rev_parse 'HEAD';
1467 my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
1468 STDOUT->error and die $!;
1471 sub ffq_prev_branchinfo () {
1472 my $current = git_get_symref();
1473 return gdr_ffq_prev_branchinfo($current);
1476 sub ffq_check ($;$$) {
1477 # calls $ff and/or $notff zero or more times
1478 # then returns either (status,message) where status is
1483 # or (undef,undef, $ffq_prev,$gdrlast)
1484 # $ff and $notff are called like this:
1485 # $ff->("message for stdout\n");
1486 # $notff->('snag-name', $message);
1487 # normally $currentval should be HEAD
1488 my ($currentval, $ff, $notff) =@_;
1490 $ff //= sub { print $_[0] or die $!; };
1493 my ($status, $message, $current, $ffq_prev, $gdrlast)
1494 = ffq_prev_branchinfo();
1495 return ($status, $message) unless $status eq 'branch';
1497 my $exists = git_get_ref $ffq_prev;
1498 return ('exists',"$ffq_prev already exists") if $exists;
1500 return ('not-branch', 'HEAD symref is not to refs/heads/')
1501 unless $current =~ m{^refs/heads/};
1504 my @check_specs = split /\;/, (cfg "branch.$branch.ffq-ffrefs",1) // '*';
1507 printdebug "ffq check_specs @check_specs\n";
1510 my ($lrref, $desc) = @_;
1511 printdebug "ffq might check $lrref ($desc)\n";
1513 for my $chk (@check_specs) {
1515 $invert = $glob =~ s{^[!^]}{};
1516 last if fnmatch $glob, $lrref;
1519 my $lrval = git_get_ref $lrref;
1520 return unless length $lrval;
1522 if (is_fast_fwd $lrval, $currentval) {
1523 $ff->("OK, you are ahead of $lrref\n");
1524 $checked{$lrref} = 1;
1525 } elsif (is_fast_fwd $currentval, $lrval) {
1526 $checked{$lrref} = -1;
1527 $notff->('behind', "you are behind $lrref, divergence risk");
1529 $checked{$lrref} = -1;
1530 $notff->('diverged', "you have diverged from $lrref");
1534 my $merge = cfg "branch.$branch.merge",1;
1535 if (defined $merge and $merge =~ m{^refs/heads/}) {
1537 printdebug "ffq merge $rhs\n";
1538 my $check_remote = sub {
1539 my ($remote, $desc) = @_;
1540 printdebug "ffq check_remote ".($remote//'undef')." $desc\n";
1541 return unless defined $remote;
1542 $check->("refs/remotes/$remote/$rhs", $desc);
1544 $check_remote->((scalar cfg "branch.$branch.remote",1),
1545 'remote fetch/merge branch');
1546 $check_remote->((scalar cfg "branch.$branch.pushRemote",1) //
1547 (scalar cfg "branch.$branch.pushDefault",1),
1548 'remote push branch');
1550 if ($branch =~ m{^dgit/}) {
1551 $check->("refs/remotes/dgit/$branch", 'remote dgit branch');
1552 } elsif ($branch =~ m{^master$}) {
1553 $check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid');
1555 return (undef, undef, $ffq_prev, $gdrlast);
1558 sub record_ffq_prev_deferred () {
1559 # => ('status', "message")
1561 # deferred message is undef
1566 # if not ff from some branch we should be ff from, is an snag
1567 # if "deferred", will have added something about that to
1568 # @deferred_update_messages, and also maybe printed (already)
1569 # some messages about ff checks
1571 my $currentval = get_head();
1573 my ($status,$message, $ffq_prev,$gdrlast) = ffq_check $currentval;
1574 return ($status,$message) if defined $status;
1578 push @deferred_updates, "update $ffq_prev $currentval $git_null_obj";
1579 push @deferred_updates, "delete $gdrlast";
1580 push @deferred_update_messages, "Recorded previous head for preservation";
1581 return ('deferred', undef);
1584 sub record_ffq_auto () {
1585 my ($status, $message) = record_ffq_prev_deferred();
1586 if ($status eq 'deferred' || $status eq 'exists') {
1588 snag $status, "could not record ffq-prev: $message";
1593 sub ffq_prev_info () {
1595 # => ($ffq_prev, $gdrlast, $ffq_prev_commitish)
1596 my ($status, $message, $current, $ffq_prev, $gdrlast)
1597 = ffq_prev_branchinfo();
1598 if ($status ne 'branch') {
1599 snag $status, "could not check ffq-prev: $message";
1602 my $ffq_prev_commitish = $ffq_prev && git_get_ref $ffq_prev;
1603 return ($ffq_prev, $gdrlast, $ffq_prev_commitish);
1606 sub stitch ($$$$$) {
1607 my ($old_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose) = @_;
1609 push @deferred_updates, "delete $ffq_prev $ffq_prev_commitish";
1611 if (is_fast_fwd $old_head, $ffq_prev_commitish) {
1612 my $differs = get_differs $old_head, $ffq_prev_commitish;
1613 unless ($differs & ~D_PAT_ADD) {
1614 # ffq-prev is ahead of us, and the only tree changes it has
1615 # are possibly addition of things in debian/patches/.
1616 # Just wind forwards rather than making a pointless pseudomerge.
1617 push @deferred_updates,
1618 "update $gdrlast $ffq_prev_commitish $git_null_obj";
1619 update_head_checkout $old_head, $ffq_prev_commitish,
1620 "stitch (fast forward)";
1625 # We make pseudomerges with L as the contributing parent.
1626 # This makes git rev-list --first-parent work properly.
1627 my $new_head = make_commit [ $old_head, $ffq_prev ], [
1628 'Declare fast forward / record previous work',
1629 "[git-debrebase pseudomerge: $prose]",
1631 push @deferred_updates, "update $gdrlast $new_head $git_null_obj";
1632 update_head $old_head, $new_head, "stitch: $prose";
1635 sub do_stitch ($;$) {
1636 my ($prose, $unclean) = @_;
1638 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
1639 if (!$ffq_prev_commitish) {
1640 fail "No ffq-prev to stitch." unless $opt_noop_ok;
1643 my $dangling_head = get_head();
1645 keycommits $dangling_head, $unclean,$unclean,$unclean;
1648 stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
1651 sub upstream_commitish_search ($$) {
1652 my ($upstream_version, $tried) = @_;
1653 # todo: at some point maybe use git-deborig to do this
1654 foreach my $tagpfx ('', 'v', 'upstream/') {
1655 my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
1656 my $new_upstream = git_get_ref "refs/tags/$tag";
1658 return $new_upstream if length $new_upstream;
1662 sub resolve_upstream_version ($$) {
1663 my ($new_upstream, $upstream_version) = @_;
1665 if (!defined $new_upstream) {
1667 $new_upstream = upstream_commitish_search $upstream_version, \@tried;
1668 if (!length $new_upstream) {
1669 fail "Could not determine appropriate upstream commitish.\n".
1670 " (Tried these tags: @tried)\n".
1671 " Check version, and specify upstream commitish explicitly.";
1674 $new_upstream = git_rev_parse $new_upstream;
1676 return $new_upstream;
1679 sub cmd_new_upstream () {
1680 # automatically and unconditionally launders before rebasing
1681 # if rebase --abort is used, laundering has still been done
1685 badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
1687 # parse args - low commitment
1688 my $spec_version = shift @ARGV;
1689 my $new_version = (new Dpkg::Version $spec_version, check => 1);
1690 fail "bad version number \`$spec_version'" unless defined $new_version;
1691 if ($new_version->is_native()) {
1692 $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
1695 my $new_upstream = shift @ARGV;
1696 my $new_upstream_version = upstreamversion $new_version;
1698 resolve_upstream_version $new_upstream, $new_upstream_version;
1703 my ($n, @x) = @_; # may be ''
1704 my $pc = $pieces{$n} //= {
1706 Desc => ($n ? "upstream piece \`$n'" : "upstream (main piece"),
1708 while (my $k = shift @x) { $pc->{$k} = shift @x; }
1713 my $newpiece = sub {
1714 my ($n, @x) = @_; # may be ''
1715 my $pc = $piece->($n, @x, NewIx => (scalar @newpieces));
1716 push @newpieces, $pc;
1721 New => $new_upstream,
1723 while (@ARGV && $ARGV[0] !~ m{^-}) {
1724 my $n = shift @ARGV;
1726 badusage "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
1727 unless @ARGV && $ARGV[0] !~ m{^-};
1729 my $c = git_rev_parse shift @ARGV;
1730 die unless $n =~ m/^$extra_orig_namepart_re$/;
1731 $newpiece->($n, New => $c);
1734 # now we need to investigate the branch this generates the
1735 # laundered version but we don't switch to it yet
1736 my $old_head = get_head();
1737 my ($old_laundered_tip,$old_bw,$old_anchor) = walk $old_head;
1739 my $old_bw_cl = classify $old_bw;
1740 my $old_anchor_cl = classify $old_anchor;
1742 if (!$old_anchor_cl->{OrigParents}) {
1743 snag 'anchor-treated',
1744 'old anchor is recognised due to --anchor, cannot check upstream';
1746 $old_upstream = parsecommit
1747 $old_anchor_cl->{OrigParents}[0]{CommitId};
1748 $piece->('', Old => $old_upstream->{CommitId});
1751 if ($old_upstream && $old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
1752 if ($old_upstream->{Msg} =~
1753 m{^\[git-debrebase upstream-combine (\.(?: $extra_orig_namepart_re)+)\:.*\]$}m
1755 my @oldpieces = (split / /, $1);
1756 my $old_n_parents = scalar @{ $old_upstream->{Parents} };
1757 if ($old_n_parents != @oldpieces &&
1758 $old_n_parents != @oldpieces + 1) {
1759 snag 'upstream-confusing', sprintf
1760 "previous upstream combine %s".
1761 " mentions %d pieces (each implying one parent)".
1762 " but has %d parents".
1763 " (one per piece plus maybe a previous combine)",
1764 $old_upstream->{CommitId},
1765 (scalar @oldpieces),
1767 } elsif ($oldpieces[0] ne '.') {
1768 snag 'upstream-confusing', sprintf
1769 "previous upstream combine %s".
1770 " first piece is not \`.'",
1774 foreach my $i (0..$#oldpieces) {
1775 my $n = $oldpieces[$i];
1776 my $hat = 1 + $i + ($old_n_parents - @oldpieces);
1777 $piece->($n, Old => $old_upstream->{CommitId}.'^'.$hat);
1781 snag 'upstream-confusing',
1782 "previous upstream $old_upstream->{CommitId} is from".
1783 " git-debrebase but not an \`upstream-combine' commit";
1787 foreach my $pc (values %pieces) {
1788 if (!$old_upstream) {
1789 # we have complained already
1790 } elsif (!$pc->{Old}) {
1791 snag 'upstream-new-piece',
1792 "introducing upstream piece \`$pc->{Name}'";
1793 } elsif (!$pc->{New}) {
1794 snag 'upstream-rm-piece',
1795 "dropping upstream piece \`$pc->{Name}'";
1796 } elsif (!is_fast_fwd $pc->{Old}, $pc->{New}) {
1797 snag 'upstream-not-ff',
1798 "not fast forward: $pc->{Name} $pc->{Old}..$pc->{New}";
1802 printdebug "%pieces = ", (dd \%pieces), "\n";
1803 printdebug "\@newpieces = ", (dd \@newpieces), "\n";
1811 my @upstream_merge_parents;
1814 push @upstream_merge_parents, $old_upstream->{CommitId};
1817 foreach my $pc (@newpieces) { # always has '' first
1819 read_tree_subdir $pc->{Name}, $pc->{New};
1821 runcmd @git, qw(read-tree), $pc->{New};
1823 push @upstream_merge_parents, $pc->{New};
1826 # index now contains the new upstream
1828 if (@newpieces > 1) {
1829 # need to make the upstream subtree merge commit
1830 $new_upstream = make_commit \@upstream_merge_parents,
1831 [ "Combine upstreams for $new_upstream_version",
1832 ("[git-debrebase upstream-combine . ".
1833 (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]).
1838 # $new_upstream is either the single upstream commit, or the
1839 # combined commit we just made. Either way it will be the
1840 # "upstream" parent of the anchor merge.
1842 read_tree_subdir 'debian', "$old_bw:debian";
1844 # index now contains the anchor merge contents
1845 $new_bw = make_commit [ $old_bw, $new_upstream ],
1846 [ "Update to upstream $new_upstream_version",
1847 "[git-debrebase anchor: new upstream $new_upstream_version, merge]",
1850 my $clogsignoff = cmdoutput qw(git show),
1851 '--pretty=format:%an <%ae> %aD',
1854 # Now we have to add a changelog stanza so the Debian version
1856 die if unlink "debian";
1857 die $! unless $!==ENOENT or $!==ENOTEMPTY;
1858 unlink "debian/changelog" or $!==ENOENT or die $!;
1859 mkdir "debian" or die $!;
1860 open CN, ">", "debian/changelog" or die $!;
1861 my $oldclog = git_cat_file ":debian/changelog";
1862 $oldclog =~ m/^($package_re) \(\S+\) / or
1863 fail "cannot parse old changelog to get package name";
1865 print CN <<END, $oldclog or die $!;
1866 $p ($new_version) UNRELEASED; urgency=medium
1868 * Update to new upstream version $new_upstream_version.
1874 runcmd @git, qw(update-index --add --replace), 'debian/changelog';
1876 # Now we have the final new breakwater branch in the index
1877 $new_bw = make_commit [ $new_bw ],
1878 [ "Update changelog for new upstream $new_upstream_version",
1879 "[git-debrebase: new upstream $new_upstream_version, changelog]",
1883 # we have constructed the new breakwater. we now need to commit to
1884 # the laundering output, because git-rebase can't easily be made
1885 # to make a replay list which is based on some other branch
1887 update_head_postlaunder $old_head, $old_laundered_tip,
1888 'launder for new upstream';
1890 my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);
1891 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
1892 "debrebase new-upstream $new_version: rebase";
1894 # now it's for the user to sort out
1897 sub cmd_record_ffq_prev () {
1898 badusage "no arguments allowed" if @ARGV;
1899 my ($status, $msg) = record_ffq_prev_deferred();
1900 if ($status eq 'exists' && $opt_noop_ok) {
1901 print "Previous head already recorded\n" or die $!;
1902 } elsif ($status eq 'deferred') {
1903 run_deferred_updates 'record-ffq-prev';
1905 fail "Could not preserve: $msg";
1910 badusage "no arguments allowed" if @ARGV;
1911 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
1912 print "$bw\n" or die $!;
1915 sub cmd_breakwater () {
1916 badusage "no arguments allowed" if @ARGV;
1917 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
1918 print "$bw\n" or die $!;
1922 badusage "no arguments allowed" if @ARGV;
1924 # todo: gdr status should print divergence info
1925 # todo: gdr status should print upstream component(s) info
1926 # todo: gdr should leave/maintain some refs with this kind of info ?
1928 my $oldest = { Badness => 0 };
1931 my ($badness, $ourmsg, $snagname, $dummy, $cl, $kcmsg) = @_;
1932 if ($oldest->{Badness} < $badness) {
1933 $oldest = $newest = undef;
1936 Badness => $badness,
1937 CommitId => $cl->{CommitId},
1941 $newest //= $oldest;
1943 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
1944 sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
1945 sub { $note->(2, 'branch is unlaundered', @_); },
1946 sub { $note->(3, 'branch needs laundering', @_); },
1947 sub { $note->(4, 'branch not in git-debrebase form', @_); };
1949 my $prcommitinfo = sub {
1951 flush STDOUT or die $!;
1952 runcmd @git, qw(--no-pager log -n1),
1953 '--pretty=format: %h %s%n',
1957 print "current branch contents, in git-debrebase terms:\n";
1958 if (!$oldest->{Badness}) {
1959 print " branch is laundered\n";
1961 print " $oldest->{OurMsg}\n";
1963 foreach my $info ($oldest, $newest) {
1964 my $cid = $info->{CommitId};
1965 next if $cid eq $printed;
1967 print " $info->{KcMsg}\n";
1968 $prcommitinfo->($cid);
1973 my ($cid, $what) = @_;
1974 if (!defined $cid) {
1975 print " $what is not well-defined\n";
1978 $prcommitinfo->($cid);
1981 print "key git-debrebase commits:\n";
1982 $prab->($anchor, 'anchor');
1983 $prab->($bw, 'breakwater');
1985 my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
1986 ffq_prev_branchinfo();
1988 print "branch and ref status, in git-debrebase terms:\n";
1990 print " $ffq_msg\n";
1992 $ffq_prev = git_get_ref $ffq_prev;
1993 $gdrlast = git_get_ref $gdrlast;
1995 print " unstitched; previous tip was:\n";
1996 $prcommitinfo->($ffq_prev);
1997 } elsif (!$gdrlast) {
1998 print " stitched? (no record of git-debrebase work)\n";
1999 } elsif (is_fast_fwd $gdrlast, 'HEAD') {
2000 print " stitched\n";
2002 print " not git-debrebase (diverged since last stitch)\n"
2005 print "you are currently rebasing\n" if currently_rebasing();
2009 my $prose = 'stitch';
2010 getoptions("stitch",
2011 'prose=s', \$prose);
2012 badusage "no arguments allowed" if @ARGV;
2013 do_stitch $prose, 0;
2015 sub cmd_prepush () { cmd_stitch(); }
2018 badusage "no arguments allowed" if @ARGV;
2019 do_launder_head 'launder for git-debrebase quick';
2023 sub cmd_conclude () {
2024 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
2025 if (!$ffq_prev_commitish) {
2026 fail "No ongoing git-debrebase session." unless $opt_noop_ok;
2029 my $dangling_head = get_head();
2031 badusage "no arguments allowed" if @ARGV;
2032 do_launder_head 'launder for git-debrebase quick';
2037 if (currently_rebasing()) {
2038 runcmd @git, qw(rebase --abort);
2040 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
2041 if (!$ffq_prev_commitish) {
2042 fail "No ongoing git-debrebase session." unless $opt_noop_ok;
2045 my $scrapping_head = get_head();
2046 badusage "no arguments allowed" if @ARGV;
2047 push @deferred_updates,
2048 "update $gdrlast $ffq_prev_commitish $git_null_obj",
2049 "update $ffq_prev $git_null_obj $ffq_prev_commitish";
2051 update_head_checkout $scrapping_head, $ffq_prev_commitish, "scrap";
2054 sub make_patches_staged ($) {
2056 # Produces the patches that would result from $head if it were
2058 my ($secret_head, $secret_bw, $last_anchor) = walk $head;
2061 gbp_pq_export 'bw', $secret_bw, $secret_head;
2065 sub make_patches ($) {
2067 keycommits $head, 0, \&snag;
2068 make_patches_staged $head;
2071 my $ptree = cmdoutput @git, qw(write-tree --prefix=debian/patches/);
2072 runcmd @git, qw(read-tree), $head;
2073 read_tree_subdir 'debian/patches', $ptree;
2074 $out = make_commit [$head], [
2075 'Commit patch queue (exported by git-debrebase)',
2076 '[git-debrebase: export and commit patches]',
2082 sub cmd_make_patches () {
2083 my $opt_quiet_would_amend;
2084 getoptions("make-patches",
2085 'quiet-would-amend!', \$opt_quiet_would_amend);
2086 badusage "no arguments allowed" if @ARGV;
2088 my $old_head = get_head();
2089 my $new = make_patches $old_head;
2090 my $d = get_differs $old_head, $new;
2092 fail "No (more) patches to export." unless $opt_noop_ok;
2094 } elsif ($d == D_PAT_ADD) {
2096 update_head_checkout $old_head, $new, 'make-patches';
2098 print STDERR failmsg
2099 "Patch export produced patch amendments".
2100 " (abandoned output commit $new).".
2101 " Try laundering first."
2102 unless $opt_quiet_would_amend;
2107 sub cmd_convert_from_gbp () {
2108 badusage "want only 1 optional argument, the upstream git commitish"
2111 my $clogp = parsechangelog();
2112 my $version = $clogp->{'Version'}
2113 // die "missing Version from changelog";
2115 my ($upstream_spec) = @ARGV;
2117 my $upstream_version = upstreamversion $version;
2119 resolve_upstream_version($upstream_spec, $upstream_version);
2121 my $old_head = get_head();
2123 my $upsdiff = get_differs $upstream, $old_head;
2124 if ($upsdiff & D_UPS) {
2125 runcmd @git, qw(--no-pager diff --stat),
2126 $upstream, $old_head,
2127 qw( -- :!/debian :/);
2129 upstream ($upstream_spec) and HEAD are not
2130 identical in upstream files. See diffstat above, or run
2131 git diff $upstream_spec HEAD -- :!/debian :/
2135 if (!is_fast_fwd $upstream, $old_head) {
2136 snag 'upstream-not-ancestor',
2137 "upstream ($upstream) is not an ancestor of HEAD";
2139 my $wrong = cmdoutput
2140 (@git, qw(rev-list --ancestry-path), "$upstream..HEAD",
2141 qw(-- :/ :!/debian));
2142 if (length $wrong) {
2143 snag 'unexpected-upstream-changes',
2144 "history between upstream ($upstream) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?";
2145 print STDERR "list expected changes with: git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'\n";
2149 if ((git_cat_file "$upstream:debian")[0] ne 'missing') {
2150 snag 'upstream-has-debian',
2151 "upstream ($upstream) contains debian/ directory";
2154 my $previous_dgit_view = eval {
2155 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 -n2);
2157 parsechangelog_loop \@clogcmd, 'debian/changelog', sub {
2158 my ($stz, $desc) = @_;
2159 no warnings qw(exiting);
2160 printdebug 'CHANGELOG ', Dumper($desc, $stz);
2161 next unless $stz->{Date};
2162 next unless $stz->{Distribution} ne 'UNRELEASED';
2163 $lvsn = $stz->{Version};
2164 $suite = $stz->{Distribution};
2167 die "neither of the first two changelog entries are released\n"
2168 unless defined $lvsn;
2169 print "last finished-looking changelog entry: ($lvsn) $suite\n";
2170 my $mtag_pat = debiantag_maintview $lvsn, '*';
2171 my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
2173 die "could not find suitable maintainer view tag $mtag_pat\n"
2174 unless $mtag_pat =~ m{/};
2175 is_fast_fwd $mtag, 'HEAD' or
2176 die "HEAD is not FF from maintainer tag $mtag!";
2177 my $dtag = "archive/$mtag";
2178 is_fast_fwd $mtag, $dtag or
2179 die "dgit view tag $dtag is not FF from maintainer tag $mtag";
2180 print "will stitch in dgit view, $dtag\n";
2181 git_rev_parse $dtag;
2183 if (!$previous_dgit_view) {
2186 print STDERR "cannot stitch in dgit view: $@\n";
2189 snags_maybe_bail_early();
2195 runcmd @git, qw(checkout -q -b gdr-internal), $old_head;
2196 # make a branch out of the patch queue - we'll want this in a mo
2197 runcmd qw(gbp pq import);
2198 # strip the patches out
2199 runcmd @git, qw(checkout -q gdr-internal~0);
2200 rm_subdir_cached 'debian/patches';
2201 $work = make_commit ['HEAD'], [
2202 'git-debrebase convert-from-gbp: drop patches from tree',
2203 'Delete debian/patches, as part of converting to git-debrebase format.',
2204 '[git-debrebase convert-from-gbp: drop patches from tree]'
2206 # make the anchor merge
2207 # the tree is already exactly right
2208 $work = make_commit [$work, $upstream], [
2209 'git-debrebase import: declare upstream',
2210 'First breakwater merge.',
2211 '[git-debrebase anchor: declare upstream]'
2214 # rebase the patch queue onto the new breakwater
2215 runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal);
2216 runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal);
2217 $work = git_rev_parse 'HEAD';
2219 if ($previous_dgit_view) {
2220 $work = make_commit [$work, $previous_dgit_view], [
2221 'git-debrebase import: declare ff from dgit archive view',
2222 '[git-debrebase pseudomerge: import-from-gbp]',
2229 update_head_checkout $old_head, $work, 'convert-from-gbp';
2232 sub cmd_convert_to_gbp () {
2233 badusage "no arguments allowed" if @ARGV;
2234 my $head = get_head();
2235 my (undef, undef, undef, $ffq, $gdrlast) = ffq_prev_branchinfo();
2236 keycommits $head, 0;
2238 make_patches_staged $head;
2240 $out = make_commit ['HEAD'], [
2241 'Commit patch queue (converted from git-debrebase format)',
2242 '[git-debrebase convert-to-gbp: commit patches]',
2246 push @deferred_updates, "delete $ffq";
2247 push @deferred_updates, "delete $gdrlast";
2250 update_head_checkout $head, $out, "convert to gbp (v0)";
2251 print <<END or die $!;
2252 git-debrebase: converted to git-buildpackage branch format
2253 git-debrebase: WARNING: do not now run "git-debrebase" any more
2254 git-debrebase: WARNING: doing so would drop all upstream patches!
2258 sub cmd_convert_from_dgit_view () {
2259 my $clogp = parsechangelog();
2261 my $bpd = (cfg 'dgit.default.build-products-dir',1) // '..';
2267 getoptions("convert-from-dgit-view",
2268 'diagnose!', \$diagnose,
2269 'build-products-dir:s', \$bpd,
2270 'origs!', \$do_origs,
2272 'always-convert-anyway!', \$always);
2273 fail "takes 1 optional argument, the upstream commitish" if @ARGV>1;
2278 my $spec = shift @ARGV;
2279 my $commit = git_rev_parse "$spec^{commit}";
2280 push @upstreams, { Commit => $commit,
2281 Source => "$ARGV[0], from command line",
2286 my $head = get_head();
2290 my $trouble = sub { $troubles++; };
2291 keycommits $head, sub{}, sub{}, $trouble, $trouble;
2292 printdebug "troubles=$troubles\n";
2295 $us: Branch already seems to be in git-debrebase format!
2296 $us: --always-convert-anyway would do the conversion operation anyway
2297 $us: but is probably a bad idea. Probably, you wanted to do nothing.
2299 fail "Branch already in git-debrebase format." unless $opt_noop_ok;
2304 snags_maybe_bail_early();
2306 my $version = upstreamversion $clogp->{Version};
2307 print STDERR "Considering possible commits corresponding to upstream:\n";
2312 my $ups_tag = upstream_commitish_search $version, \@tried;
2314 my $this = "git tag $tried[-1]";
2315 push @upstreams, { Commit => $ups_tag,
2320 " git tag: no suitable tag found (tried %s)\n",
2325 my $p = $clogp->{'Source'};
2326 # we do a quick check to see if there are plausible origs
2328 if (!opendir BPD, $bpd) {
2329 die "$bpd: opendir: $!" unless $!==ENOENT;
2331 while ($!=0, my $f = readdir BPD) {
2332 next unless is_orig_file_of_p_v $f, $p, $version;
2334 " orig: found what looks like a .orig, %s\n",
2339 die "read $bpd: $!" if $!;
2343 my $tree = cmdoutput
2344 @dgit, qw(--build-products-dir), $bpd,
2345 qw(print-unapplied-treeish);
2348 runcmd @git, qw(reset --quiet), $tree, qw(-- .);
2349 rm_subdir_cached 'debian';
2350 $tree = cmdoutput @git, qw(write-tree);
2351 my $ups_synth = make_commit [], [ <<END, <<END,
2352 Import effective orig tree for upstream version $version
2354 This includes the contents of the .orig(s), minus any debian/ directory.
2356 [git-debrebase import-from-dgit-view upstream-import-convert: $version]
2359 push @upstreams, { Commit => $ups_synth,
2360 Source => "orig(s) imported via dgit",
2365 " orig: no suitable origs found (looked for %s in %s)\n",
2366 "${p}_".(stripeoch $version)."...", $bpd;
2371 my $some_patches = stat_exists 'debian/patches/series';
2373 print STDERR "Evaluating possible commits corresponding to upstream:\n";
2376 foreach my $u (@upstreams) {
2380 runcmd @git, qw(reset --quiet), $u->{Commit}, qw(-- .);
2381 runcmd @git, qw(checkout), $u->{Commit}, qw(-- .);
2382 runcmd @git, qw(clean -xdff);
2383 runcmd @git, qw(checkout), $head, qw(-- debian);
2384 if ($some_patches) {
2385 rm_subdir_cached 'debian/patches';
2386 $work = make_commit [ $work ], [
2387 'git-debrebase convert-from-dgit-view: drop upstream changes from breakwater',
2388 "Drop upstream changes, and delete debian/patches, as part of converting\n".
2389 "to git-debrebase format. Upstream changes will appear as commits.",
2390 '[git-debrebase convert-from-dgit-view: drop patches from tree]'
2393 $work = make_commit [ $work, $u->{Commit} ], [
2394 'git-debrebase convert-from-dgit-view: declare upstream',
2395 '(Re)constructed breakwater merge.',
2396 '[git-debrebase anchor: declare upstream]'
2398 runcmd @git, qw(checkout --quiet -b mk), $work;
2399 if ($some_patches) {
2400 runcmd @git, qw(checkout), $head, qw(-- debian/patches);
2401 runcmd @git, qw(reset --quiet);
2402 my @gbp_cmd = (qw(gbp pq import));
2404 my $gbp_err = "../gbp-pq-err";
2405 @gbp_cmd = shell_cmd "exec >$gbp_err 2>&1", @gbp_cmd;
2407 my $r = system @gbp_cmd;
2410 " %s: couldn't apply patches: gbp pq %s",
2411 $u->{Source}, waitstatusmsg();
2415 my $work = git_rev_parse qw(HEAD);
2416 my $diffout = cmdoutput @git, qw(diff-tree --stat HEAD), $work;
2417 if (length $diffout) {
2419 " $u->{Source}: applying patches gives different tree\n";
2420 print STDERR $diffout if $diagnose;
2424 $u->{Result} = $work;
2432 Could not find or construct a suitable upstream commit.
2433 Rerun adding --diagnose after convert-from-dgit-view, or pass a
2434 upstream commmit explicitly or provide suitable origs.
2438 printf STDERR "Yes, will base new branch on %s\n", $result->{Source};
2440 ffq_check $result->{Result};
2442 update_head_checkout $head, $result->{Result},
2443 'convert-from-dgit-view';
2446 sub cmd_downstream_rebase_launder_v0 () {
2447 badusage "needs 1 argument, the baseline" unless @ARGV==1;
2449 $base = git_rev_parse $base;
2450 my $old_head = get_head();
2451 my $current = $old_head;
2454 if ($current eq $base) {
2455 $topmost_keep //= $current;
2456 print " $current BASE stop\n";
2459 my $cl = classify $current;
2460 print " $current $cl->{Type}";
2462 my $p0 = $cl->{Parents}[0]{CommitId};
2464 if ($cl->{Type} eq 'Pseudomerge') {
2465 print " ^".($cl->{Contributor}{Ix}+1);
2466 $next = $cl->{Contributor}{CommitId};
2467 } elsif ($cl->{Type} eq 'AddPatches' or
2468 $cl->{Type} eq 'Changelog') {
2478 $topmost_keep //= $current;
2480 die "to-be stripped changes not on top of the branch\n"
2485 if ($topmost_keep eq $old_head) {
2486 print "unchanged\n";
2488 print "updating to $topmost_keep\n";
2489 update_head_checkout
2490 $old_head, $topmost_keep,
2491 'downstream-rebase-launder-v0';
2497 "D+" => \$debuglevel,
2498 'noop-ok', => \$opt_noop_ok,
2499 'f=s' => \@snag_force_opts,
2500 'anchor=s' => \@opt_anchors,
2501 '--dgit=s' => \($dgit[0]),
2504 my ($opt,$val) = @_;
2505 badusage "git-debrebase: no cuddling to -i for git-rebase"
2507 die if $opt_defaultcmd_interactive; # should not happen
2508 $opt_defaultcmd_interactive = [ qw(-i) ];
2509 # This access to @ARGV is excessive familiarity with
2510 # Getopt::Long, but there isn't another sensible
2511 # approach. '-i=s{0,}' does not work with bundling.
2512 push @$opt_defaultcmd_interactive, @ARGV;
2515 'help' => sub { print $usage_message or die $!; finish 0; },
2518 initdebug('git-debrebase ');
2519 enabledebug if $debuglevel;
2521 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
2522 chdir $toplevel or die "chdir $toplevel: $!";
2524 $rd = fresh_playground "$playprefix/misc";
2526 @opt_anchors = map { git_rev_parse $_ } @opt_anchors;
2528 if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
2529 defaultcmd_rebase();
2531 my $cmd = shift @ARGV;
2534 $cmdfn = ${*::}{"cmd_$cmdfn"};
2536 $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";