3 # Script helping make fast-forwarding histories while still rebasing
4 # upstream deltas when working on Debian packaging
6 # Copyright (C)2017 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/>.
22 # git-debrebase status
23 # git-debrebase start # like ffqrebase start + debrebase launder
24 # git-debrebase new-upstream [stuff] # see below
25 # git-debrebase <git-rebase options> # does debrebase start if necessary
27 # git-debrebase analyse
28 # git-debrebase launder # prints breakwater tip
29 # git-debrebase create-new-upstream-breakwater [-f] <upstreaminfo>...
32 # [,][<subdir>:][+]<commitid>[,...]
34 # if initial comma is supplied, entries are not positional. Unspecified
35 # <subdir> means root (and there may be only one).
36 # xxx want auto branch names
39 # [+]<commit> [<subdir/> [+]<commit>...]
41 # --new-upstream-different-subtrees
44 # git-debrebase new-upstream
45 # - previous breakwater merge must be gdr-generated
46 # - orig set is the same as before
47 # - implicitly uses upstream branches according to orig set
48 # - not all upstream branches need be updated
49 # - insists on fast-forward of each branch, unless
50 # --force (or --force=<subdir>[/])
51 # branch set adjustments
52 # git-debrebase new-upstream --add <subdir>/
53 # git-debrebase new-upstream --rm <subdir>/
54 # git-debrebase new-upstream / [<subdir>/ ...]
55 # - orig set is adjusted
56 # - otherwise like auto (--add is not checked for ffness, obv)
57 # - multiple --add and --rm may be specified
58 # - --add makes new upstream the last contributor
60 # git-debrebase / [<rootcommitid>] [<subdir>/ [<commitid>] ...]
61 # - orig set is precisely as specified now
62 # - previous breakwater merge is irrelevant
63 # - no fast forward checks
64 # for now only explicit with commitids
66 # implicitly uses `upstream'
67 # # (or multiple other branches)
68 # git-debrebase new-upstream \
69 # [<subdir>/]=<commitid>
71 # UPSTREAM[,[[SUBDIR:]SUBUPSTREAM]
72 # default for SUBDIR: is from previous upstream merge[xxx terminology]
76 # when starting must record original start (for ff)
77 # and new rebase basis
79 # git-ffqrebase start [BASE]
80 # # records previous HEAD so it can be overwritten
81 # # records base for future git-ffqrebase
82 # git-ffqrebase set-base BASE
83 # git-ffqrebase <git-rebase options>
84 # git-ffqrebase finish
85 # git-ffqrebase status [BRANCH]
87 # refs/ffqrebase-prev/BRANCH BRANCH may be refs/...; if not it means
88 # refs/ffqrebase-base/BRANCH refs/heads/BRANCH
89 # zero, one, or both of these may exist
91 # git-debrebase without start, if already started, is willing
92 # to strip pseudomerges provided that they overwrite exactly
94 # xxxx is this right ? what matters is have we pushed
95 # I think in fact the right answer is:
96 # git-debrebase always strips out pseudomerges from its branch
97 # a pseudomerge is put in at the time we want to push
98 # at that time, we make a pseudomerge of the remote tracking
99 # branch (if raw git) or the dgit view (if dgit)
100 # for raw git git-ffqrebase, do want preciseley to record
101 # value of remote tracking branch or our branch, on start, so we
102 # overwrite only things we intend to
103 # the previous pseudomerge check for tags and remote branches ?
112 use Debian::Dgit qw(:DEFAULT $wa);
116 die "bad usage: $m\n";
122 my @cmd = qw(git config -z);
123 push @cmd, qw(--get-all) if wantarray;
125 my $out = cmdoutput @cmd;
126 return split /\0/, $out;
133 my ($type,$data) = git_cat_file $objid;
134 die unless $type eq 'commit';
135 $data =~ m/(?<=\n)\n/;
139 sub D_DEB () { return 0x1; } # debian/ (not including debian/patches/)
140 sub D_UPS () { return 0x2; } # upstream files
141 sub D_PAT_ADD () { return 0x4; } # debian/patches/ extra patches at end
142 sub D_PAT_OTH () { return 0x8; } # debian/patches other changes
144 our $rd = ".git/git-debrebase";
145 our $ud = "$rd/work";
148 sub get_differs ($$) {
150 # This resembles quiltify_trees_differ, in dgit, a bit. But: we
151 # don't care about modes, or dpkg-source-unrepresentable changes,
152 # and we don't need the plethora of different modes.
158 my ($opts, $sfx, $fn) = @_;
159 $opts //= [qw(--name-only)];
160 my @cmd = (@git, qw(diff-tree -z --no-renames));
162 push @cmd, "$_:$sfx" foreach $x, $y;
163 my $diffs = cmdoutput @bcmd, $x, $y;
164 foreach $f (split /\0/, $diffs) { $fn->(); }
167 $rundiff(undef, '', sub {
168 $differs |= $f eq 'debian' ? D_DEB : D_UPS;
171 if ($differs & D_DEB) {
173 $rundiff(undef, ':debian', sub {
174 $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB;
178 if ($differs & D_PAT_OTH) {
180 $differs &= ~D_PAT_OTH;
182 $differs |= D_PAT_OTH;
183 no qw(exiting); last;
185 $rundiff([qw(--name-status)], ':debian/patches', sub {
186 no warnings qw(exiting);
187 if (!defined $mode) {
189 } elsif ($mode eq 'A' && $f !~ m/^\w+\.series$/) {
190 } elsif ($mode eq 'M' && $f eq 'series') {
191 my $x_s = git_cat_file "$x:debian/patches/series", 'blob';
192 my $y_s = git_cat_file "$y:debian/patches/series", 'blob';
193 chomp $x_s; $x_s .= "\n";
194 $pat_oth->() unless $x_s = substr($y_s, 0, length $x_s);
206 sub commit_pr_info ($) {
208 return Data::Dumper->dump([$r], [qw(commit)]);
211 sub calculate_committer_authline () {
212 my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
213 'DUMMY COMMIT (git-debrebase)', "HEAD:";
214 my ($h,$m) = get_commit $c;
215 $h =~ m/^committer .*$/m or confess "($h) ?";
219 # classify returns an info hash like this
221 # Hdr => # commit headers, including 1 final newline
222 # Msg => # commit message (so one newline is dropped)
224 # Type => (see below)
226 # Ix => $index # ie 0, 1, 2, ...
228 # Differs => return value from get_differs
230 # IsDggitImport => 'orig' 'tarball' 'unpatched' 'package' (as from dgit)
232 # NewMsg => # commit message, but with any [dgit import ...] edited
233 # # to say "[was: ...]"
243 # has additional entres in classification result
244 # Overwritten = [ subset of Parents ]
245 # Contributor = $the_remaining_Parent
247 # DgitImportUnpatched
248 # has additional entry in classification result
249 # OrigParents = [ subset of Parents ]
251 # BreakwaterUpstreamMerge
252 # has additional entry in classification result
253 # OrigParents = [ subset of Parents ]
258 my ($h,$m) = get_commit $objid;
260 my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
261 my (@ph) = $h =~ m/^parent (\w+)$/m;
272 foreach my $ph (@ph) {
276 Differs => (get_differs $t, $ph),
281 my ($type, @rest) = @_;
282 $r = { %$r, Type => $type, @rest };
287 $r = { %$r, Type => qw(Unknown) };
292 my $d = $r->{Parents}[0]{Differs};
293 if ($d == D_PAT_ADD) {
294 return $classify->(qw(AddPatches));
295 } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
296 return $unknown->("edits debian/patches");
297 } elsif ($d == D_DEB) {
298 my ($ty,$dummy) = git_cat_file "$ph[0]:debian";
300 return $classify->(qw(Packaging));
301 } elsif ($ty eq 'missing') {
302 return $classify->(qw(BreakwaterStart));
304 return $unknown->("parent's debian is not a directory");
306 } elsif ($d == D_UPS) {
307 return $classify->(qw(Upstream));
308 } elsif ($d == (D_DEB|D_UPS)) {
309 return $classify->(qw(Mixed));
311 return $unknown->("no changes");
313 confess "internal error $objid ?";
317 return $unknown->("origin commit");
320 my @identical = grep { !$_->{Differs} } @p;
321 if (@p == 2 && @identical == 1) {
322 my @overwritten = grep { $_->{Differs} } @p;
323 confess "internal error $objid ?" unless @overwritten==1;
324 return $classify->(qw(Pseudomerge),
325 Overwritten => $overwritten[0],
326 Contributor => $identical[0]);
328 if (@p == 2 && @identical == 2) {
329 my @bytime = nsort_by {
330 my ($ph,$pm) = get_commit $_->{CommitId};
331 $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
334 return $classify->(qw(Pseudomerge),
335 SubType => qw(Ambiguous),
336 Overwritten => $bytime[0],
337 Contributor => $bytime[1]);
340 my ($p_h, $p_m) = get_commit $p;
341 $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
342 ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
344 my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
346 if (!(grep { !$_->{IsOrigin} } @p) and
347 (@orig_ps >= @p - 1) and
348 $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
350 return $classify->(qw(DgitImportUnpatched),
351 OrigParents => \@orig_ps);
354 my ($stype, $series) = git_cat_file "$t:debian/patches/series";
355 my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
357 # How to decide about l/r ordering of breakwater merges ? git
358 # --topo-order prefers to expand 2nd parent first. There's
359 # already an easy rune to look for debian/ history anyway (git log
360 # debian/) so debian breakwater branch should be 1st parent; that
361 # way also there's also an easy rune to look for the upstream
362 # patches (--topo-order).
365 !$p[0]{IsOrigin} && # breakwater merge never starts with an origin
366 !($p[0]{Differs} & ~D_DEB) &&
367 !($p[1]{Differs} & ~D_UPS)) {
368 return $classify->(qw(BreakwaterUpstreamMerge),
369 OrigParents => [ $p[1] ]);
371 # xxx multi-.orig upstreams
373 return $unknown->("complex merge");
379 $nogenerate,$report) = @_;
380 # => ($tip, $breakwater_tip)
381 # (or nothing, if $nogenerate)
383 # go through commits backwards
384 # we generate two lists of commits to apply:
385 # breakwater branch and upstream patches
386 my (@brw_cl, @upp_cl, @processed);
393 my ($appendinfo) = @_;
396 $ms .= "\n\n[git-debrebase $appendinfo]\n";
399 my $rewrite_from_here = sub {
400 my $sp_cl = { SpecialMethod => 'StartRewrite' };
401 push @brw_cl, $sp_cl;
402 push @processed, $sp_cl;
407 my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; };
410 return unless $report;
411 print $report $prdelim, @_;
415 my $bomb = sub { # usage: return $bomb->();
416 print $report " Unprocessable" if $report;
419 return (undef,undef);
421 die "commit $cur: Cannot cope with this commit";
427 my $build_start = sub {
428 my ($msg, $parent) = @_;
431 no warnings qw(exiting); last;
436 my $ty = $cl->{Type};
437 my $st = $cl->{SubType};
438 $prline->("$cl->{CommitId} $cl->{Type}");
439 $found{$ty. ( defined($st) ? "-$st" : '' )}++;
440 push @processed, $cl;
441 my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef;
442 if ($ty eq 'AddPatches') {
444 $rewrite_from_here->();
446 } elsif ($ty eq 'Packaging') {
450 } elsif ($ty eq 'BreakwaterStart') {
451 $build_start->('FirstPackaging', $cur);
452 } elsif ($ty eq 'Upstream') {
456 } elsif ($ty eq 'Mixed') {
459 my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
462 $queue->(\@brw_cl, "debian");
463 $queue->(\@upp_cl, "upstream");
464 $rewrite_from_here->();
467 } elsif ($ty eq 'Pseudomerge') {
468 print $report " Contributor=$ty->{Contributor}" if $report;
469 push @pseudomerges, $cl;
470 $rewrite_from_here->();
471 $cur = $ty->{Contributor};
473 } elsif ($ty eq 'BreakwaterUpstreamMerge') {
474 $build_start->("PreviousBreakwater", $cur);
475 } elsif ($ty eq 'DgitImportUnpatched') {
476 my $pm = $pseudomerges[-1];
478 # To an extent, this is heuristic. Imports don't have
479 # a useful history of the debian/ branch. We assume
480 # that the first pseudomerge after an import has a
481 # useful history of debian/, and ignore the histories
482 # from later pseudomerges. Often the first pseudomerge
483 # will be the dgit import of the upload to the actual
484 # suite intended by the non-dgit NMUer, and later
485 # pseudomerges may represent in-archive copies.
486 my $ovwrs = $pm->{Overwritten};
487 printf $report " PM=%s \@Overwr:%d", $pm, (scalar @$ovwrs)
492 my $ovwr = $ovwrs->[0]{CommitId};
493 printf $report " Overwr=%s", $ovwr if $report;
494 # This import has a tree which is just like a
495 # breakwater tree, but it has the wrong history. It
496 # ought to have the previous breakwater (which the
497 # pseudomerge overwrote) as an ancestor. That will
498 # make the history of the debian/ files correct. As
499 # for the upstream version: either it's the same as
500 # was ovewritten (ie, same as the previous
501 # breakwater), in which case that history is precisely
502 # right; or, otherwise, it was a non-gitish upload of a
503 # new upstream version. We can tell these apart by
504 # looking at the tree of the supposed upstream.
507 SpecialMethod => 'DgitImportDebianUpdate',
508 $xmsg->("convert dgit import: debian changes")
510 my $differs = (get_differs $ovwr, $cl->{Tree});
511 printf $report " Differs=%#x", $differs if $report;
512 if ($differs & D_UPS) {
513 printf $report " D_UPS" if $report;
514 # This will also trigger if a non-dgit git-based NMU
515 # deleted .gitignore (which is a thing that some of
516 # the existing git tools do if the user doesn't
517 # somehow tell them not to). Ah well.
520 SpecialMethod => 'DgitImportUpstreamUpdate',
521 $xmsg->("convert dgit import: upstream changes")
524 $prline->(" Import");
525 $rewrite_from_here->();
526 $upp_limit //= $#upp_cl; # further, deeper, patches discarded
530 # Everything is from this import. This kind of import
531 # is already in valid breakwater format, with the
532 # patches as commits.
533 printf $report " NoPM" if $report;
534 # last thing we processed will have been the first patch,
535 # if there is one; which is fine, so no need to rewrite
536 # on account of this import
537 $build_start->("ImportOrigin", $cur);
545 return if $nogenerate;
547 # Now we build it back up again
553 my $rm_tree_cached = sub {
555 runcmd @git, qw(rm --quiet -rf --cached), $subdir;
557 my $read_tree_debian = sub {
559 $rm_tree_cached->(qw(debian));
560 runcmd @git, qw(read-tree --prefix=debian/), "$treeish:debian";
562 my $read_tree_upstream = sub {
564 runcmd @git, qw(read-tree), $treeish;
565 $read_tree_debian->($build);
568 my $committer_authline = calculate_committer_authline();
571 mkdir $rd or $!==EEXIST or die $!;
573 foreach my $cl (qw(Debian), (reverse @brw_cl),
574 { SpecialMethod => 'RecordBreakwaterTip' },
575 qw(Upstream), (reverse @upp_cl)) {
577 $current_method = $cl;
580 my $method = $cl->{SpecialMethod} // $current_method;
581 my @parents = ($build);
582 my $cltree = $cl->{CommitId};
583 if ($method eq 'Debian') {
584 $read_tree_debian->($cltree);
585 } elsif ($method eq 'Upstream') {
586 $read_tree_upstream->($cltree);
587 } elsif ($method eq 'StartRewrite') {
590 } elsif ($method eq 'RecordBreakwaterTip') {
591 $breakwater = $build;
593 } elsif ($method eq 'DgitImportDebianUpdate') {
594 $read_tree_debian->($cltree);
595 $rm_tree_cached->(qw(debian/patches));
596 } elsif ($method eq 'DgitImportUpstreamUpdate') {
597 $read_tree_upstream->($cltree);
598 push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
602 $rewriting ||= $cl ne pop @processed;
603 my $newtree = cmdoutput @git, qw(write-tree);
605 $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
606 $ch =~ s{^parent .*\n}{}m;
607 $ch =~ s{(?=^author)}{
608 map { "parent $_\n" } @parents
609 }me or confess "$ch ?";
611 $ch =~ s{^committer .*$}{$committer_authline}m
614 my $cf = "$rd/m$rewriting";
615 open CD, ">", $cf or die $!;
616 print CD $ch, "\n", $cl->{Msg} or die $!;
618 my @cmd = (@git, qw(hash-object));
619 push @cmd, qw(-w) if $rewriting;
620 push @cmd, qw(-t commit), $cf;
621 my $newcommit = cmdoutput @cmd;
622 confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId};
627 runcmd @git, qw(diff-tree --quiet), $input, $build;
629 return ($build, $breakwater);
632 sub get_head () { return git_rev_parse qw(HEAD); }
634 sub update_head ($$$) {
635 my ($old, $new, $mrest) = @_;
636 runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
640 badusage "no arguments to launder allowed";
641 my $old = get_head();
642 my ($tip,$breakwater) = walk $old;
643 update_head $old, $tip, 'launder';
644 # no tree changes except debian/patches
645 runcmd @git, qw(rm --quiet -rf debian/patches);
646 printf "# breakwater tip\n%s\n", $breakwater;
650 die if ($ARGV[0]//'') =~ m/^-/;
651 badusage "too many arguments to analyse" if @ARGV>1;
654 $old = git_rev_parse $old;
658 my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
659 print "$breakwater BREAKWATER\n";
660 STDOUT->error and die $!;
663 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
664 chdir $toplevel or die "chdir $toplevel: $!";
666 my $cmd = shift @ARGV;
669 $cmdfn = ${*::}{"cmd_$cmdfn"};
671 $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";