X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=7b64bf51f5cf65ff6957ecab6cd784ff24af8535;hp=d6bd8a5148c356380d4ec196d57260e7fa3e5669;hb=85644f90c4b887d4b60b175f6cda8446e1e5bd29;hpb=b11760cf2a4d85e63085db5ed504804e6ffe36a8 diff --git a/git-debrebase b/git-debrebase index d6bd8a51..7b64bf51 100755 --- a/git-debrebase +++ b/git-debrebase @@ -236,7 +236,14 @@ sub classify ($) { } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) { return $unknown->("edits debian/patches"); } elsif ($d == D_DEB) { - return $classify->(qw(Packaging)); + my ($ty,$dummy) = git_cat_file "$ph[0]:debian"; + if ($ty eq 'tree') { + return $classify->(qw(Packaging)); + } elsif ($ty eq 'missing') { + return $classify->(qw(BreakwaterStart)); + } else { + return $unknown->("parent's debian is not a directory"); + } } elsif ($d == D_UPS) { return $classify->(qw(Upstream)); } elsif ($d == (D_DEB|D_UPS)) { @@ -307,20 +314,21 @@ sub classify ($) { return $unknown->("complex merge"); } -sub walk ($;$$$$); +sub walk ($;$$); sub walk { my ($input, - $nogenerate,$report, - $wantdebonly,$depth) = @_; - # go through commits backwards - # we generate two lists of commits to apply + $nogenerate,$report) = @_; # => ($tip, $breakwater_tip) - my (@deb_cl, @ups_cl, @processed); + # (or nothing, if $nogenerate) + + # go through commits backwards + # we generate two lists of commits to apply: + # breakwater branch and upstream patches + my (@brw_cl, @upp_cl, @processed); my %found; + my $upp_limit; my @pseudomerges; - $depth //= 0; - my $cl; my $xmsg = sub { my ($appendinfo) = @_; @@ -330,36 +338,60 @@ sub walk { return (Msg => $ms); }; my $rewrite_from_here = sub { - push @processed, { SpecialMethod => 'StartRewrite' }; + my $sp_cl = { SpecialMethod => 'StartRewrite' }; + push @brw_cl, $sp_cl; + push @processed, $sp_cl; + }; + my $build_start = sub { + my ($msg, $parents) = @_; + $prline->(" $msg"); + push @brw_cl, { ExactlyParents => $parents }; + no qw(exiting); last; }; my $cur = $input; - my $basis; my $prdelim = ""; my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; }; + my $prline = sub { + return unless $report; + print $report $prdelim, @_; + $prdelim = "\n"; + }; + + my $bomb = sub { # usage: return $bomb->(); + print $report " Unprocessable" if $report; + $prprdelim->(); + if ($nogenerate) { + return (undef,undef); + } + die "commit $cur: Cannot cope with this commit"; + }; + for (;;) { + if (!defined $cur) { + $build_start->('Origin', []); + } $cl = classify $cur; my $ty = $cl->{Type}; my $st = $cl->{SubType}; - if ($report) { - print $report $prdelim, "$cl->{CommitId} $cl->{Type}"; - $prdelim = "\n"; - } + $prline->("$cl->{CommitId} $cl->{Type}"); $found{$ty. ( defined($st) ? "-$st" : '' )}++; push @processed, $cl; - my $p0 = $cl->{Parents}[0]{CommitId}; + my $p0 = @{ $cl->{Parents} }==1 ? $cl->{Parents}[0]{CommitId} : undef; if ($ty eq 'AddPatches') { $cur = $p0; $rewrite_from_here->(); next; } elsif ($ty eq 'Packaging') { - push @deb_cl, $cl; + push @brw_cl, $cl; $cur = $p0; next; + } elsif ($ty eq 'BreakwaterStart') { + $build_start('FirstPackaging',[$cur]}; } elsif ($ty eq 'Upstream') { - push @ups_cl, $cl; + push @upp_cl, $cl; $cur = $p0; next; } elsif ($ty eq 'Mixed') { @@ -368,9 +400,10 @@ sub walk { my $cls = { $cl, $xmsg->("split mixed commit: $wh part") }; push @$q, $cls; }; - $queue->(\@deb_cl, "debian"); - $queue->(\@ups_cl, "upstream"); + $queue->(\@brw_cl, "debian"); + $queue->(\@upp_cl, "upstream"); $rewrite_from_here->(); + $cur = $p0; next; } elsif ($ty eq 'Pseudomerge') { print $report " Contributor=$ty->{Contributor}" if $report; @@ -379,55 +412,78 @@ sub walk { $cur = $ty->{Contributor}; next; } elsif ($ty eq 'BreakwaterUpstreamMerge') { - $basis = $cur; - last; - } elsif ($ty eq 'DgitImportUnpatched' && - @pseudomerges == 1) { - # This import has a tree which is just like a breakwater - # tree, but it has the wrong history. Its ought to have - # the previous breakwater (which dgit ought to have - # generated a pseudomerge to overwrite) as an ancestor. - # That will make the history of the debian/ files correct. - # As for the upstream version: either it's the same upstream - # as the previous breakwater, in which case that history is - # precisely right. Otherwise, it was a non-gitish upload - # of a new upstream version. We can tell these apart - # by looking at the tree of the supposed upstream. - my $differs = get_differs $previous_breakwater, $cl->{Tree}; - printf $report " Differs=%#x", $differs if $report; - if ($differs & D_UPS) { - printf $report " D_UPS" if $report; - push @deb_cl, { - %$cl, - SpecialMethod => 'DgitImportUpstreamUpdate', + $build_start->("PreviousBreakwater", [$cur]); + } elsif ($ty eq 'DgitImportUnpatched') { + my $pm = $pseudomerges[-1]; + if (defined $pm) { + # To an extent, this is heuristic. Imports don't have + # a useful history of the debian/ branch. We assume + # that the first pseudomerge after an import has a + # useful history of debian/, and ignore the histories + # from later pseudomerges. Often the first pseudomerge + # will be the dgit import of the upload to the actual + # suite intended by the non-dgit NMUer, and later + # pseudomerges may represent in-archive copies. + my $ovwrs = $pm->{Overwritten}; + printf $report " PM=%s \@Overwr:%d", $pm, (scalar @$ovwrs) + if $report; + if (@$ovwrs != 1) { + return $bomb->(); + } + my $ovwr = $ovwrs->[0]{CommitId}; + printf $report " Overwr=%s", $ovwr if $report; + # This import has a tree which is just like a + # breakwater tree, but it has the wrong history. It + # ought to have the previous breakwater (which the + # pseudomerge overwrote) as an ancestor. That will + # make the history of the debian/ files correct. As + # for the upstream version: either it's the same as + # was ovewritten (ie, same as the previous + # breakwater), in which case that history is precisely + # right; or, otherwise, it was a non-gitish upload of a + # new upstream version. We can tell these apart by + # looking at the tree of the supposed upstream. + push @brw_cl, { + %$cl, + SpecialMethod => 'DgitImportDebianUpdate', $xmsg->("convert dgit import: debian changes") - }; - } - push @deb_cl, { - %$cl, - SpecialMethod => 'DgitImportDebianUpdate', - $xmsg->("convert dgit import: upstream changes") - }; - $prprdelim->(); - $basis = walk - $pseudomerges[0]{Overwritten}, - $nogenerate, $report, - 1, $depth+1; - $rewrite_from_here->(); - last; - } else { - print $report " Unprocessable" if $report; - $prprdelim->(); - if ($nogenerate) { - return (undef,undef); + }; + my $differs = (get_differs $ovwr, $cl->{Tree}); + printf $report " Differs=%#x", $differs if $report; + if ($differs & D_UPS) { + printf $report " D_UPS" if $report; + # This will also trigger if a non-dgit git-based NMU + # deleted .gitignore (which is a thing that some of + # the existing git tools do if the user doesn't + # somehow tell them not to). Ah well. + push @brw_cl, { + %$cl, + SpecialMethod => 'DgitImportUpstreamUpdate', + $xmsg->("convert dgit import: upstream changes") + }; + } + $prline->(" Import"); + $rewrite_from_here->(); + $upp_limit //= $#upp; # further, deeper, patches discarded + $cur = $ovwr; + next; + } else { + # Everything is from this import. This kind of import + # is already in valid breakwater format, with the + # patches as commits. + printf $report " NoPM" if $report; + # last thing we processed will have been the first patch, + # if there is one; which is fine, so no need to rewrite + # on account of this import + $build_start->("ImportOrigin",[$cur]); } - die "commit $cur: Cannot cope with this commit"; + die "$ty ?"; + } else { + return $bomb->(); } } $prprdelim->(); - if ($nogenerate) { - return (undef, $basis); - } + return if $nogenerate; # Now we build it back up again @@ -457,9 +513,9 @@ sub walk { in_workarea sub { mkdir $rd or $!==EEXIST or die $!; my $current_method; - foreach my $cl (qw(Debian), (reverse @deb_cl), + foreach my $cl (qw(Debian), (reverse @brw_cl), { SpecialMethod => 'RecordBreakwaterTip' }, - qw(Upstream), (reverse @ups_cl)) { + qw(Upstream), (reverse @upp_cl)) { if (!ref $cl) { $current_method = $cl; next; @@ -475,7 +531,7 @@ sub walk { $rewriting = 1; next; } elsif ($method eq 'RecordBreakwaterTip') { - last if $wantdebonly; + last if $wantbrwonly; $breakwater = $build; next; } elsif ($method eq 'DgitImportDebianUpdate') {