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 # the previous pseudomerge check for tags and remote branches ?
102 use Debian::Dgit qw(:DEFAULT $wa);
107 my @cmd = qw(git config -z);
108 push @cmd, qw(--get-all) if wantarray;
110 my $out = cmdoutput @cmd;
111 return split /\0/, $out;
118 my ($type,$data) = git_cat_file $objid;
119 die unless $type eq 'commit';
120 $data =~ m/(?<=\n)\n/;
124 sub D_DEB () { return 0x1; } # debian/ (not including debian/patches/)
125 sub D_UPS () { return 0x2; } # upstream files
126 sub D_PAT_ADD () { return 0x4; } # debian/patches/ extra patches at end
127 sub D_PAT_OTH () { return 0x8; } # debian/patches other changes
129 our $rd = ".git/git-debrebase";
130 our $ud = "$rd/work";
132 sub commit_pr_info ($) {
134 return Data::Dumper->dump([$r], [qw(commit)]);
137 sub calculate_committer_authline () {
138 my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m),
139 'DUMMY COMMIT (git-debrebase)', "$basis:";
140 my ($h,$m) = get_commit $c;
141 $h =~ m/^committer .*$/m or confess "($h) ?";
145 # classify returns an info hash like this
147 # Hdr => # commit headers, including 1 final newline
148 # Msg => # commit message (so one newline is dropped)
150 # Type => (see below)
152 # Ix => $index # ie 0, 1, 2, ...
154 # Differs => return value from get_differs
156 # IsDggitImport => 'orig' 'tarball' 'unpatched' 'package' (as from dgit)
158 # NewMsg => # commit message, but with any [dgit import ...] edited
159 # # to say "[was: ...]"
169 # has additional entres in classification result
170 # Overwritten = [ subset of Parents ]
171 # Contributor = $the_remaining_Parent
173 # DgitImportUnpatched
174 # has additional entry in classification result
175 # OrigParents = [ subset of Parents ]
177 # BreakwaterUpstreamMerge
178 # has additional entry in classification result
179 # OrigParents = [ subset of Parents ]
184 my ($h,$m) = get_commit $objid;
186 my ($t) = $h =~ m/^tree (\w+)$/m or die $cur;
187 my (@ph) = $h =~ m/^parent (\w+)$/m;
198 foreach my $ph (@ph) {
202 Differs => (get_differs $t, $ph),
207 my ($type, @rest) = @_;
208 $r = { %r, Type => $type, @rest };
213 $r = { %r, Type => Unknown };
218 my $d = $r->{Parents}[0]{Differs};
219 if ($d == D_DPAT_ADD) {
220 return $classify->(qw(AddPatches));
221 } elsif ($d & (D_DPAT_ADD|D_DPAT_OTH)) {
222 return $unknown->("edits debian/patches");
223 } elsif ($d == D_DEB) {
224 return $classify->(qw(Packaging));
225 } elsif ($d == D_UPS) {
226 return $classify->(qw(Upstream));
227 } elsif ($d == D_DEB|D_UPS) {
228 return $classify->(qw(Mixed));
230 return $unknown->("no changes");
232 confess "internal error $objid ?";
236 return $unknown->("origin commit");
239 my @identical = grep { !$_->{Differs} } @p;
240 if (@p == 2 && @identical == 1) {
241 my @overwritten = grep { $_->{Differs} } @p;
242 confess "internal error $objid ?" unless @overwritten==1;
243 return $classify->(qw(Pseudomerge),
244 Overwritten => $overwritten[0],
245 Contributor => $identical[0]);
247 if (@p == 2 && @identical == 2) {
248 my @bytime = nsort_by {
249 my ($ph,$pm) = get_commit $_->{CommitId};
250 $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
253 return $classify->(qw(Pseudomerge),
254 SubType => qw(Ambiguous),
255 Overwritten => $bytime[0],
256 Contributor => $bytime[1]);
259 my ($p_h, $p_m) = get_commit $p;
260 $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
261 ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
263 my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' };
265 if (!(grep { !$_->{IsOrigin} } @p) and
266 (@origs >= @p - 1) and
267 $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
269 return $classify->(qw(DgitImportUnpatched),
270 OrigParents => \@orig_ps);
273 my ($stype, $series) = git_cat_file "$t:debian/patches/series";
274 my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
276 # How to decide about l/r ordering of breakwater merges ? git
277 # --topo-order prefers to expand 2nd parent first. There's
278 # already an easy rune to look for debian/ history anyway (git log
279 # debian/) so debian breakwater branch should be 1st parent; that
280 # way also there's also an easy rune to look for the upstream
281 # patches (--topo-order).
284 !$p[0]{IsOrigin} && # breakwater merge never starts with an origin
285 !($p[0]{Differs} & ~D_DEB) &&
286 !($p[1]{Differs} & ~D_UPS)) {
287 return $classify->(qw(BreakwaterUpstreamMerge),
288 OrigParents => [ $p[1] ]);
290 # xxx multi-.orig upstreams
292 return $unknown->("complex merge");
296 my ($input, $pseudos_must_overwrite_this, $wantdebonly,
297 $report, $depth, $report_anomaly, $report_only) = @_;
298 # go through commits backwards
299 # we generate two lists of commits to apply
300 # => ($tip, $breakwater_tip)
301 my (@deb_cl, @ups_cl, @processed);
306 $report_anomaly //= sub {
308 die "commit $cl: $msg\n";
314 my ($appendinfo) = @_;
317 $ms .= "\n\n[git-debrebase $appendinfo]\n";
320 my $rewrite_from_here = sub {
321 push @processed, { SpecialMethod => 'StartRewrite' };
328 my $ty = $cl->{Type};
329 my $st = $cl->{SubType};
331 $found{$ty. ( defined($st) ? "-$st" : '' )}++;
332 push @processed, $cl;
333 my $p0 = $cl->{Parents}[0]{CommitId};
334 if ($ty eq 'AddPatches') {
336 $rewrite_from_here->();
338 } elsif ($ty eq 'Packaging') {
342 } elsif ($ty eq 'Upstream') {
346 } elsif ($ty eq 'Mixed') {
349 my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
352 $queue->(\@deb_cl, "debian");
353 $queue->(\@ups_cl, "upstream");
354 $rewrite_from_here->();
356 } elsif ($ty eq 'Pseudomerge') {
357 if (defined $pseudos_must_overwrite_this &&
359 is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
361 @{ $cl->{Overwritten} }) {
362 $report_anomaly->($cl,
363 "Pseudomerge should overwrite".
364 " $pseudos_must_overwrite_this".
365 " but does not do so");
367 push @pseudomerges, $cl;
368 $rewrite_from_here->();
369 $cur = $ty->{Contributor};
371 } elsif ($ty eq 'BreakwaterUpstreamMerge') {
374 } elsif ($ty eq 'DgitImportUnpatched' &&
375 @pseudomerges == 1) {
376 # This import has a tree which is just like a breakwater
377 # tree, but it has the wrong history. Its ought to have
378 # the previous breakwater (which dgit ought to have
379 # generated a pseudomerge to overwrite) as an ancestor.
380 # That will make the history of the debian/ files correct.
381 # As for the upstream version: either it's the same upstream
382 # as the previous breakwater, in which case that history is
383 # precisely right. Otherwise, it was a non-gitish upload
384 # of a new upstream version. We can tell these apart
385 # by looking at the tree of the supposed upstream.
386 my $differs = get_differs $previous_breakwater, $cl->{Tree};
387 if ($differs & D_UPS) {
390 SpecialMethod => 'DgitImportUpstreamUpdate',
391 $xmsg->("convert dgit import: debian changes")
396 SpecialMethod => 'DgitImportDebianUpdate',
397 $xmsg->("convert dgit import: upstream changes")
399 $basis = launder $pseudomerges[0]{Overwritten}, undef, 1,
400 $report, $depth+1, $nogenerate;
401 $rewrite_from_here->();
404 $report_anomaly->($cl, "Cannot cope with this commit");
407 # Now we build it back up again
410 return (undef, $basis);
419 my $rm_tree_cached = sub {
421 runcmd @git, qw(rm --quiet -rf --cached), $subdir;
423 my $read_tree_debian = sub {
425 $rm_tree_cached->(qw(debian));
426 runcmd @git, qw(read-tree --prefix=debian/), "$treeish:debian";
428 my $read_tree_upstream = sub {
430 runcmd @git, qw(read-tree), $treeish;
431 $read_tree_debian->($build);
434 my $committer_authline = calculate_committer_authline();
437 mkdir $rd or $!==EEXIST or die $!;
439 foreach my $cl (qw(Debian), (reverse @deb_cl),
440 { SpecialMethod => 'RecordBreakwaterTip' },
441 qw(Upstream), (reverse @ups_cl)) {
443 $current_method = $cl;
446 $method = $cl->{SpecialMethod} // $current_method;
447 my @parents = ($build);
448 my $cltree = $cl->{CommitId}
449 if ($method eq 'Debian') {
450 $read_tree_debian->($cltree);
451 } elsif ($method eq 'Upstream') {
452 $read_tree_upstream->($cltree);
453 } elsif ($method eq 'StartRewrite') {
456 } elsif ($method eq 'RecordBreakwaterTip') {
457 last if $wantdebonly;
458 $breakwater = $build;
460 } elsif ($method eq 'DgitImportDebianUpdate') {
461 $read_tree_debian->($cltree);
462 $rm_tree_cached(qw(debian/patches));
463 } elsif ($method eq 'DgitImportUpstreamUpdate') {
464 $read_tree_upstream->($cltree);
465 push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
469 $rewriting ||= $cl ne pop @processed;
470 my $newtree = cmdoutput @git, qw(write-tree);
472 $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
473 $ch =~ s{^parent .*\n}{}m;
474 $ch =~ s{(?=^author}{
475 map { "parent $_\n" } @parents
476 }me or confess "$ch ?";
478 $ch =~ s{^committer .*$}{$committer_authline}m
481 my $cf = "$rd/m$rewrite"
482 open CD, ">", $cf or die $!;
483 print CD $ch, "\n", $cl->{Msg}; or die $!;
485 my @cmd = (@git, qw(hash-object));
486 push @cmd, qw(-w) if $rewrite;
487 push @cmd, qw(-t commit), $cf;
488 my $newcommit = cmdoutput @cmd;
489 confess "$ch ?" unless $rewrite or $newcommit eq $cl->{CommitId};
494 runcmd @git, qw(diff-tree --quiet),
495 map { $wantdebonly ? "$_:debian" : $_ },
498 return ($build, $breakwater);
501 sub get_head () { return git_rev_parse qw(HEAD); }
503 sub update_head ($$) {
504 my ($old, $new, $mrest) = @_;
505 runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
512 my $old = get_head();
513 my ($tip,$breakwater) = launder $old, 0, undef, 0;
514 update_head $old, $tip, 'launder';
515 # no tree changes except debian/patches
516 runcmd @git, qw(rm --quiet -rf debian/patches);
517 printf "# breakwater tip:\n%s\n", $breakwater;
520 my $toplevel = runcmd @git, qw(rev-parse --show-toplevel);
521 chdir $toplevel or die "chdir $toplevel: $!";
523 my $cmd = shift @ARGV;
526 $cmdfn = ${*::}{"cmd_$cmdfn"};
528 $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";