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_merges, @opt_anchors);
54 our ($opt_defaultcmd_interactive);
56 our $us = qw(git-debrebase);
58 our $wrecknoteprefix = 'refs/debrebase/wreckage';
59 our $merge_cache_ref = 'refs/debrebase/merge-resolutions';
65 print STDERR "$us: bad usage: $m\n";
71 local $SIG{__WARN__}; # GetOptions calls `warn' to print messages
72 GetOptions @_ or badusage $m;
76 getoptions_main "bad options follow \`git-debrebase $sc'", @_;
80 my ($k, $optional) = @_;
82 my @cmd = qw(git config -z);
83 push @cmd, qw(--get-all) if wantarray;
85 my $out = cmdoutput_errok @cmd;
87 fail "missing required git config $k" unless $optional;
90 my @l = split /\0/, $out;
91 return wantarray ? @l : $l[0];
98 my $dd = new Data::Dumper [ $v ];
99 Terse $dd 1; Indent $dd 0; Useqq $dd 1;
105 my $data = (git_cat_file $objid, 'commit');
106 $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
110 sub D_UPS () { 0x02; } # upstream files
111 sub D_PAT_ADD () { 0x04; } # debian/patches/ extra patches at end
112 sub D_PAT_OTH () { 0x08; } # debian/patches other changes
113 sub D_DEB_CLOG () { 0x10; } # debian/changelog
114 sub D_DEB_OTH () { 0x20; } # debian/ (not patches/ or changelog)
115 sub DS_DEB () { D_DEB_CLOG | D_DEB_OTH; } # debian/ (not patches/)
117 our $playprefix = 'debrebase';
122 our @dgit = qw(dgit);
124 sub in_workarea ($) {
127 my $r = eval { $sub->(); };
128 { local $@; changedir $maindir; }
132 sub fresh_workarea (;$) {
135 $workarea = fresh_playground "$playprefix/$subdir";
136 in_workarea sub { playtree_setup };
139 sub run_ref_updates_now ($$) {
140 my ($mrest, $updates) = @_;
141 # @$updates is a list of lines for git-update-ref, without \ns
143 my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin));
144 debugcmd '>|', @upd_cmd;
145 open U, "|-", @upd_cmd or die $!;
146 foreach (@$updates) {
147 printdebug ">= ", $_, "\n";
148 print U $_, "\n" or die $!;
151 close U or failedcmd @upd_cmd;
154 our $snags_forced = 0;
155 our $snags_tripped = 0;
156 our $snags_summarised = 0;
157 our @deferred_updates;
158 our @deferred_update_messages;
160 sub merge_wreckage_cleaning ($) {
162 git_for_each_ref("$wrecknoteprefix/*", sub {
163 my ($objid,$objtype,$fullrefname,$reftail) = @_;
164 push @$updates, "delete $fullrefname";
168 sub all_snags_summarised () {
169 $snags_forced + $snags_tripped == $snags_summarised;
171 sub run_deferred_updates ($) {
174 confess 'dangerous internal error' unless all_snags_summarised();
176 merge_wreckage_cleaning \@deferred_updates;
177 run_ref_updates_now $mrest, \@deferred_updates;
178 print $_, "\n" foreach @deferred_update_messages;
180 @deferred_updates = ();
181 @deferred_update_messages = ();
184 sub get_tree ($;$$) {
185 # tree object name => ([ $name, $info ], ...)
186 # where $name is the sort key, ie has / at end for subtrees
187 # $info is the LHS from git-ls-tree (<mode> <type> <hash>)
188 # without $precheck, will crash if $x does not exist, so don't do that;
189 # instead pass '' to get ().
190 my ($x, $precheck, $recurse) = @_;
192 return () if !length $x;
195 my ($type, $dummy) = git_cat_file $x, [qw(tree missing)];
196 return () if $type eq 'missing';
199 $recurse = !!$recurse;
201 confess "get_tree needs object not $x ?" unless $x =~ m{^[0-9a-f]+\:};
203 our (@get_tree_memo, %get_tree_memo);
204 my $memo = $get_tree_memo{$recurse,$x};
205 return @$memo if $memo;
207 local $Debian::Dgit::debugcmd_when_debuglevel = 3;
209 my @cmd = (qw(git ls-tree -z --full-tree));
210 push @cmd, qw(-r) if $recurse;
211 push @cmd, qw(--), $x;
212 my $o = cmdoutput @cmd;
215 foreach my $l (split /\0/, $o) {
216 my ($i, $n) = split /\t/, $l, 2;
217 $n .= '/' if $i =~ m/^\d+ tree /;
219 confess "$x need $last < $n ?" unless $last lt $n;
221 $get_tree_memo{$recurse,$x} = \@l;
222 push @get_tree_memo, $x;
223 if (@get_tree_memo > 10) {
224 delete $get_tree_memo{ shift @get_tree_memo };
229 sub trees_diff_walk ($$$;$) {
230 # trees_diff_walk [{..opts...},] $x, $y, sub {... }
231 # calls sub->($name, $ix, $iy) for each difference
232 # $x and $y are as for get_tree
233 # where $name, $ix, $iy are $name and $info from get_tree
234 # opts are all call even for names same in both
235 # recurse call even for names same in both
236 my $opts = shift @_ if @_>=4;
237 my ($x,$y,$call) = @_;
238 my $all = $opts->{all};
239 return if !$all and $x eq $y;
240 my @x = get_tree $x, 0, $opts->{recurse};
241 my @y = get_tree $y, 0, $opts->{recurse};
242 printdebug "trees_diff_walk(..$x,$y..) ".Dumper(\@x,\@y)
245 my $cmp = !@x <=> !@y # eg @y empty? $cmp=-1, use x
246 || $x[0][0] cmp $y[0][0]; # eg, x lt y ? $cmp=-1, use x
247 my ($n, $ix, $iy); # all same? $cmp=0, use both
249 printdebug "trees_diff_walk $cmp : @{ $x[0]//[] } | @{ $y[0]//[] }\n"
251 ($n, $ix) = @{ shift @x } if $cmp <= 0;
252 ($n, $iy) = @{ shift @y } if $cmp >= 0;
253 next if !$all and $ix eq $iy;
255 "trees_diff_walk(%d,'%s','%s') call('%s','%s','%s')\n",
256 !!$all,$x,$y, $n,$ix,$iy
258 $call->($n, $ix, $iy);
262 sub get_differs ($$) {
264 # This does a similar job to quiltify_trees_differ, in dgit, a bit.
265 # But we don't care about modes, or dpkg-source-unrepresentable
266 # changes, and we don't need the plethora of different modes.
267 # Conversely we need to distinguish different kinds of changes to
268 # debian/ and debian/patches/.
269 # Also, here we have, and want to use, trees_diff_walk, because
270 # we may be calling this an awful lot and we want it to be fast.
275 no warnings qw(exiting);
277 my $plain = sub { $_[0] =~ m{^(100|0*)644 blob }s; };
279 trees_diff_walk "$x:", "$y:", sub {
280 my ($n,$ix,$iy) = @_;
282 # analyse difference at the toplevel
284 if ($n ne 'debian/') {
288 if ($n eq 'debian') {
289 # one side has a non-tree for ./debian !
290 $differs |= D_DEB_OTH;
294 my $xd = $ix && "$x:debian";
295 my $yd = $iy && "$y:debian";
296 trees_diff_walk $xd, $yd, sub {
297 my ($n,$ix,$iy) = @_;
299 # analyse difference in debian/
301 if ($n eq 'changelog' && (!$ix || $plain->($ix))
303 $differs |= D_DEB_CLOG;
306 if ($n ne 'patches/') {
307 $differs |= D_DEB_OTH;
311 my $xp = $ix && "$xd/patches";
312 my $yp = $iy && "$yd/patches";
313 trees_diff_walk { recurse=>1 }, $xp, $yp, sub {
314 my ($n,$ix,$iy) = @_;
316 # analyse difference in debian/patches
320 # we are recursing; directories may appear and disappear
322 } elsif ($n !~ m/\.series$/s && !$ix && $plain->($iy)) {
324 } elsif ($n eq 'series' && $plain->($ix) && $plain->($iy)) {
325 my $x_s = (git_cat_file "$xp/series", 'blob');
326 my $y_s = (git_cat_file "$yp/series", 'blob');
327 chomp $x_s; $x_s .= "\n";
328 $ok = $x_s eq substr($y_s, 0, length $x_s);
332 $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
337 printdebug sprintf "get_differs %s %s = %#x\n", $x, $y, $differs;
342 sub commit_pr_info ($) {
344 return Data::Dumper->dump([$r], [qw(commit)]);
347 sub calculate_committer_authline () {
348 my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
349 'DUMMY COMMIT (git-debrebase)', "HEAD:";
350 my ($h,$m) = get_commit $c;
351 $h =~ m/^committer .*$/m or confess "($h) ?";
355 sub rm_subdir_cached ($) {
357 runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
360 sub read_tree_subdir ($$) {
361 my ($subdir, $new_tree_object) = @_;
362 rm_subdir_cached $subdir;
363 runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object;
366 sub read_tree_debian ($) {
368 read_tree_subdir 'debian', "$treeish:debian";
369 rm_subdir_cached 'debian/patches';
372 sub read_tree_upstream ($;$$) {
373 my ($treeish, $keep_patches, $tree_with_debian) = @_;
374 # if $tree_with_debian is supplied, will use that for debian/
375 # otherwise will save and restore it.
377 $tree_with_debian ? "$tree_with_debian:debian"
378 : cmdoutput @git, qw(write-tree --prefix=debian/);
379 runcmd @git, qw(read-tree), $treeish;
380 read_tree_subdir 'debian', $debian;
381 rm_subdir_cached 'debian/patches' unless $keep_patches;
384 sub make_commit ($$) {
385 my ($parents, $message_paras) = @_;
386 my $tree = cmdoutput @git, qw(write-tree);
387 my @cmd = (@git, qw(commit-tree), $tree);
388 push @cmd, qw(-p), $_ foreach @$parents;
389 push @cmd, qw(-m), $_ foreach @$message_paras;
390 return cmdoutput @cmd;
393 our @snag_force_opts;
395 my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits
396 if (grep { $_ eq $tag } @snag_force_opts) {
398 print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n";
401 print STDERR "git-debrebase: snag detected (-f$tag): $msg\n";
405 # Important: all mainline code must call snags_maybe_bail after
406 # any point where snag might be called, but before making changes
407 # (eg before any call to run_deferred_updates). snags_maybe_bail
408 # may be called more than once if necessary (but this is not ideal
409 # because then the messages about number of snags may be confusing).
410 sub snags_maybe_bail () {
411 return if all_snags_summarised();
414 "%s: snags: %d overriden by individual -f options\n",
417 if ($snags_tripped) {
420 "%s: snags: %d overriden by global --force\n",
424 "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
428 $snags_summarised = $snags_forced + $snags_tripped;
430 sub snags_maybe_bail_early () {
431 # useful to bail out early without doing a lot of work;
432 # not a substitute for snags_maybe_bail.
433 snags_maybe_bail() if $snags_tripped && !$opt_force;
436 return $snags_forced || $snags_tripped;
439 sub ffq_prev_branchinfo () {
440 my $current = git_get_symref();
441 return gdr_ffq_prev_branchinfo($current);
444 sub record_gdrlast ($$;$) {
445 my ($gdrlast, $newvalue, $oldvalue) = @_;
446 $oldvalue ||= $git_null_obj;
447 push @deferred_updates, "update $gdrlast $newvalue $oldvalue";
450 sub fail_unprocessable ($) {
453 my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo();
456 Branch/history seems mangled - no longer in gdr format.
457 See ILLEGAL OPERATIONS in git-debrebase(5).
464 Is this meant to be a gdr branch? $ffqm
466 } elsif (git_get_ref $ffq_prev) {
470 Consider git-debrebase scrap, to throw away your recent work.
472 } elsif (!git_get_ref $gdrlast) {
475 Branch does not seem to be meant to be a git-debrebase branch?
476 Wrong branch, or maybe you needed git-debrebase convert-from-*.
478 } elsif (is_fast_fwd $gdrlast, git_rev_parse 'HEAD') {
486 Branch/history mangled, and diverged since last git-debrebase.
487 Maybe you reset to, or rebased from, somewhere inappropriate.
492 sub gbp_pq_export ($$$) {
493 my ($bname, $base, $tip) = @_;
494 # must be run in a workarea. $bname and patch-queue/$bname
495 # ought not to exist. Leaves you on patch-queue/$bname with
496 # the patches staged but not committed.
497 # returns 1 if there were any patches
498 printdebug "gbp_pq_export $bname $base $tip\n";
499 runcmd @git, qw(checkout -q -b), $bname, $base;
500 runcmd @git, qw(checkout -q -b), "patch-queue/$bname", $tip;
501 my @gbp_cmd = (qw(gbp pq export));
502 my $r = system shell_cmd 'exec >../gbp-pq-err 2>&1', @gbp_cmd;
504 { local ($!,$?); copy('../gbp-pq-err', \*STDERR); }
507 return 0 unless stat_exists 'debian/patches';
508 runcmd @git, qw(add -f debian/patches);
513 # MERGE-TODO allow merge resolution separately from laundering, before git merge
516 # use git-format-patch?
517 # our own patch identification algorithm?
518 # this is an alternative strategy
520 sub merge_failed ($$;@) {
521 my ($wrecknotes, $emsg, @xmsgs) = @_;
523 push @m, "Merge resolution failed: $emsg";
529 merge_wreckage_cleaning \@updates;
530 run_ref_updates_now "merge failed", \@updates;
534 while (my ($k,$v) = each %$wrecknotes) {
535 push @updates, "create $wrecknoteprefix/$k $v";
537 run_ref_updates_now "merge failed", \@updates;
538 push @m, "Wreckage left in $wrecknoteprefix/*.";
540 push @m, "See git-debrebase(1) section FAILED MERGES for suggestions.";
542 # use finish rather than fail, in case we are within an eval
543 # (that can happen inside walk!)
545 print STDERR "$us: $_\n" foreach @m;
549 sub mwrecknote ($$$) {
550 my ($wrecknotes, $reftail, $commitish) = @_;
551 confess unless defined $commitish;
552 printdebug "mwrecknote $reftail $commitish\n";
553 $wrecknotes->{$reftail} = $commitish;
556 sub merge_attempt_cmd {
557 my $wrecknotes = shift @_;
561 merge_failed $wrecknotes,
562 failedcmd_waitstatus(),
563 "failed command: @_";
567 sub merge_series_patchqueue_convert ($$$);
569 sub merge_series ($$$;@) {
570 my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
571 # $base_q{SeriesBase} $input_qs[]{SeriesBase}
572 # $base_q{SeriesTip} $input_qs[]{SeriesTip}
573 # ^ specifies several patch series (currently we only support exactly 2)
574 # return value is a commit which is the result of
575 # merging the two versions of the same topic branch
576 # $input_q[0] and $input_q[1]
577 # with respect to the old version
581 # Creates, in *_q, a key MR for its private use
583 printdebug "merge_series newbase=$newbase\n";
585 $input_qs[$_]{MR}{S} = $_ foreach (0..$#input_qs);
586 $base_q->{MR}{S} = 'base';
589 # $prereq{<patch filename>}{<possible prereq}{<S>} = 1 or absent
590 # $prereq{<patch filename>}{<possible prereq} exists or not (later)
591 # $prereq{<patch filename>} exists or not (even later)
595 my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
597 my $attempt_cmd = sub { &merge_attempt_cmd($wrecknotes, @_); };
600 fresh_workarea "merge";
601 my $seriesfile = "debian/patches/series";
604 foreach my $q ($base_q, reverse @input_qs) {
606 gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip};
608 if (open S, $seriesfile) {
609 while (my $patch = <S>) {
610 chomp $patch or die $!;
611 $prereq{$patch} //= {};
612 foreach my $earlier (@earlier) {
613 $prereq{$patch}{$earlier}{$s}++ and die;
615 push @earlier, $patch;
616 stat "debian/patches/$patch" or die "$patch ?";
618 S->error and die "$seriesfile $!";
621 die "$seriesfile $!" unless $!==ENOENT;
623 read_tree_upstream $newbase, 1;
624 my $pec = make_commit [ grep { defined } $base_q->{MR}{PEC} ], [
625 "Convert $s to patch queue for merging",
626 "[git-debrebase merge-innards patch-queue import:".
629 printdebug "merge_series pec $pec ";
630 runcmd @git, qw(rm -q --ignore-unmatch --cached), $seriesfile;
631 $pec = make_commit [ $pec ], [
632 "Drop series file from $s to avoid merge trouble",
633 "[git-debrebase merge-innards patch-queue prep:".
637 read_tree_debian $newbase;
639 read_tree_subdir 'debian/patches', "$pec:debian/patches";
641 rm_subdir_cached 'debian/patches';
643 $pec = make_commit [ $pec ], [
644 "Update debian/ (excluding patches) to final to avoid re-merging",
645 "debian/ was already merged and we need to just take that.",
646 "[git-debrebase merge-innards patch-queue packaging:".
650 printdebug "pec' $pec\n";
651 runcmd @git, qw(reset -q --hard), $pec;
652 $q->{MR}{PEC} = $pec;
653 $mwrecknote->("$q->{LeftRight}-patchqueue", $pec);
655 # now, because of reverse, we are on $input_q->{MR}{OQC}
656 runcmd @git, qw(checkout -q -b merge);
657 printdebug "merge_series merging...\n";
658 my @mergecmd = (@git, qw(merge --quiet --no-edit), "p-1");
660 $attempt_cmd->(@mergecmd);
662 printdebug "merge_series merge ok, series...\n";
663 # We need to construct a new series file
664 # Firstly, resolve prereq
665 foreach my $f (sort keys %prereq) {
666 printdebug "merge_series patch\t$f\t";
667 if (!stat_exists "debian/patches/$f") {
668 print DEBUG " drop\n" if $debuglevel;
669 # git merge deleted it; that's how we tell it's not wanted
673 print DEBUG " keep\n" if $debuglevel;
674 foreach my $g (sort keys %{ $prereq{$f} }) {
675 my $gfp = $prereq{$f}{$g};
676 printdebug "merge_series prereq\t$f\t-> $g\t";
677 if (!!$gfp->{0} == !!$gfp->{1}
680 print DEBUG "\tkeep\n" if $debuglevel;
682 print DEBUG "\tdrop\n" if $debuglevel;
683 delete $prereq{$f}{$g};
690 return scalar keys %{ $prereq{$f} };
693 my $nodate = time + 1;
695 # $authordate{<patch filename>};
696 my $authordate = sub {
698 $authordate{$f} //= do {
699 open PF, "<", "debian/patches/$f" or die "$f $!";
701 return $nodate if m/^$/;
702 last if s{^Date: }{};
705 return cmdoutput qw(date +%s -d), $_;
709 open NS, '>', $seriesfile or die $!;
711 while (keys %prereq) {
713 foreach my $try (sort keys %prereq) {
716 $unsat->($try) <=> $unsat->($best) or
717 $authordate->($try) <=> $authordate->($best) or
723 printdebug "merge_series series next $best\n";
724 print NS "$best\n" or die $!;
725 delete $prereq{$best};
726 foreach my $gp (values %prereq) {
731 runcmd @git, qw(add), $seriesfile;
732 runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
733 $merged_pq = git_rev_parse 'HEAD';
734 $mwrecknote->('merged-patchqueue', $merged_pq);
736 return merge_series_patchqueue_convert
737 $wrecknotes, $newbase, $merged_pq;
740 sub merge_series_patchqueue_convert ($$$) {
741 my ($wrecknotes, $newbase, $merged_pq) = @_;
746 printdebug "merge_series series gbp pq import\n";
747 runcmd @git, qw(checkout -q -b mergec), $merged_pq;
749 merge_attempt_cmd($wrecknotes, qw(gbp pq import));
750 # MERGE-TODO consider git-format-patch etc. instead,
751 # since gbp pq doesn't always round-trip :-/
753 # OK now we are on patch-queue/merge, and we need to rebase
754 # onto the intended parent and drop the patches from each one
756 printdebug "merge_series series ok, building...\n";
757 my $build = $newbase;
758 my @lcmd = (@git, qw(rev-list --reverse mergec..patch-queue/mergec));
759 foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) {
760 my $commit = git_cat_file $c, 'commit';
761 printdebug "merge_series series ok, building $c\n";
762 read_tree_upstream $c, 0, $newbase;
763 my $tree = cmdoutput @git, qw(write-tree);
764 $commit =~ s{^parent (\S+)$}{parent $build}m or confess;
765 $commit =~ s{^tree (\S+)$}{tree $tree}m or confess;
766 open C, ">", "../mcommit" or die $!;
767 print C $commit or die $!;
769 $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
772 mwrecknote($wrecknotes, 'merged-result', $result);
774 runcmd @git, qw(update-ref refs/heads/result), $result;
776 runcmd @git, qw(checkout -q -b debug);
777 runcmd @git, qw(commit --allow-empty -q -m M-INDEX);
778 runcmd @git, qw(add .);
779 runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
780 my $mdebug = git_rev_parse 'HEAD';
781 printdebug sprintf "merge_series done debug=%s\n", $mdebug;
782 mwrecknote($wrecknotes, 'merged-debug', $mdebug);
784 printdebug "merge_series returns $result\n";
788 # classify returns an info hash like this
790 # Hdr => # commit headers, including 1 final newline
791 # Msg => # commit message (so one newline is dropped)
793 # Type => (see below)
795 # Ix => $index # ie 0, 1, 2, ...
797 # Differs => return value from get_differs
799 # IsDggitImport => 'orig' 'tarball' 'unpatched' 'package' (as from dgit)
801 # NewMsg => # commit message, but with any [dgit import ...] edited
802 # # to say "[was: ...]"
812 # has additional entres in classification result
813 # Overwritten = [ subset of Parents ]
814 # Contributor = $the_remaining_Parent
816 # DgitImportUnpatched
817 # has additional entry in classification result
818 # OrigParents = [ subset of Parents ]
821 # has additional entry in classification result
822 # OrigParents = [ subset of Parents ] # singleton list
829 # has additional entry in classification result
832 sub parsecommit ($;$) {
833 my ($objid, $p_ref) = @_;
834 # => hash with CommitId Hdr Msg Tree Parents
835 # Parents entries have only Ix CommitId
836 # $p_ref, if provided, must be [] and is used as a base for Parents
841 my ($h,$m) = get_commit $objid;
843 my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
844 my (@ph) = $h =~ m/^parent (\w+)$/mg;
854 foreach my $ph (@ph) {
856 Ix => scalar @$p_ref,
868 my $r = parsecommit($objid, \@p);
872 $p->{Differs} = (get_differs $p->{CommitId}, $t),
875 printdebug "classify $objid \$t=$t \@p",
876 (map { sprintf " %s/%#x", $_->{CommitId}, $_->{Differs} } @p),
880 my ($type, @rest) = @_;
881 $r = { %$r, Type => $type, @rest };
883 printdebug " = $type ".(dd $r)."\n";
889 $r = { %$r, Type => qw(Unknown), Why => $why };
890 printdebug " ** Unknown\n";
894 if (grep { $_ eq $objid } @opt_anchors) {
895 return $classify->('TreatAsAnchor');
898 my @identical = grep { !$_->{Differs} } @p;
899 my ($stype, $series) = git_cat_file "$t:debian/patches/series";
900 my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
902 if ($r->{Msg} =~ m{^\[git-debrebase anchor.*\]$}m) {
903 # multi-orig upstreams are represented with an anchor merge
904 # from a single upstream commit which combines the orig tarballs
906 # Every anchor tagged this way must be a merge.
907 # We are relying on the
908 # [git-debrebase anchor: ...]
909 # commit message annotation in "declare" anchor merges (which
910 # do not have any upstream changes), to distinguish those
911 # anchor merges from ordinary pseudomerges (which we might
912 # just try to strip).
914 # However, the user is going to be doing git-rebase a lot. We
915 # really don't want them to rewrite an anchor commit.
916 # git-rebase trips up on merges, so that is a useful safety
919 # BreakwaterStart commits are also anchors in the terminology
920 # of git-debrebase(5), but they are untagged (and always
921 # manually generated).
923 # We cannot not tolerate any tagged linear commit (ie,
924 # BreakwaterStart commits tagged `[anchor:') because such a
925 # thing could result from an erroneous linearising raw git
926 # rebase of a merge anchor. That would represent a corruption
927 # of the branch. and we want to detect and reject the results
928 # of such corruption before it makes it out anywhere. If we
929 # reject it here then we avoid making the pseudomerge which
930 # would be needed to push it.
932 my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); };
933 @p == 2 or return $badanchor->("has other than two parents");
934 $haspatches and return $badanchor->("contains debian/patches");
936 # How to decide about l/r ordering of anchors ? git
937 # --topo-order prefers to expand 2nd parent first. There's
938 # already an easy rune to look for debian/ history anyway (git log
939 # debian/) so debian breakwater branch should be 1st parent; that
940 # way also there's also an easy rune to look for the upstream
941 # patches (--topo-order).
943 # Also this makes --first-parent be slightly more likely to
944 # be useful - it makes it provide a linearised breakwater history.
946 # Of course one can say somthing like
947 # gitk -- ':/' ':!/debian'
948 # to get _just_ the commits touching upstream files, and by
949 # the TREESAME logic in git-rev-list this will leave the
950 # breakwater into upstream at the first anchor. But that
951 # doesn't report debian/ changes at all.
953 # Other observations about gitk: by default, gitk seems to
954 # produce output in a different order to git-rev-list. I
955 # can't seem to find this documented anywhere. gitk
956 # --date-order DTRT. But, gitk always seems to put the
957 # parents from left to right, in order, so it's easy to see
958 # which way round a pseudomerge is.
960 $p[0]{IsOrigin} and $badanchor->("is an origin commit");
961 $p[1]{Differs} & ~DS_DEB and
962 $badanchor->("upstream files differ from left parent");
963 $p[0]{Differs} & ~D_UPS and
964 $badanchor->("debian/ differs from right parent");
966 return $classify->(qw(Anchor),
967 OrigParents => [ $p[1] ]);
971 my $d = $r->{Parents}[0]{Differs};
972 if ($d == D_PAT_ADD) {
973 return $classify->(qw(AddPatches));
974 } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
975 return $unknown->("edits debian/patches");
976 } elsif ($d & DS_DEB and !($d & ~DS_DEB)) {
977 my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian";
979 if ($d == D_DEB_CLOG) {
980 return $classify->(qw(Changelog));
982 return $classify->(qw(Packaging));
984 } elsif ($ty eq 'missing') {
985 return $classify->(qw(BreakwaterStart));
987 return $unknown->("parent's debian is not a directory");
989 } elsif ($d == D_UPS) {
990 return $classify->(qw(Upstream));
991 } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) {
992 return $classify->(qw(Mixed));
994 return $unknown->("no changes");
996 confess "internal error $objid ?";
1000 return $unknown->("origin commit");
1003 if (@p == 2 && @identical == 1) {
1004 my @overwritten = grep { $_->{Differs} } @p;
1005 confess "internal error $objid ?" unless @overwritten==1;
1006 return $classify->(qw(Pseudomerge),
1007 Overwritten => [ $overwritten[0] ],
1008 Contributor => $identical[0]);
1010 if (@p == 2 && @identical == 2) {
1012 my ($ph,$pm) = get_commit $_[0]{CommitId};
1013 $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
1017 my $order = $get_t->($bytime[0]) <=> $get_t->($bytime[1]);
1018 if ($order > 0) { # newer first
1019 } elsif ($order < 0) {
1020 @bytime = reverse @bytime;
1022 # same age, default to order made by -s ours
1023 # that is, commit was made by someone who preferred L
1025 return $classify->(qw(Pseudomerge),
1026 SubType => qw(Ambiguous),
1027 Contributor => $bytime[0],
1028 Overwritten => [ $bytime[1] ]);
1030 foreach my $p (@p) {
1031 my ($p_h, $p_m) = get_commit $p->{CommitId};
1032 $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
1033 ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
1035 my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
1037 if (!(grep { !$_->{IsOrigin} } @p) and
1038 (@orig_ps >= @p - 1) and
1039 $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
1041 return $classify->(qw(DgitImportUnpatched),
1042 OrigParents => \@orig_ps);
1046 $r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) {
1047 return $classify->("MergedBreakwaters");
1049 if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) {
1050 return $unknown->("unknown kind of merge from $1");
1053 return $unknown->("octopus merge");
1057 return $unknown->("general two-parent merge");
1060 return $classify->("VanillaMerge");
1063 sub keycommits ($;$$$$$);
1065 sub mergedbreakwaters_anchor ($) {
1068 foreach my $p (@{ $cl->{Parents} }) {
1069 my ($panchor, $pbw) = keycommits $p->{CommitId},
1070 undef,undef,undef,undef, 1;
1071 $best_anchor = $panchor
1072 if !defined $best_anchor
1073 or is_fast_fwd $best_anchor, $panchor;
1074 fail "inconsistent anchors in merged-breakwaters $p->{CommitId}"
1075 unless is_fast_fwd $panchor, $best_anchor;
1077 return $best_anchor;
1080 sub keycommits ($;$$$$$) {
1081 my ($head, $furniture, $unclean, $trouble, $fatal, $claimed_bw) = @_;
1082 # => ($anchor, $breakwater)
1084 # $furniture->("unclean-$tagsfx", $msg, $cl)
1085 # $unclean->("unclean-$tagsfx", $msg, $cl)
1086 # is callled for each situation or commit that
1087 # wouldn't be found in a laundered branch
1088 # $furniture is for furniture commits such as might be found on an
1089 # interchange branch (pseudomerge, d/patches, changelog)
1090 # $trouble is for things whnich prevent the return of
1091 # anchor and breakwater information; if that is ignored,
1092 # then keycommits returns (undef, undef) instead.
1093 # $fatal is for unprocessable commits, and should normally cause
1094 # a failure. If ignored, agaion, (undef, undef) is returned.
1096 # If $claimed_bw, this is supposed to be a breakwater commit.
1098 # If a callback is undef, fail is called instead.
1099 # If a callback is defined but false, the situation is ignored.
1100 # Callbacks may say:
1101 # no warnings qw(exiting); last;
1102 # if the answer is no longer wanted.
1104 my ($anchor, $breakwater);
1105 $breakwater = $head if $claimed_bw;
1109 $fatal //= sub { fail_unprocessable $_[1]; };
1111 my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
1112 my $why = $mainwhy.$xwhy;
1113 my $m = "branch needs laundering (run git-debrebase): $why";
1114 fail $m unless defined $cb;
1116 $cb->("unclean-$tagsfx", $why, $cl, $mainwhy);
1118 my $found_anchor = sub {
1120 $breakwater //= $clogonly;
1121 $breakwater //= $head;
1122 no warnings qw(exiting);
1126 $cl = classify $head;
1127 my $ty = $cl->{Type};
1128 if ($ty eq 'Packaging') {
1129 $breakwater //= $clogonly;
1130 $breakwater //= $head;
1131 } elsif ($ty eq 'Changelog') {
1132 # this is going to count as the tip of the breakwater
1133 # only if it has no upstream stuff before it
1134 $clogonly //= $head;
1135 } elsif ($ty eq 'Anchor' or
1136 $ty eq 'TreatAsAnchor' or
1137 $ty eq 'BreakwaterStart') {
1138 $found_anchor->($head);
1139 } elsif ($ty eq 'Upstream') {
1140 $x->($unclean, 'ordering',
1141 "packaging change ($breakwater) follows upstream change"," (eg $head)")
1142 if defined $breakwater;
1144 $breakwater = undef;
1145 } elsif ($ty eq 'Mixed') {
1146 $x->($unclean, 'mixed',
1147 "found mixed upstream/packaging commit"," ($head)");
1149 $breakwater = undef;
1150 } elsif ($ty eq 'Pseudomerge' or
1151 $ty eq 'AddPatches') {
1153 $x->($furniture, (lc $ty),
1154 "found interchange bureaucracy commit ($ty)"," ($head)");
1155 } elsif ($ty eq 'DgitImportUnpatched') {
1157 $x->($trouble, 'dgitimport',
1158 "found dgit dsc import"," ($head)");
1159 return (undef,undef);
1161 $x->($fatal, 'unprocessable',
1162 "found bare dgit dsc import with no prior history",
1164 return (undef,undef);
1166 } elsif ($ty eq 'VanillaMerge') {
1167 $x->($trouble, 'vanillamerge',
1168 "found vanilla merge"," ($head)");
1169 return (undef,undef);
1170 } elsif ($ty eq 'MergedBreakwaters') {
1171 $found_anchor->(mergedbreakwaters_anchor $cl);
1173 $x->($fatal, 'unprocessable',
1174 "found unprocessable commit, cannot cope: $cl->{Why}",
1176 return (undef,undef);
1178 $head = $cl->{Parents}[0]{CommitId};
1180 return ($anchor, $breakwater);
1186 $nogenerate,$report, $report_lprefix) = @_;
1187 # => ($tip, $breakwater_tip, $last_anchor)
1188 # (or nothing, if $nogenerate)
1190 printdebug "*** WALK $input ".($nogenerate//0)." ".($report//'-')."\n";
1191 $report_lprefix //= '';
1193 # go through commits backwards
1194 # we generate two lists of commits to apply:
1195 # breakwater branch and upstream patches
1196 my (@brw_cl, @upp_cl, @processed);
1203 my ($prose, $info) = @_;
1204 my $ms = $cl->{Msg};
1206 confess unless defined $info;
1207 $ms .= "\n\n[git-debrebase $info: $prose]\n";
1208 return (Msg => $ms);
1210 my $rewrite_from_here = sub {
1212 my $sp_cl = { SpecialMethod => 'StartRewrite' };
1214 push @processed, $sp_cl;
1219 my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; };
1222 return unless $report;
1223 print $report $prdelim, $report_lprefix, @_;
1227 my $bomb = sub { # usage: return $bomb->();
1228 print $report " Unprocessable" if $report;
1229 print $report " ($cl->{Why})" if $report && defined $cl->{Why};
1232 return (undef,undef);
1234 fail_unprocessable "found unprocessable commit, cannot cope".
1235 (defined $cl->{Why} ? "; $cl->{Why}:": ':').
1236 " (commit $cur) (d.".
1237 (join ' ', map { sprintf "%#x", $_->{Differs} }
1238 @{ $cl->{Parents} }).
1245 my $build_start = sub {
1246 my ($msg, $parent) = @_;
1249 no warnings qw(exiting); last;
1254 merge_failed $cl->{MergeWreckNotes}, $emsg;
1257 my $mwrecknote = sub { &mwrecknote($cl->{MergeWreckNotes}, @_); };
1262 $cl = classify $cur;
1263 $cl->{MergeWreckNotes} //= {};
1264 my $ty = $cl->{Type};
1265 my $st = $cl->{SubType};
1266 $prline->("$cl->{CommitId} $cl->{Type}");
1267 $found{$ty. ( defined($st) ? "-$st" : '' )}++;
1268 push @processed, $cl;
1269 my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
1270 if ($ty eq 'AddPatches') {
1272 $rewrite_from_here->(\@upp_cl);
1274 } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') {
1278 } elsif ($ty eq 'BreakwaterStart') {
1279 $last_anchor = $cur;
1280 $build_start->('FirstPackaging', $cur);
1281 } elsif ($ty eq 'Upstream') {
1285 } elsif ($ty eq 'Mixed') {
1288 my $cls = { %$cl, $xmsg->("mixed commit: $wh part",'split') };
1291 $queue->(\@brw_cl, "debian");
1292 $queue->(\@upp_cl, "upstream");
1293 $rewrite_from_here->(\@brw_cl);
1296 } elsif ($ty eq 'Pseudomerge') {
1297 my $contrib = $cl->{Contributor}{CommitId};
1298 print $report " Contributor=$contrib" if $report;
1299 push @pseudomerges, $cl;
1300 $rewrite_from_here->(\@upp_cl);
1303 } elsif ($ty eq 'Anchor' or $ty eq 'TreatAsAnchor') {
1304 $last_anchor = $cur;
1305 $build_start->("Anchor", $cur);
1306 } elsif ($ty eq 'DgitImportUnpatched') {
1307 my $pm = $pseudomerges[-1];
1309 # To an extent, this is heuristic. Imports don't have
1310 # a useful history of the debian/ branch. We assume
1311 # that the first pseudomerge after an import has a
1312 # useful history of debian/, and ignore the histories
1313 # from later pseudomerges. Often the first pseudomerge
1314 # will be the dgit import of the upload to the actual
1315 # suite intended by the non-dgit NMUer, and later
1316 # pseudomerges may represent in-archive copies.
1317 my $ovwrs = $pm->{Overwritten};
1318 printf $report " PM=%s \@Overwr:%d",
1319 $pm->{CommitId}, (scalar @$ovwrs)
1322 printdebug "*** WALK BOMB DgitImportUnpatched\n";
1325 my $ovwr = $ovwrs->[0]{CommitId};
1326 printf $report " Overwr=%s", $ovwr if $report;
1327 # This import has a tree which is just like a
1328 # breakwater tree, but it has the wrong history. It
1329 # ought to have the previous breakwater (which the
1330 # pseudomerge overwrote) as an ancestor. That will
1331 # make the history of the debian/ files correct. As
1332 # for the upstream version: either it's the same as
1333 # was ovewritten (ie, same as the previous
1334 # breakwater), in which case that history is precisely
1335 # right; or, otherwise, it was a non-gitish upload of a
1336 # new upstream version. We can tell these apart by
1337 # looking at the tree of the supposed upstream.
1340 SpecialMethod => 'DgitImportDebianUpdate',
1341 $xmsg->("debian changes", 'convert dgit import')
1344 SpecialMethod => 'DgitImportUpstreamUpdate',
1345 $xmsg->("convert dgit import: upstream update",
1348 $prline->(" Import");
1349 $rewrite_from_here->(\@brw_cl);
1350 $upp_limit //= $#upp_cl; # further, deeper, patches discarded
1354 # Everything is from this import. This kind of import
1355 # is already nearly in valid breakwater format, with the
1356 # patches as commits. Unfortunately it contains
1358 printdebug "*** WALK BOMB bare dgit import\n";
1359 $cl->{Why} = "bare dgit dsc import";
1363 } elsif ($ty eq 'MergedBreakwaters') {
1364 $last_anchor = mergedbreakwaters_anchor $cl;
1365 $build_start->(' MergedBreakwaters', $cur);
1367 } elsif ($ty eq 'VanillaMerge') {
1368 # User may have merged unstitched branch(es). We will
1369 # have now lost what ffq-prev was then (since the later
1370 # pseudomerge may introduce further changes). The effect
1371 # of resolving such a merge is that we may have to go back
1372 # further in history to find a merge base, since the one
1373 # which was reachable via ffq-prev is no longer findable.
1374 # This is suboptimal, but if it all works we'll have done
1376 # MERGE-TODO we should warn the user in the docs about this
1380 # We expect to find a dominating anchor amongst the
1381 # inputs' anchors. That will be the new anchor.
1383 # More complicated is finding a merge base for the
1384 # breakwaters. We need a merge base that is a breakwater
1385 # commit. The ancestors of breakwater commits are more
1386 # breakwater commits and possibly upstream commits and the
1387 # ancestors of those upstream. Upstreams might have
1388 # arbitrary ancestors. But any upstream commit U is
1389 # either included in both anchors, in which case the
1390 # earlier anchor is a better merge base than any of U's
1391 # ancestors; or U is not included in the older anchor, in
1392 # which case U is not an ancestor of the vanilla merge at
1393 # all. So no upstream commit, nor any ancestor thereof,
1394 # is a best merge base. As for non-breakwater Debian
1395 # commits: these are never ancestors of any breakwater.
1397 # So any best merge base as found by git-merge-base
1398 # is a suitable breakwater anchor. Usually there will
1401 printdebug "*** MERGE\n";
1403 my @bwbcmd = (@git, qw(merge-base));
1404 my @ibcmd = (@git, qw(merge-base --all));
1405 my $might_be_in_bw = 1;
1407 my $ps = $cl->{Parents};
1409 $mwrecknote->('vanilla-merge', $cl->{CommitId});
1411 foreach my $p (@$ps) {
1412 $prline->(" VanillaMerge ".$p->{Ix});
1414 my ($ptip, $pbw, $panchor) =
1415 walk $p->{CommitId}, 0, $report,
1416 $report_lprefix.' ';
1417 $p->{Laundered} = $p->{SeriesTip} = $ptip;
1418 $p->{Breakwater} = $p->{SeriesBase} = $pbw;
1419 $p->{Anchor} = $panchor;
1421 my $lr = $p->{LeftRight} = (qw(left right))[$p->{Ix}];
1422 $mwrecknote->("$lr-input", $p->{CommitId});
1424 my $mwrecknote_parent = sub {
1426 $mwrecknote->("$lr-".(lc $which), $p->{$which});
1428 $mwrecknote_parent->('Laundered');
1429 $mwrecknote_parent->('Breakwater');
1430 $mwrecknote_parent->('Anchor');
1432 $best_anchor = $panchor if
1433 !defined $best_anchor or
1434 is_fast_fwd $best_anchor, $panchor;
1436 printdebug " MERGE BA best=".($best_anchor//'-').
1440 $mwrecknote->('result-anchor', $best_anchor);
1442 foreach my $p (@$ps) {
1443 $prline->(" VanillaMerge ".$p->{Ix});
1444 if (!is_fast_fwd $p->{Anchor}, $best_anchor) {
1445 $nomerge->('divergent anchors');
1446 } elsif ($p->{Anchor} eq $best_anchor) {
1447 print $report " SameAnchor" if $report;
1449 print $report " SupersededAnchor" if $report;
1451 if ($p->{Breakwater} eq $p->{CommitId}) {
1452 # this parent commit was its own breakwater,
1453 # ie it is part of the breakwater
1454 print $report " Breakwater" if $report;
1456 $might_be_in_bw = 0;
1458 push @bwbcmd, $p->{Breakwater};
1459 push @ibcmd, $p->{CommitId};
1462 if ($ok && $might_be_in_bw) {
1463 # We could rewrite this to contaion the metadata
1464 # declaring it to be MergedBreakwaters, but
1465 # unnecessarily rewriting a merge seems unhelpful.
1466 $prline->(" VanillaMerge MergedBreakwaters");
1467 $last_anchor = $best_anchor;
1468 $build_start->('MergedBreakwaters', $cur);
1471 my $bwb = cmdoutput @bwbcmd;
1473 # OK, now we have a breakwater base, but we need the merge
1474 # base for the interchange branch because we need the delta
1477 # This a the best merge base of our inputs which has the
1478 # breakwater merge base as an ancestor.
1485 @ibs or confess 'internal error, expected anchor at least ?';
1489 foreach my $tibix (0..$#ibs) {
1490 my $tib = $ibs[$tibix];
1491 my $ff = is_fast_fwd $bwb, $tib;
1492 my $ok = !$ff ? 'rej' : $ib ? 'extra' : 'ok';
1493 my $tibleaf = "interchange-mbcand-$ok-$tibix";
1494 $mwrecknote->($tibleaf, $tib);
1501 $ib or $nomerge->("no suitable interchange merge base");
1503 $prline->(" VanillaMerge Base");
1505 my ($btip, $bbw, $banchor) = eval {
1506 walk $ib, 0, $report, $report_lprefix.' ';
1508 $nomerge->("walking interchange branch merge base ($ibleaf):\n".
1512 $mwrecknote->("mergebase-laundered", $btip);
1513 $mwrecknote->("mergebase-breakwater", $bbw);
1514 $mwrecknote->("mergebase-anchor", $banchor);
1516 my $ibinfo = { SeriesTip => $btip,
1519 LeftRight => 'mergebase' };
1522 or $nomerge->("interchange merge-base ($ib)'s".
1523 " breakwater ($bbw)".
1524 " != breakwaters' merge-base ($bwb)");
1526 grep { $_->{Anchor} eq $ibinfo->{Anchor} } @$ps
1527 or $nomerge->("interchange merge-base ($ib)'s".
1528 " anchor ($ibinfo->{SeriesBase})".
1529 " != any merge input's anchor (".
1530 (join ' ', map { $_->{Anchor} } @$ps).
1533 $cl->{MergeInterchangeBaseInfo} = $ibinfo;
1534 $cl->{MergeBestAnchor} = $best_anchor;
1537 SpecialMethod => 'MergeCreateMergedBreakwaters',
1538 $xmsg->('constructed from vanilla merge',
1539 'merged-breakwater'),
1543 SpecialMethod => 'MergeMergeSeries',
1545 $build_start->('MergeBreakwaters', $cur);
1547 printdebug "*** WALK BOMB unrecognised\n";
1553 printdebug "*** WALK prep done cur=$cur".
1554 " brw $#brw_cl upp $#upp_cl proc $#processed pm $#pseudomerges\n";
1556 return if $nogenerate;
1558 # Now we build it back up again
1564 $#upp_cl = $upp_limit if defined $upp_limit;
1566 my $committer_authline = calculate_committer_authline();
1568 printdebug "WALK REBUILD $build ".(scalar @processed)."\n";
1570 confess "internal error" unless $build eq (pop @processed)->{CommitId};
1573 mkdir $rd or $!==EEXIST or die $!;
1575 my $want_debian = $build;
1576 my $want_upstream = $build;
1578 my $read_tree_upstream = sub { ($want_upstream) = @_; };
1579 my $read_tree_debian = sub { ($want_debian) = @_; };
1581 foreach my $cl (qw(Debian), (reverse @brw_cl),
1582 { SpecialMethod => 'RecordBreakwaterTip' },
1583 qw(Upstream), (reverse @upp_cl)) {
1585 $current_method = $cl;
1588 my $method = $cl->{SpecialMethod} // $current_method;
1589 my @parents = ($build);
1590 my $cltree = $cl->{CommitId};
1591 printdebug "WALK BUILD ".($cltree//'undef').
1592 " $method (rewriting=$rewriting)\n";
1593 if ($method eq 'Debian') {
1594 $read_tree_debian->($cltree);
1595 } elsif ($method eq 'Upstream') {
1596 $read_tree_upstream->($cltree);
1597 } elsif ($method eq 'StartRewrite') {
1600 } elsif ($method eq 'RecordBreakwaterTip') {
1601 $breakwater = $build;
1603 } elsif ($method eq 'DgitImportDebianUpdate') {
1604 $read_tree_debian->($cltree);
1605 } elsif ($method eq 'DgitImportUpstreamUpdate') {
1606 confess unless $rewriting;
1607 my $differs = (get_differs $build, $cltree);
1608 next unless $differs & D_UPS;
1609 $read_tree_upstream->($cltree);
1610 push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
1611 } elsif ($method eq 'MergeCreateMergedBreakwaters') {
1612 print "Found a general merge, will try to tidy it up.\n";
1614 $read_tree_upstream->($cl->{MergeBestAnchor});
1615 $read_tree_debian->($cltree);
1616 @parents = map { $_->{Breakwater} } @{ $cl->{Parents} };
1617 } elsif ($method eq 'MergeMergeSeries') {
1618 my $cachehit = reflog_cache_lookup
1619 $merge_cache_ref, "vanilla-merge $cl->{CommitId}";
1621 print "Using supplied resolution for $cl->{CommitId}...\n";
1623 $mwrecknote->('cached-resolution', $build);
1625 print "Running merge resolution for $cl->{CommitId}...\n";
1626 $mwrecknote->('new-base', $build);
1627 $build = merge_series
1628 $build, $cl->{MergeWreckNotes},
1629 $cl->{MergeInterchangeBaseInfo},
1630 @{ $cl->{Parents} };
1632 $last_anchor = $cl->{MergeBestAnchor};
1634 # Check for mismerges:
1636 my ($against, $allow, $what) = @_;
1637 my $differs = get_differs $build, $against;
1639 "merge misresolved: %s are not the same (%s %s d.%#x)",
1640 $what, $against, $build, $differs)
1641 if $differs & ~($allow | D_PAT_ADD);
1644 # Breakwater changes which were in each side of the
1645 # merge will have been incorporated into the
1646 # MergeCreateMergedBreakwaters output. Because the
1647 # upstream series was rebased onto the new breakwater,
1648 # so should all of the packaging changes which were in
1650 $check->($input, D_UPS, 'debian files');
1652 # Upstream files are merge_series, which ought to
1653 # have been identical to the original merge.
1654 $check->($cl->{CommitId}, DS_DEB, 'upstream files');
1656 print "Merge resolution successful.\n";
1659 confess "$method ?";
1662 my $procd = (pop @processed) // 'UNDEF';
1663 if ($cl ne $procd) {
1665 printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n";
1669 read_tree_upstream $want_upstream, 0, $want_debian;
1671 my $newtree = cmdoutput @git, qw(write-tree);
1672 my $ch = $cl->{Hdr};
1673 $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
1674 $ch =~ s{^parent .*\n}{}mg;
1675 $ch =~ s{(?=^author)}{
1676 join '', map { "parent $_\n" } @parents
1677 }me or confess "$ch ?";
1679 $ch =~ s{^committer .*$}{$committer_authline}m
1682 my $cf = "$rd/m$rewriting";
1683 open CD, ">", $cf or die $!;
1684 print CD $ch, "\n", $cl->{Msg} or die $!;
1686 my @cmd = (@git, qw(hash-object));
1687 push @cmd, qw(-w) if $rewriting;
1688 push @cmd, qw(-t commit), $cf;
1689 my $newcommit = cmdoutput @cmd;
1690 confess "$ch ?" unless $rewriting
1691 or $newcommit eq $cl->{CommitId};
1692 $build = $newcommit;
1694 $build = $cl->{CommitId};
1695 trees_diff_walk "$want_upstream:", "$build:", sub {
1697 no warnings qw(exiting);
1698 next if $n eq 'debian/';
1699 confess "mismatch @_ ?";
1701 trees_diff_walk "$want_debian:debian", "$build:debian", sub {
1702 confess "mismatch @_ ?";
1704 my @old_parents = map { $_->{CommitId} } @{ $cl->{Parents} };
1705 confess "mismatch @parents != @old_parents ?"
1706 unless "@parents" eq "@old_parents";
1708 if (grep { $method eq $_ } qw(DgitImportUpstreamUpdate)) {
1709 $last_anchor = $cur;
1714 my $final_check = get_differs $build, $input;
1715 die sprintf "internal error %#x %s %s", $final_check, $input, $build
1716 if $final_check & ~D_PAT_ADD;
1718 my @r = ($build, $breakwater, $last_anchor);
1719 printdebug "*** WALK RETURN @r\n";
1724 git_check_unmodified();
1725 return git_rev_parse qw(HEAD);
1728 sub update_head ($$$) {
1729 my ($old, $new, $mrest) = @_;
1730 push @deferred_updates, "update HEAD $new $old";
1731 run_deferred_updates $mrest;
1734 sub update_head_checkout ($$$) {
1735 my ($old, $new, $mrest) = @_;
1736 update_head $old, $new, $mrest;
1737 runcmd @git, qw(reset --hard);
1740 sub update_head_postlaunder ($$$) {
1741 my ($old, $tip, $reflogmsg) = @_;
1742 return if $tip eq $old && !@deferred_updates;
1743 print "git-debrebase: laundered (head was $old)\n";
1744 update_head $old, $tip, $reflogmsg;
1745 # no tree changes except debian/patches
1746 runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
1749 sub currently_rebasing() {
1750 foreach (qw(rebase-merge rebase-apply)) {
1751 return 1 if stat_exists "$maindir_gitdir/$_";
1756 sub bail_if_rebasing() {
1757 fail "you are in the middle of a git-rebase already"
1758 if currently_rebasing();
1761 sub do_launder_head ($) {
1762 my ($reflogmsg) = @_;
1763 my $old = get_head();
1765 my ($tip,$breakwater) = walk $old;
1767 update_head_postlaunder $old, $tip, $reflogmsg;
1768 return ($tip,$breakwater);
1771 sub cmd_launder_v0 () {
1772 badusage "no arguments to launder-v0 allowed" if @ARGV;
1773 my $old = get_head();
1774 my ($tip,$breakwater,$last_anchor) = walk $old;
1775 update_head_postlaunder $old, $tip, 'launder';
1776 printf "# breakwater tip\n%s\n", $breakwater;
1777 printf "# working tip\n%s\n", $tip;
1778 printf "# last anchor\n%s\n", $last_anchor;
1781 sub defaultcmd_rebase () {
1782 push @ARGV, @{ $opt_defaultcmd_interactive // [] };
1783 my ($tip,$breakwater) = do_launder_head 'launder for rebase';
1784 runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
1787 sub cmd_analyse () {
1788 badusage "analyse does not support any options"
1789 if @ARGV and $ARGV[0] =~ m/^-/;
1790 badusage "too many arguments to analyse" if @ARGV>1;
1793 $old = git_rev_parse $old;
1795 $old = git_rev_parse 'HEAD';
1797 my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
1798 STDOUT->error and die $!;
1801 sub ffq_check ($;$$) {
1802 # calls $ff and/or $notff zero or more times
1803 # then returns either (status,message) where status is
1808 # or (undef,undef, $ffq_prev,$gdrlast)
1809 # $ff and $notff are called like this:
1810 # $ff->("message for stdout\n");
1811 # $notff->('snag-name', $message);
1812 # normally $currentval should be HEAD
1813 my ($currentval, $ff, $notff) =@_;
1815 $ff //= sub { print $_[0] or die $!; };
1818 my ($status, $message, $current, $ffq_prev, $gdrlast)
1819 = ffq_prev_branchinfo();
1820 return ($status, $message) unless $status eq 'branch';
1822 my $exists = git_get_ref $ffq_prev;
1823 return ('exists',"$ffq_prev already exists") if $exists;
1825 return ('not-branch', 'HEAD symref is not to refs/heads/')
1826 unless $current =~ m{^refs/heads/};
1829 my @check_specs = split /\;/, (cfg "branch.$branch.ffq-ffrefs",1) // '*';
1832 printdebug "ffq check_specs @check_specs\n";
1835 my ($lrref, $desc) = @_;
1836 printdebug "ffq might check $lrref ($desc)\n";
1838 for my $chk (@check_specs) {
1840 $invert = $glob =~ s{^[!^]}{};
1841 last if fnmatch $glob, $lrref;
1844 my $lrval = git_get_ref $lrref;
1845 return unless length $lrval;
1847 if (is_fast_fwd $lrval, $currentval) {
1848 $ff->("OK, you are ahead of $lrref\n");
1849 $checked{$lrref} = 1;
1850 } elsif (is_fast_fwd $currentval, $lrval) {
1851 $checked{$lrref} = -1;
1852 $notff->('behind', "you are behind $lrref, divergence risk");
1854 $checked{$lrref} = -1;
1855 $notff->('diverged', "you have diverged from $lrref");
1859 my $merge = cfg "branch.$branch.merge",1;
1860 if (defined $merge and $merge =~ m{^refs/heads/}) {
1862 printdebug "ffq merge $rhs\n";
1863 my $check_remote = sub {
1864 my ($remote, $desc) = @_;
1865 printdebug "ffq check_remote ".($remote//'undef')." $desc\n";
1866 return unless defined $remote;
1867 $check->("refs/remotes/$remote/$rhs", $desc);
1869 $check_remote->((scalar cfg "branch.$branch.remote",1),
1870 'remote fetch/merge branch');
1871 $check_remote->((scalar cfg "branch.$branch.pushRemote",1) //
1872 (scalar cfg "branch.$branch.pushDefault",1),
1873 'remote push branch');
1875 if ($branch =~ m{^dgit/}) {
1876 $check->("refs/remotes/dgit/$branch", 'remote dgit branch');
1877 } elsif ($branch =~ m{^master$}) {
1878 $check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid');
1880 return (undef, undef, $ffq_prev, $gdrlast);
1883 sub record_ffq_prev_deferred () {
1884 # => ('status', "message")
1886 # deferred message is undef
1891 # if not ff from some branch we should be ff from, is an snag
1892 # if "deferred", will have added something about that to
1893 # @deferred_update_messages, and also maybe printed (already)
1894 # some messages about ff checks
1896 my $currentval = get_head();
1898 my ($status,$message, $ffq_prev,$gdrlast) = ffq_check $currentval;
1899 return ($status,$message) if defined $status;
1903 push @deferred_updates, "update $ffq_prev $currentval $git_null_obj";
1904 push @deferred_updates, "delete $gdrlast";
1905 push @deferred_update_messages, "Recorded previous head for preservation";
1906 return ('deferred', undef);
1909 sub record_ffq_auto () {
1910 my ($status, $message) = record_ffq_prev_deferred();
1911 if ($status eq 'deferred' || $status eq 'exists') {
1913 snag $status, "could not record ffq-prev: $message";
1918 sub ffq_prev_info () {
1920 # => ($ffq_prev, $gdrlast, $ffq_prev_commitish)
1921 my ($status, $message, $current, $ffq_prev, $gdrlast)
1922 = ffq_prev_branchinfo();
1923 if ($status ne 'branch') {
1924 snag $status, "could not check ffq-prev: $message";
1927 my $ffq_prev_commitish = $ffq_prev && git_get_ref $ffq_prev;
1928 return ($ffq_prev, $gdrlast, $ffq_prev_commitish);
1931 sub stitch ($$$$$) {
1932 my ($old_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose) = @_;
1934 push @deferred_updates, "delete $ffq_prev $ffq_prev_commitish";
1936 if (is_fast_fwd $old_head, $ffq_prev_commitish) {
1937 my $differs = get_differs $old_head, $ffq_prev_commitish;
1938 unless ($differs & ~D_PAT_ADD) {
1939 # ffq-prev is ahead of us, and the only tree changes it has
1940 # are possibly addition of things in debian/patches/.
1941 # Just wind forwards rather than making a pointless pseudomerge.
1942 record_gdrlast $gdrlast, $ffq_prev_commitish;
1943 update_head_checkout $old_head, $ffq_prev_commitish,
1944 "stitch (fast forward)";
1949 # We make pseudomerges with L as the contributing parent.
1950 # This makes git rev-list --first-parent work properly.
1951 my $new_head = make_commit [ $old_head, $ffq_prev ], [
1952 'Declare fast forward / record previous work',
1953 "[git-debrebase pseudomerge: $prose]",
1955 record_gdrlast $gdrlast, $new_head;
1956 update_head $old_head, $new_head, "stitch: $prose";
1959 sub do_stitch ($;$) {
1960 my ($prose, $unclean) = @_;
1962 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
1963 if (!$ffq_prev_commitish) {
1964 fail "No ffq-prev to stitch." unless $opt_noop_ok;
1967 my $dangling_head = get_head();
1969 keycommits $dangling_head, $unclean,$unclean,$unclean;
1972 stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
1975 sub upstream_commitish_search ($$) {
1976 my ($upstream_version, $tried) = @_;
1977 # todo: at some point maybe use git-deborig to do this
1978 foreach my $tagpfx ('', 'v', 'upstream/') {
1979 my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
1980 my $new_upstream = git_get_ref "refs/tags/$tag";
1982 return $new_upstream if length $new_upstream;
1986 sub resolve_upstream_version ($$) {
1987 my ($new_upstream, $upstream_version) = @_;
1989 if (!defined $new_upstream) {
1991 $new_upstream = upstream_commitish_search $upstream_version, \@tried;
1992 if (!length $new_upstream) {
1993 fail "Could not determine appropriate upstream commitish.\n".
1994 " (Tried these tags: @tried)\n".
1995 " Check version, and specify upstream commitish explicitly.";
1998 $new_upstream = git_rev_parse $new_upstream;
2000 return $new_upstream;
2003 sub cmd_new_upstream () {
2004 # automatically and unconditionally launders before rebasing
2005 # if rebase --abort is used, laundering has still been done
2009 badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
2011 # parse args - low commitment
2012 my $spec_version = shift @ARGV;
2013 my $new_version = (new Dpkg::Version $spec_version, check => 1);
2014 fail "bad version number \`$spec_version'" unless defined $new_version;
2015 if ($new_version->is_native()) {
2016 $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
2019 my $new_upstream = shift @ARGV;
2020 my $new_upstream_version = upstreamversion $new_version;
2022 resolve_upstream_version $new_upstream, $new_upstream_version;
2027 my ($n, @x) = @_; # may be ''
2028 my $pc = $pieces{$n} //= {
2030 Desc => ($n ? "upstream piece \`$n'" : "upstream (main piece"),
2032 while (my $k = shift @x) { $pc->{$k} = shift @x; }
2037 my $newpiece = sub {
2038 my ($n, @x) = @_; # may be ''
2039 my $pc = $piece->($n, @x, NewIx => (scalar @newpieces));
2040 push @newpieces, $pc;
2045 New => $new_upstream,
2047 while (@ARGV && $ARGV[0] !~ m{^-}) {
2048 my $n = shift @ARGV;
2050 badusage "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
2051 unless @ARGV && $ARGV[0] !~ m{^-};
2053 my $c = git_rev_parse shift @ARGV;
2054 die unless $n =~ m/^$extra_orig_namepart_re$/;
2055 $newpiece->($n, New => $c);
2058 # now we need to investigate the branch this generates the
2059 # laundered version but we don't switch to it yet
2060 my $old_head = get_head();
2061 my ($old_laundered_tip,$old_bw,$old_anchor) = walk $old_head;
2063 my $old_bw_cl = classify $old_bw;
2064 my $old_anchor_cl = classify $old_anchor;
2066 if (!$old_anchor_cl->{OrigParents}) {
2067 snag 'anchor-treated',
2068 'old anchor is recognised due to --anchor, cannot check upstream';
2070 $old_upstream = parsecommit
2071 $old_anchor_cl->{OrigParents}[0]{CommitId};
2072 $piece->('', Old => $old_upstream->{CommitId});
2075 if ($old_upstream && $old_upstream->{Msg} =~ m{^\[git-debrebase }m) {
2076 if ($old_upstream->{Msg} =~
2077 m{^\[git-debrebase upstream-combine (\.(?: $extra_orig_namepart_re)+)\:.*\]$}m
2079 my @oldpieces = (split / /, $1);
2080 my $old_n_parents = scalar @{ $old_upstream->{Parents} };
2081 if ($old_n_parents != @oldpieces &&
2082 $old_n_parents != @oldpieces + 1) {
2083 snag 'upstream-confusing', sprintf
2084 "previous upstream combine %s".
2085 " mentions %d pieces (each implying one parent)".
2086 " but has %d parents".
2087 " (one per piece plus maybe a previous combine)",
2088 $old_upstream->{CommitId},
2089 (scalar @oldpieces),
2091 } elsif ($oldpieces[0] ne '.') {
2092 snag 'upstream-confusing', sprintf
2093 "previous upstream combine %s".
2094 " first piece is not \`.'",
2098 foreach my $i (0..$#oldpieces) {
2099 my $n = $oldpieces[$i];
2100 my $hat = 1 + $i + ($old_n_parents - @oldpieces);
2101 $piece->($n, Old => $old_upstream->{CommitId}.'^'.$hat);
2105 snag 'upstream-confusing',
2106 "previous upstream $old_upstream->{CommitId} is from".
2107 " git-debrebase but not an \`upstream-combine' commit";
2111 foreach my $pc (values %pieces) {
2112 if (!$old_upstream) {
2113 # we have complained already
2114 } elsif (!$pc->{Old}) {
2115 snag 'upstream-new-piece',
2116 "introducing upstream piece \`$pc->{Name}'";
2117 } elsif (!$pc->{New}) {
2118 snag 'upstream-rm-piece',
2119 "dropping upstream piece \`$pc->{Name}'";
2120 } elsif (!is_fast_fwd $pc->{Old}, $pc->{New}) {
2121 snag 'upstream-not-ff',
2122 "not fast forward: $pc->{Name} $pc->{Old}..$pc->{New}";
2126 printdebug "%pieces = ", (dd \%pieces), "\n";
2127 printdebug "\@newpieces = ", (dd \@newpieces), "\n";
2135 my @upstream_merge_parents;
2138 push @upstream_merge_parents, $old_upstream->{CommitId};
2141 foreach my $pc (@newpieces) { # always has '' first
2143 read_tree_subdir $pc->{Name}, $pc->{New};
2145 runcmd @git, qw(read-tree), $pc->{New};
2147 push @upstream_merge_parents, $pc->{New};
2150 # index now contains the new upstream
2152 if (@newpieces > 1) {
2153 # need to make the upstream subtree merge commit
2154 $new_upstream = make_commit \@upstream_merge_parents,
2155 [ "Combine upstreams for $new_upstream_version",
2156 ("[git-debrebase upstream-combine . ".
2157 (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]).
2162 # $new_upstream is either the single upstream commit, or the
2163 # combined commit we just made. Either way it will be the
2164 # "upstream" parent of the anchor merge.
2166 read_tree_subdir 'debian', "$old_bw:debian";
2168 # index now contains the anchor merge contents
2169 $new_bw = make_commit [ $old_bw, $new_upstream ],
2170 [ "Update to upstream $new_upstream_version",
2171 "[git-debrebase anchor: new upstream $new_upstream_version, merge]",
2174 my $clogsignoff = cmdoutput qw(git show),
2175 '--pretty=format:%an <%ae> %aD',
2178 # Now we have to add a changelog stanza so the Debian version
2180 die if unlink "debian";
2181 die $! unless $!==ENOENT or $!==ENOTEMPTY;
2182 unlink "debian/changelog" or $!==ENOENT or die $!;
2183 mkdir "debian" or die $!;
2184 open CN, ">", "debian/changelog" or die $!;
2185 my $oldclog = git_cat_file ":debian/changelog";
2186 $oldclog =~ m/^($package_re) \(\S+\) / or
2187 fail "cannot parse old changelog to get package name";
2189 print CN <<END, $oldclog or die $!;
2190 $p ($new_version) UNRELEASED; urgency=medium
2192 * Update to new upstream version $new_upstream_version.
2198 runcmd @git, qw(update-index --add --replace), 'debian/changelog';
2200 # Now we have the final new breakwater branch in the index
2201 $new_bw = make_commit [ $new_bw ],
2202 [ "Update changelog for new upstream $new_upstream_version",
2203 "[git-debrebase changelog: new upstream $new_upstream_version]",
2207 # we have constructed the new breakwater. we now need to commit to
2208 # the laundering output, because git-rebase can't easily be made
2209 # to make a replay list which is based on some other branch
2211 update_head_postlaunder $old_head, $old_laundered_tip,
2212 'launder for new upstream';
2214 my @cmd = (@git, qw(rebase --onto), $new_bw, $old_bw, @ARGV);
2215 local $ENV{GIT_REFLOG_ACTION} = git_reflog_action_msg
2216 "debrebase new-upstream $new_version: rebase";
2218 # now it's for the user to sort out
2221 sub cmd_record_ffq_prev () {
2222 badusage "no arguments allowed" if @ARGV;
2223 my ($status, $msg) = record_ffq_prev_deferred();
2224 if ($status eq 'exists' && $opt_noop_ok) {
2225 print "Previous head already recorded\n" or die $!;
2226 } elsif ($status eq 'deferred') {
2227 run_deferred_updates 'record-ffq-prev';
2229 fail "Could not preserve: $msg";
2234 badusage "no arguments allowed" if @ARGV;
2235 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
2236 print "$bw\n" or die $!;
2239 sub cmd_breakwater () {
2240 badusage "no arguments allowed" if @ARGV;
2241 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
2242 print "$bw\n" or die $!;
2246 badusage "no arguments allowed" if @ARGV;
2248 # todo: gdr status should print divergence info
2249 # todo: gdr status should print upstream component(s) info
2250 # todo: gdr should leave/maintain some refs with this kind of info ?
2252 my $oldest = { Badness => 0 };
2255 my ($badness, $ourmsg, $snagname, $dummy, $cl, $kcmsg) = @_;
2256 if ($oldest->{Badness} < $badness) {
2257 $oldest = $newest = undef;
2260 Badness => $badness,
2261 CommitId => $cl->{CommitId},
2265 $newest //= $oldest;
2267 my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
2268 sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
2269 sub { $note->(2, 'branch is unlaundered', @_); },
2270 sub { $note->(3, 'branch needs laundering', @_); },
2271 sub { $note->(4, 'branch not in git-debrebase form', @_); };
2273 my $prcommitinfo = sub {
2275 flush STDOUT or die $!;
2276 runcmd @git, qw(--no-pager log -n1),
2277 '--pretty=format: %h %s%n',
2281 print "current branch contents, in git-debrebase terms:\n";
2282 if (!$oldest->{Badness}) {
2283 print " branch is laundered\n";
2285 print " $oldest->{OurMsg}\n";
2287 foreach my $info ($oldest, $newest) {
2288 my $cid = $info->{CommitId};
2289 next if $cid eq $printed;
2291 print " $info->{KcMsg}\n";
2292 $prcommitinfo->($cid);
2297 my ($cid, $what) = @_;
2298 if (!defined $cid) {
2299 print " $what is not well-defined\n";
2302 $prcommitinfo->($cid);
2305 print "key git-debrebase commits:\n";
2306 $prab->($anchor, 'anchor');
2307 $prab->($bw, 'breakwater');
2309 my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
2310 ffq_prev_branchinfo();
2312 print "branch and ref status, in git-debrebase terms:\n";
2314 print " $ffq_msg\n";
2316 $ffq_prev = git_get_ref $ffq_prev;
2317 $gdrlast = git_get_ref $gdrlast;
2319 print " unstitched; previous tip was:\n";
2320 $prcommitinfo->($ffq_prev);
2321 } elsif (!$gdrlast) {
2322 print " stitched? (no record of git-debrebase work)\n";
2323 } elsif (is_fast_fwd $gdrlast, 'HEAD') {
2324 print " stitched\n";
2326 print " not git-debrebase (diverged since last stitch)\n"
2329 print "you are currently rebasing\n" if currently_rebasing();
2333 my $prose = 'stitch';
2334 getoptions("stitch",
2335 'prose=s', \$prose);
2336 badusage "no arguments allowed" if @ARGV;
2337 do_stitch $prose, 0;
2339 sub cmd_prepush () {
2345 badusage "no arguments allowed" if @ARGV;
2346 do_launder_head 'launder for git-debrebase quick';
2350 sub cmd_conclude () {
2351 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
2352 if (!$ffq_prev_commitish) {
2353 fail "No ongoing git-debrebase session." unless $opt_noop_ok;
2356 my $dangling_head = get_head();
2358 badusage "no arguments allowed" if @ARGV;
2359 do_launder_head 'launder for git-debrebase quick';
2364 if (currently_rebasing()) {
2365 runcmd @git, qw(rebase --abort);
2366 push @deferred_updates, 'verify HEAD HEAD';
2367 # noop, but stops us complaining that scrap was a noop
2369 badusage "no arguments allowed" if @ARGV;
2370 my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
2372 if ($ffq_prev_commitish) {
2373 $scrapping_head = get_head();
2374 push @deferred_updates,
2375 "update $gdrlast $ffq_prev_commitish $git_null_obj",
2376 "update $ffq_prev $git_null_obj $ffq_prev_commitish";
2378 if (git_get_ref $merge_cache_ref) {
2379 push @deferred_updates,
2380 "delete $merge_cache_ref";
2382 if (!@deferred_updates) {
2383 fail "No ongoing git-debrebase session." unless $opt_noop_ok;
2387 if ($scrapping_head) {
2388 update_head_checkout $scrapping_head, $ffq_prev_commitish, "scrap";
2390 run_deferred_updates "scrap";
2394 sub make_patches_staged ($) {
2396 # Produces the patches that would result from $head if it were
2398 my ($secret_head, $secret_bw, $last_anchor) = walk $head;
2402 $any = gbp_pq_export 'bw', $secret_bw, $secret_head;
2407 sub make_patches ($) {
2409 keycommits $head, 0, \&snag;
2410 make_patches_staged $head;
2413 my $ptree = cmdoutput @git, qw(write-tree --prefix=debian/patches/);
2414 runcmd @git, qw(read-tree), $head;
2415 read_tree_subdir 'debian/patches', $ptree;
2416 $out = make_commit [$head], [
2417 'Commit patch queue (exported by git-debrebase)',
2418 '[git-debrebase make-patches: export and commit patches]',
2424 sub cmd_make_patches () {
2425 my $opt_quiet_would_amend;
2426 getoptions("make-patches",
2427 'quiet-would-amend!', \$opt_quiet_would_amend);
2428 badusage "no arguments allowed" if @ARGV;
2430 my $old_head = get_head();
2431 my $new = make_patches $old_head;
2432 my $d = get_differs $old_head, $new;
2434 fail "No (more) patches to export." unless $opt_noop_ok;
2436 } elsif ($d == D_PAT_ADD) {
2438 update_head_checkout $old_head, $new, 'make-patches';
2440 print STDERR failmsg
2441 "Patch export produced patch amendments".
2442 " (abandoned output commit $new).".
2443 " Try laundering first."
2444 unless $opt_quiet_would_amend;
2449 sub check_series_has_all_patches ($) {
2451 my $seriesfn = 'debian/patches/series';
2452 my ($dummy, $series) = git_cat_file "$head:$seriesfn",
2456 our $comments_snagged;
2457 foreach my $f (grep /\S/, grep {!m/^\s\#/} split /\n/, $series) {
2458 if ($f =~ m/^\s*\#/) {
2459 snag 'series-comments',
2460 "$seriesfn contains comments, which will be discarded"
2461 unless $comments_snagged++;
2464 fail "patch $f repeated in $seriesfn !" if $series{$f}++;
2466 foreach my $patchfile (get_tree "$head:debian/patches", 1,1) {
2467 my ($f,$i) = @$patchfile;
2468 next if $series{$f};
2469 next if $f eq 'series';
2470 snag 'unused-patches', "Unused patch file $f will be discarded";
2474 sub begin_convert_from () {
2475 my $head = get_head();
2476 my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo();
2478 fail "ffq-prev exists, this is already managed by git-debrebase!"
2479 if $ffq_prev && git_get_ref $ffq_prev;
2481 my $gdrlast_obj = $gdrlast && git_get_ref $gdrlast;
2482 snag 'already-converted',
2483 "ahead of debrebase-last, this is already managed by git-debrebase!"
2484 if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
2485 return ($head, { LastRef => $gdrlast, LastObj => $gdrlast_obj });
2488 sub complete_convert_from ($$$$) {
2489 my ($old_head, $new_head, $gi, $mrest) = @_;
2490 ffq_check $new_head;
2491 record_gdrlast $gi->{LastRef}, $new_head, $gi->{LastObj}
2494 update_head_checkout $old_head, $new_head, $mrest;
2497 sub cmd_convert_from_gbp () {
2498 badusage "want only 1 optional argument, the upstream git commitish"
2501 my $clogp = parsechangelog();
2502 my $version = $clogp->{'Version'}
2503 // die "missing Version from changelog";
2505 my ($upstream_spec) = @ARGV;
2507 my $upstream_version = upstreamversion $version;
2509 resolve_upstream_version($upstream_spec, $upstream_version);
2511 my ($old_head, $gdrlastinfo) = begin_convert_from();
2513 my $upsdiff = get_differs $upstream, $old_head;
2514 if ($upsdiff & D_UPS) {
2515 runcmd @git, qw(--no-pager diff --stat),
2516 $upstream, $old_head,
2517 qw( -- :!/debian :/);
2519 upstream ($upstream_spec) and HEAD are not
2520 identical in upstream files. See diffstat above, or run
2521 git diff $upstream_spec HEAD -- :!/debian :/
2525 if (!is_fast_fwd $upstream, $old_head) {
2526 snag 'upstream-not-ancestor',
2527 "upstream ($upstream) is not an ancestor of HEAD";
2529 my $wrong = cmdoutput
2530 (@git, qw(rev-list --ancestry-path), "$upstream..HEAD",
2531 qw(-- :/ :!/debian));
2532 if (length $wrong) {
2533 snag 'unexpected-upstream-changes',
2534 "history between upstream ($upstream) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?";
2535 print STDERR "list expected changes with: git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'\n";
2539 if ((git_cat_file "$upstream:debian")[0] ne 'missing') {
2540 snag 'upstream-has-debian',
2541 "upstream ($upstream) contains debian/ directory";
2544 check_series_has_all_patches $old_head;
2546 my $previous_dgit_view = eval {
2547 my @clogcmd = qw(dpkg-parsechangelog --format rfc822 -n2);
2549 parsechangelog_loop \@clogcmd, 'debian/changelog', sub {
2550 my ($stz, $desc) = @_;
2551 no warnings qw(exiting);
2552 printdebug 'CHANGELOG ', Dumper($desc, $stz);
2553 next unless $stz->{Date};
2554 next unless $stz->{Distribution} ne 'UNRELEASED';
2555 $lvsn = $stz->{Version};
2556 $suite = $stz->{Distribution};
2559 die "neither of the first two changelog entries are released\n"
2560 unless defined $lvsn;
2561 print "last finished-looking changelog entry: ($lvsn) $suite\n";
2562 my $mtag_pat = debiantag_maintview $lvsn, '*';
2563 my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
2565 die "could not find suitable maintainer view tag $mtag_pat\n"
2566 unless $mtag =~ m{/};
2567 is_fast_fwd $mtag, 'HEAD' or
2568 die "HEAD is not FF from maintainer tag $mtag!";
2569 my $dtag = "archive/$mtag";
2570 git_get_ref "refs/tags/$dtag" or
2571 die "dgit view tag $dtag not found\n";
2572 is_fast_fwd $mtag, $dtag or
2573 die "dgit view tag $dtag is not FF from maintainer tag $mtag\n";
2574 print "will stitch in dgit view, $dtag\n";
2575 git_rev_parse $dtag;
2577 if (!$previous_dgit_view) {
2581 Cannot confirm dgit view: $@
2582 Failed to stitch in dgit view (see messages above).
2583 dgit --overwrite will be needed on the first dgit push after conversion.
2587 snags_maybe_bail_early();
2593 runcmd @git, qw(checkout -q -b gdr-internal), $old_head;
2594 # make a branch out of the patch queue - we'll want this in a mo
2595 runcmd qw(gbp pq import);
2596 # strip the patches out
2597 runcmd @git, qw(checkout -q gdr-internal~0);
2598 rm_subdir_cached 'debian/patches';
2599 $work = make_commit ['HEAD'], [
2600 'git-debrebase convert-from-gbp: drop patches from tree',
2601 'Delete debian/patches, as part of converting to git-debrebase format.',
2602 '[git-debrebase convert-from-gbp: drop patches from tree]'
2604 # make the anchor merge
2605 # the tree is already exactly right
2606 $work = make_commit [$work, $upstream], [
2607 'git-debrebase import: declare upstream',
2608 'First breakwater merge.',
2609 '[git-debrebase anchor: declare upstream]'
2612 # rebase the patch queue onto the new breakwater
2613 runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal);
2614 runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal);
2615 $work = git_rev_parse 'HEAD';
2617 if ($previous_dgit_view) {
2618 $work = make_commit [$work, $previous_dgit_view], [
2619 'git-debrebase import: declare ff from dgit archive view',
2620 '[git-debrebase pseudomerge: import-from-gbp]',
2625 complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp';
2626 print <<END or die $!;
2627 git-debrebase: converted from patched-unapplied (gbp) branch format, OK
2631 sub cmd_convert_to_gbp () {
2632 badusage "no arguments allowed" if @ARGV;
2633 my $head = get_head();
2634 my (undef, undef, undef, $ffq, $gdrlast) = ffq_prev_branchinfo();
2635 my ($anchor, $breakwater) = keycommits $head, 0;
2636 my $out = $breakwater;
2637 my $any = make_patches_staged $head;
2640 $out = make_commit [$out], [
2641 'Commit patch queue (converted from git-debrebase format)',
2642 '[git-debrebase convert-to-gbp: commit patches]',
2646 # in this case, it can be fast forward
2650 push @deferred_updates, "delete $ffq";
2651 push @deferred_updates, "delete $gdrlast";
2654 update_head_checkout $head, $out, "convert to gbp (v0)";
2655 print <<END or die $!;
2656 git-debrebase: converted to git-buildpackage branch format
2657 git-debrebase: WARNING: do not now run "git-debrebase" any more
2658 git-debrebase: WARNING: doing so would drop all upstream patches!
2662 sub cmd_convert_from_dgit_view () {
2663 my $clogp = parsechangelog();
2665 my $bpd = (cfg 'dgit.default.build-products-dir',1) // '..';
2671 getoptions("convert-from-dgit-view",
2672 'diagnose!', \$diagnose,
2673 'build-products-dir:s', \$bpd,
2674 'origs!', \$do_origs,
2676 'always-convert-anyway!', \$always);
2677 fail "takes 1 optional argument, the upstream commitish" if @ARGV>1;
2682 my $spec = shift @ARGV;
2683 my $commit = git_rev_parse "$spec^{commit}";
2684 push @upstreams, { Commit => $commit,
2685 Source => "$ARGV[0], from command line",
2690 my ($head, $gdrlastinfo) = begin_convert_from();
2694 my $trouble = sub { $troubles++; };
2695 keycommits $head, sub{}, sub{}, $trouble, $trouble;
2696 printdebug "troubles=$troubles\n";
2699 $us: Branch already seems to be in git-debrebase format!
2700 $us: --always-convert-anyway would do the conversion operation anyway
2701 $us: but is probably a bad idea. Probably, you wanted to do nothing.
2703 fail "Branch already in git-debrebase format." unless $opt_noop_ok;
2708 check_series_has_all_patches $head;
2710 snags_maybe_bail_early();
2712 my $version = upstreamversion $clogp->{Version};
2713 print STDERR "Considering possible commits corresponding to upstream:\n";
2718 my $ups_tag = upstream_commitish_search $version, \@tried;
2720 my $this = "git tag $tried[-1]";
2721 push @upstreams, { Commit => $ups_tag,
2726 " git tag: no suitable tag found (tried %s)\n",
2731 my $p = $clogp->{'Source'};
2732 # we do a quick check to see if there are plausible origs
2734 if (!opendir BPD, $bpd) {
2735 die "$bpd: opendir: $!" unless $!==ENOENT;
2737 while ($!=0, my $f = readdir BPD) {
2738 next unless is_orig_file_of_p_v $f, $p, $version;
2740 " orig: found what looks like a .orig, %s\n",
2745 die "read $bpd: $!" if $!;
2749 my $tree = cmdoutput
2750 @dgit, qw(--build-products-dir), $bpd,
2751 qw(print-unapplied-treeish);
2754 runcmd @git, qw(reset --quiet), $tree, qw(-- .);
2755 rm_subdir_cached 'debian';
2756 $tree = cmdoutput @git, qw(write-tree);
2757 my $ups_synth = make_commit [], [ <<END, <<END,
2758 Import effective orig tree for upstream version $version
2760 This includes the contents of the .orig(s), minus any debian/ directory.
2762 [git-debrebase convert-from-dgit-view upstream-import-convert: $version]
2765 push @upstreams, { Commit => $ups_synth,
2766 Source => "orig(s) imported via dgit",
2771 " orig: no suitable origs found (looked for %s in %s)\n",
2772 "${p}_".(stripeoch $version)."...", $bpd;
2777 my $some_patches = stat_exists 'debian/patches/series';
2779 print STDERR "Evaluating possible commits corresponding to upstream:\n";
2782 foreach my $u (@upstreams) {
2786 runcmd @git, qw(reset --quiet), $u->{Commit}, qw(-- .);
2787 runcmd @git, qw(checkout), $u->{Commit}, qw(-- .);
2788 runcmd @git, qw(clean -xdff);
2789 runcmd @git, qw(checkout), $head, qw(-- debian);
2790 if ($some_patches) {
2791 rm_subdir_cached 'debian/patches';
2792 $work = make_commit [ $work ], [
2793 'git-debrebase convert-from-dgit-view: drop upstream changes from breakwater',
2794 "Drop upstream changes, and delete debian/patches, as part of converting\n".
2795 "to git-debrebase format. Upstream changes will appear as commits.",
2796 '[git-debrebase convert-from-dgit-view drop-patches]'
2799 $work = make_commit [ $work, $u->{Commit} ], [
2800 'git-debrebase convert-from-dgit-view: declare upstream',
2801 '(Re)constructed breakwater merge.',
2802 '[git-debrebase anchor: declare upstream]'
2804 runcmd @git, qw(checkout --quiet -b mk), $work;
2805 if ($some_patches) {
2806 runcmd @git, qw(checkout), $head, qw(-- debian/patches);
2807 runcmd @git, qw(reset --quiet);
2808 my @gbp_cmd = (qw(gbp pq import));
2810 my $gbp_err = "../gbp-pq-err";
2811 @gbp_cmd = shell_cmd "exec >$gbp_err 2>&1", @gbp_cmd;
2813 my $r = system @gbp_cmd;
2816 " %s: couldn't apply patches: gbp pq %s",
2817 $u->{Source}, waitstatusmsg();
2821 my $work = git_rev_parse qw(HEAD);
2822 my $diffout = cmdoutput @git, qw(diff-tree --stat HEAD), $work;
2823 if (length $diffout) {
2825 " $u->{Source}: applying patches gives different tree\n";
2826 print STDERR $diffout if $diagnose;
2830 $u->{Result} = $work;
2838 Could not find or construct a suitable upstream commit.
2839 Rerun adding --diagnose after convert-from-dgit-view, or pass a
2840 upstream commmit explicitly or provide suitable origs.
2844 printf STDERR "Yes, will base new branch on %s\n", $result->{Source};
2846 complete_convert_from $head, $result->{Result}, $gdrlastinfo,
2847 'convert-from-dgit-view';
2850 sub cmd_forget_was_ever_debrebase () {
2851 badusage "forget-was-ever-debrebase takes no further arguments" if @ARGV;
2852 my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
2853 ffq_prev_branchinfo();
2854 fail "Not suitable for recording git-debrebaseness anyway: $ffq_msg"
2855 if defined $ffq_msg;
2856 push @deferred_updates, "delete $ffq_prev";
2857 push @deferred_updates, "delete $gdrlast";
2859 run_deferred_updates "forget-was-ever-debrebase";
2862 sub cmd_record_resolved_merge () {
2863 badusage "record-resolved-merge takes no further arguments" if @ARGV;
2864 # MERGE-TODO needs documentation
2865 my $new = get_head();
2868 print "Checking how you have resolved the merge problem\n";
2869 my $nope = sub { print "Not $method: @_"; 0; };
2871 my $maybe = sub { print "Seems to be $method.\n"; };
2873 my ($key, $ref) = @_;
2874 reflog_cache_insert $merge_cache_ref, $key, $ref;
2875 print "OK. You can switch branches and try git-debrebase again.\n";
2879 fresh_workarea 'merge';
2881 $method = 'vanilla-merge patchqueue';
2882 my $vanilla = git_get_ref "$wrecknoteprefix/vanilla-merge";
2883 $vanilla or return $nope->("wreckage was not of vanilla-merge");
2884 foreach my $lr (qw(left right)) {
2885 my $n = "$wrecknoteprefix/$lr-patchqueue";
2886 my $lrpq = git_get_ref $n;
2887 $lrpq or return $nope->("wreckage did not contain patchqueues");
2888 is_fast_fwd $lrpq, $new or return $nope->("HEAD not ff of $n");
2891 my $newbase = git_get_ref "$wrecknoteprefix/new-base"
2892 or die "wreckage element $wrecknoteprefix/new-base missing";
2893 my $result = merge_series_patchqueue_convert
2895 $yes->("vanilla-merge $vanilla", $result);
2898 fail "No resolved merge method seems applicable.\n";
2902 sub cmd_downstream_rebase_launder_v0 () {
2903 badusage "needs 1 argument, the baseline" unless @ARGV==1;
2905 $base = git_rev_parse $base;
2906 my $old_head = get_head();
2907 my $current = $old_head;
2910 if ($current eq $base) {
2911 $topmost_keep //= $current;
2912 print " $current BASE stop\n";
2915 my $cl = classify $current;
2916 print " $current $cl->{Type}";
2918 my $p0 = $cl->{Parents}[0]{CommitId};
2920 if ($cl->{Type} eq 'Pseudomerge') {
2921 print " ^".($cl->{Contributor}{Ix}+1);
2922 $next = $cl->{Contributor}{CommitId};
2923 } elsif ($cl->{Type} eq 'AddPatches' or
2924 $cl->{Type} eq 'Changelog') {
2934 $topmost_keep //= $current;
2936 die "to-be stripped changes not on top of the branch\n"
2941 if ($topmost_keep eq $old_head) {
2942 print "unchanged\n";
2944 print "updating to $topmost_keep\n";
2945 update_head_checkout
2946 $old_head, $topmost_keep,
2947 'downstream-rebase-launder-v0';
2953 "D+" => \$debuglevel,
2954 'noop-ok', => \$opt_noop_ok,
2955 'f=s' => \@snag_force_opts,
2956 'anchor=s' => \@opt_anchors,
2957 '--dgit=s' => \($dgit[0]),
2959 'experimental-merge-resolution!', \$opt_merges,
2961 my ($opt,$val) = @_;
2962 badusage "git-debrebase: no cuddling to -i for git-rebase"
2964 die if $opt_defaultcmd_interactive; # should not happen
2965 $opt_defaultcmd_interactive = [ qw(-i) ];
2966 # This access to @ARGV is excessive familiarity with
2967 # Getopt::Long, but there isn't another sensible
2968 # approach. '-i=s{0,}' does not work with bundling.
2969 push @$opt_defaultcmd_interactive, @ARGV;
2972 'help' => sub { print $usage_message or die $!; finish 0; },
2975 initdebug('git-debrebase ');
2976 enabledebug if $debuglevel;
2978 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
2979 chdir $toplevel or die "chdir $toplevel: $!";
2981 $rd = fresh_playground "$playprefix/misc";
2983 @opt_anchors = map { git_rev_parse $_ } @opt_anchors;
2985 if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
2986 defaultcmd_rebase();
2988 my $cmd = shift @ARGV;
2991 $cmdfn = ${*::}{"cmd_$cmdfn"};
2993 $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";