X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=f93adefc49e830a09d8422df95673e42099ff1d2;hp=3d8d6f33a5669c425721a55c3d1da2943308874f;hb=a1a9073c083036f1c3fd024c3b96ecbccd6b424c;hpb=99068bbe18c8fe83714639cc4ba9adcab5d71e59 diff --git a/git-debrebase b/git-debrebase index 3d8d6f33..f93adefc 100755 --- a/git-debrebase +++ b/git-debrebase @@ -263,11 +263,15 @@ sub read_tree_debian ($) { rm_subdir_cached 'debian/patches'; } -sub read_tree_upstream ($;$) { - my ($treeish, $keep_patches) = @_; - my $save = cmdoutput @git, qw(write-tree --prefix=debian/); +sub read_tree_upstream ($;$$) { + my ($treeish, $keep_patches, $tree_with_debian) = @_; + # if $tree_with_debian is supplied, will use that for debian/ + # otherwise will save and restore it. + my $debian = + $tree_with_debian ? "$tree_with_debian:debian" + : cmdoutput @git, qw(write-tree --prefix=debian/); runcmd @git, qw(read-tree), $treeish; - read_tree_subdir 'debian', $save; + read_tree_subdir 'debian', $debian; rm_subdir_cached 'debian/patches' unless $keep_patches; }; @@ -391,8 +395,8 @@ sub merge_series ($$;@) { foreach my $q ($base_q, reverse @input_qs) { my $s = $q->{MR}{S}; gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip}; + my @earlier; if (open S, $seriesfile) { - my @earlier; while (my $patch = ) { chomp $patch or die $!; $prereq{$patch} //= {}; @@ -420,6 +424,20 @@ sub merge_series ($$;@) { "[git-debrebase merge-innards patch-queue prep:". " $q->{SeriesTip}]" ]; + + read_tree_debian $newbase; + if (@earlier) { + read_tree_subdir 'debian/patches', "$pec:debian/patches"; + } else { + rm_subdir_cached 'debian/patches'; + } + $pec = make_commit [ $pec ], [ + "Update debian/ (excluding patches) to final to avoid re-merging", + "debian/ was already merged and we need to just take that.", + "[git-debrebase merge-innards patch-queue packaging:". + " $q->{SeriesTip}]" + ]; + printdebug "pec' $pec\n"; runcmd @git, qw(reset -q --hard), $pec; $q->{MR}{PEC} = $pec; @@ -518,7 +536,7 @@ sub merge_series ($$;@) { foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) { my $commit = git_cat_file $c, 'commit'; printdebug "merge_series series ok, building $c\n"; - read_tree_upstream $c; + read_tree_upstream $c, 0, $newbase; my $tree = cmdoutput @git, qw(write-tree); $commit =~ s{^parent (\S+)$}{parent $build}m or confess; $commit =~ s{^tree (\S+)$}{tree $tree}m or confess; @@ -529,6 +547,13 @@ sub merge_series ($$;@) { } $result = $build; runcmd @git, qw(update-ref refs/heads/result), $result; + + runcmd @git, qw(checkout -q -b debug); + runcmd @git, qw(commit --allow-empty -q -m M-INDEX); + runcmd @git, qw(add .); + runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE); + printdebug sprintf "merge_series done debug=%s\n", + git_rev_parse 'HEAD'; }; printdebug "merge_series returns $result\n"; return $result; @@ -810,8 +835,25 @@ sub classify ($) { return $classify->("VanillaMerge"); } -sub keycommits ($;$$$$) { - my ($head, $furniture, $unclean, $trouble, $fatal) = @_; +sub keycommits ($;$$$$$); + +sub mergedbreakwaters_anchor ($) { + my ($cl) = @_; + my $best_anchor; + foreach my $p (@{ $cl->{Parents} }) { + my ($panchor, $pbw) = keycommits $p->{CommitId}, + undef,undef,undef,undef, 1; + $best_anchor = $panchor + if !defined $best_anchor + or is_fast_fwd $best_anchor, $panchor; + fail "inconsistent anchors in merged-breakwaters $p->{CommitId}" + unless is_fast_fwd $panchor, $best_anchor; + } + return $best_anchor; +} + +sub keycommits ($;$$$$$) { + my ($head, $furniture, $unclean, $trouble, $fatal, $claimed_bw) = @_; # => ($anchor, $breakwater) # $unclean->("unclean-$tagsfx", $msg, $cl) @@ -827,6 +869,8 @@ sub keycommits ($;$$$$) { # $fatal is for unprocessable commits, and should normally cause # a failure. If ignored, agaion, (undef, undef) is returned. # + # If $claimed_bw, this is supposed to be a breakwater commit. + # # If a callback is undef, fail is called instead. # If a callback is defined but false, the situation is ignored. # Callbacks may say: @@ -834,6 +878,7 @@ sub keycommits ($;$$$$) { # if the answer is no longer wanted. my ($anchor, $breakwater); + $breakwater = $head if $claimed_bw; my $clogonly; my $cl; my $found_pm; @@ -846,6 +891,13 @@ sub keycommits ($;$$$$) { return unless $cb; $cb->("unclean-$tagsfx", $why, $cl, $mainwhy); }; + my $found_anchor = sub { + ($anchor) = @_; + $breakwater //= $clogonly; + $breakwater //= $head; + no warnings qw(exiting); + last; + }; for (;;) { $cl = classify $head; my $ty = $cl->{Type}; @@ -859,10 +911,7 @@ sub keycommits ($;$$$$) { } elsif ($ty eq 'Anchor' or $ty eq 'TreatAsAnchor' or $ty eq 'BreakwaterStart') { - $anchor = $head; - $breakwater //= $clogonly; - $breakwater //= $head; - last; + $found_anchor->($head); } elsif ($ty eq 'Upstream') { $x->($unclean, 'ordering', "packaging change ($breakwater) follows upstream change"," (eg $head)") @@ -894,6 +943,8 @@ sub keycommits ($;$$$$) { $x->($trouble, 'vanillamerge', "found vanilla merge"," ($head)"); return (undef,undef); + } elsif ($ty eq 'MergedBreakwaters') { + $found_anchor->(mergedbreakwaters_anchor $cl); } else { $x->($fatal, 'unprocessable', "found unprocessable commit, cannot cope: $cl->{Why}", @@ -1081,7 +1132,11 @@ sub walk ($;$$$) { return $bomb->(); } die "$ty ?"; - } elsif ($ty eq 'VanillaMerge' or $ty eq 'MergedBreakwaters') { + } elsif ($ty eq 'MergedBreakwaters') { + $last_anchor = mergedbreakwaters_anchor $cl; + $build_start->(' MergedBreakwaters', $cur); + last; + } elsif ($ty eq 'VanillaMerge') { # User may have merged unstitched branch(es). We will # have now lost what ffq-prev was then (since the later # pseudomerge may introduce further changes). The effect @@ -1117,9 +1172,6 @@ sub walk ($;$$$) { printdebug "*** MERGE\n"; - # xxx avoid calling walk without nogenerate when - # we have a MergedBreakwater; instead call keycommits ? - my @bwbcmd = (@git, qw(merge-base)); my @ibcmd = (@git, qw(merge-base --all)); my $might_be_in_bw = 1; @@ -1147,7 +1199,7 @@ sub walk ($;$$$) { foreach my $p (@$ps) { $prline->(" VanillaMerge ".$p->{Ix}); if (!is_fast_fwd $p->{Anchor}, $best_anchor) { - $nomerge->('DivergentAnchor'); + $nomerge->('divergent anchors'); } elsif ($p->{Anchor} eq $best_anchor) { print $report " SameAnchor" if $report; } else { @@ -1165,14 +1217,14 @@ sub walk ($;$$$) { } if ($ok && $might_be_in_bw) { + # We could rewrite this to contaion the metadata + # declaring it to be MergedBreakwaters, but + # unnecessarily rewriting a merge seems unhelpful. $prline->(" VanillaMerge MergedBreakwaters"); $last_anchor = $best_anchor; $build_start->('MergedBreakwaters', $cur); } - $nomerge->("alleged merged-breakwater is not a breakwater") - unless $ty eq 'VanillaMerge'; - my $bwb = cmdoutput @bwbcmd; # OK, now we have a breakwater base, but we need the merge @@ -1183,12 +1235,22 @@ sub walk ($;$$$) { # breakwater merge base as an ancestor. my @ibs = - grep { is_fast_fwd $bwb, $_ } grep /./, split /\n/, cmdoutput @ibcmd; - my ($ib) = @ibs - or $nomerge->("no suitable interchange merge base"); + + @ibs or confess 'internal error, expected anchor at least ?'; + + my $ib; + foreach my $tibix (0..$#ibs) { + my $tib = $ibs[$tibix]; + my $ff = is_fast_fwd $bwb, $tib; + next unless $ff; + next if $ib; + $ib = $tib; + } + + $ib or $nomerge->("no suitable interchange merge base"); $prline->(" VanillaMerge Base"); $prprdelim->(); @@ -1215,7 +1277,8 @@ sub walk ($;$$$) { push @brw_cl, { %$cl, SpecialMethod => 'MergeCreateMergedBreakwaters', - $xmsg->('construct merged breakwater from vanilla merge'), + $xmsg->('constructed from vanilla merge', + ' merged-breakwater'), }; push @upp_cl, { %$cl, @@ -1240,6 +1303,11 @@ sub walk ($;$$$) { my $rewriting = 0; + my $read_tree_upstream = sub { + my ($treeish) = @_; + read_tree_upstream $treeish, 0, $build; + }; + $#upp_cl = $upp_limit if defined $upp_limit; my $committer_authline = calculate_committer_authline(); @@ -1267,7 +1335,7 @@ sub walk ($;$$$) { if ($method eq 'Debian') { read_tree_debian($cltree); } elsif ($method eq 'Upstream') { - read_tree_upstream($cltree); + $read_tree_upstream->($cltree); } elsif ($method eq 'StartRewrite') { $rewriting = 1; next; @@ -1280,13 +1348,13 @@ sub walk ($;$$$) { confess unless $rewriting; my $differs = (get_differs $build, $cltree); next unless $differs & D_UPS; - read_tree_upstream($cltree); + $read_tree_upstream->($cltree); push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} }; } elsif ($method eq 'MergeCreateMergedBreakwaters') { print "Found a general merge, will try to tidy it up.\n"; $rewriting = 1; - read_tree_upstream($cl->{MergeBestAnchor}); - read_tree_upstream($cl->{MergeBestAnchor}); + $read_tree_upstream->($cl->{MergeBestAnchor}); + $read_tree_upstream->($cl->{MergeBestAnchor}); read_tree_debian($cltree); @parents = map { $_->{Breakwater} } @{ $cl->{Parents} }; } elsif ($method eq 'MergeMergeSeries') { @@ -1296,16 +1364,29 @@ sub walk ($;$$$) { $cl->{MergeInterchangeBaseInfo}, @{ $cl->{Parents} }; $last_anchor = $cl->{MergeBestAnchor}; - my $check_differs = get_differs $build, $cl->{CommitId}; + + # Check for mismerges: + my $check = sub { + my ($against, $allow, $what) = @_; + my $differs = get_differs $build, $against; + $nomerge->(sprintf + "merge misresolved: %s are not the same (%s %s d.%#x)", + $what, $against, $build, $differs) + if $differs & ~($allow | D_PAT_ADD); + }; + # Breakwater changes which were in each side of the - # merge should be in MergeCreateMergedBreakwaters - # output. Upstream changes are exactly the result - # of merge_series. So the only difference should - # be potential laundry results. - $nomerge->(sprintf - "merge misresolved: tree is not the same (%s %s d.%#x)", - $cl->{CommitId}, $build, $check_differs) - if $check_differs & ~D_PAT_ADD; + # merge will have been incorporated into the + # MergeCreateMergedBreakwaters output. Because the + # upstream series was rebased onto the new breakwater, + # so should all of the packaging changes which were in + # the input. + $check->($input, D_UPS, 'debian files'); + + # Upstream files are merge_series, which ought to + # have been identical to the original merge. + $check->($cl->{CommitId}, DS_DEB, 'upstream files'); + print "Merge resolution successful.\n"; next; } else {