X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=c89e598f599a713a9903d7dedd159d840426b7d7;hp=1961bcc5c082d418a792ecac36a5d23b9c7f9eb8;hb=c7244a622fedfc203a935692a6f9e54733494dfc;hpb=f7f1612c112ce478a3e9a2aaacaec08bebabcdd2 diff --git a/git-debrebase b/git-debrebase index 1961bcc5..c89e598f 100755 --- a/git-debrebase +++ b/git-debrebase @@ -137,6 +137,13 @@ sub cfg ($) { memoize('cfg'); +sub dd ($) { + my ($v) = @_; + my $dd = new Data::Dumper [ $v ]; + Terse $dd 1; Indent $dd 0; Useqq $dd 1; + return Dump $dd; +} + sub get_commit ($) { my ($objid) = @_; my $data = git_cat_file $objid, 'commit'; @@ -266,6 +273,15 @@ sub read_tree_subdir ($$) { runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object; } +sub make_commit ($$) { + my ($parents, $message_paras) = @_; + my $tree = cmdoutput @git, qw(write-tree); + my @cmd = (@git, qw(commit-tree), $tree); + push @cmd, qw(-p), $_ foreach @$parents; + push @cmd, qw(-m), $_ foreach @$message_paras; + return cmdoutput @cmd; +} + # classify returns an info hash like this # CommitId => $objid # Hdr => # commit headers, including 1 final newline @@ -327,7 +343,7 @@ sub parsecommit ($;$) { foreach my $ph (@ph) { push @$p_ref, { - Ix => $#$p_ref, + Ix => scalar @$p_ref, CommitId => $ph, }; } @@ -354,9 +370,7 @@ sub classify ($) { my ($type, @rest) = @_; $r = { %$r, Type => $type, @rest }; if ($debuglevel) { - my $dd = new Data::Dumper [ $r ]; - Terse $dd 1; Indent $dd 0; Useqq $dd 1; - printdebug " = $type ".(Dump $dd)."\n"; + printdebug " = $type ".(dd $r)."\n"; } return $r; }; @@ -456,8 +470,8 @@ sub classify ($) { if (@p == 2 && !$haspatches && !$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin - !($p[$prevbrw]{Differs} & ~DS_DEB) && - !($p[!$prevbrw]{Differs} & ~D_UPS)) { + !($p[!$prevbrw]{Differs} & ~DS_DEB) && # no non-debian changess + !($p[$prevbrw]{Differs} & ~D_UPS)) { # no non-upstream changes return $classify->(qw(BreakwaterUpstreamMerge), OrigParents => [ $p[!$prevbrw] ]); } @@ -473,9 +487,11 @@ sub walk ($;$$); sub walk ($;$$) { my ($input, $nogenerate,$report) = @_; - # => ($tip, $breakwater_tip) + # => ($tip, $breakwater_tip, $last_upstream_merge_in_breakwater) # (or nothing, if $nogenerate) + printdebug "*** WALK $input ".($nogenerate//0)." ".($report//'-')."\n"; + # go through commits backwards # we generate two lists of commits to apply: # breakwater branch and upstream patches @@ -529,6 +545,8 @@ sub walk ($;$$) { no warnings qw(exiting); last; }; + my $last_upstream_update; + for (;;) { $cl = classify $cur; my $ty = $cl->{Type}; @@ -546,6 +564,7 @@ sub walk ($;$$) { $cur = $p0; next; } elsif ($ty eq 'BreakwaterStart') { + $last_upstream_update = $cur; $build_start->('FirstPackaging', $cur); } elsif ($ty eq 'Upstream') { push @upp_cl, $cl; @@ -570,6 +589,7 @@ sub walk ($;$$) { $cur = $contrib; next; } elsif ($ty eq 'BreakwaterUpstreamMerge') { + $last_upstream_update = $cur; $build_start->("PreviousBreakwater", $cur); } elsif ($ty eq 'DgitImportUnpatched') { my $pm = $pseudomerges[-1]; @@ -586,6 +606,7 @@ sub walk ($;$$) { printf $report " PM=%s \@Overwr:%d", $pm, (scalar @$ovwrs) if $report; if (@$ovwrs != 1) { + printdebug "*** WALK BOMB DgitImportUnpatched\n"; return $bomb->(); } my $ovwr = $ovwrs->[0]{CommitId}; @@ -638,10 +659,15 @@ sub walk ($;$$) { } die "$ty ?"; } else { + printdebug "*** WALK BOMB unrecognised\n"; return $bomb->(); } } $prprdelim->(); + + printdebug "*** WALK prep done cur=$cur". + " brw $#brw_cl upp $#upp_cl proc $#processed pm $#pseudomerges\n"; + return if $nogenerate; # Now we build it back up again @@ -653,6 +679,7 @@ sub walk ($;$$) { my $read_tree_debian = sub { my ($treeish) = @_; read_tree_subdir 'debian', "$treeish:debian"; + rm_subdir_cached 'debian/patches'; }; my $read_tree_upstream = sub { my ($treeish) = @_; @@ -729,6 +756,9 @@ sub walk ($;$$) { my $newcommit = cmdoutput @cmd; confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId}; $build = $newcommit; + if (grep { $method eq $_ } qw(DgitImportUpstreamUpdate)) { + $last_upstream_update = $cur; + } } }; @@ -736,7 +766,9 @@ sub walk ($;$$) { die sprintf "internal error %#x %s %s", $final_check, $build, $input if $final_check & ~D_PAT_ADD; - return ($build, $breakwater); + my @r = ($build, $breakwater, $last_upstream_update); + printdebug "*** WALK RETURN @r\n"; + return @r } sub get_head () { return git_rev_parse qw(HEAD); } @@ -753,15 +785,21 @@ sub update_head_checkout ($$$) { update_head $old, $new, $mrest; } +sub update_head_postlaunder ($$$) { + my ($old, $tip, $reflogmsg) = @_; + update_head $old, $tip, $reflogmsg; + # no tree changes except debian/patches + runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); +} + sub cmd_launder () { badusage "no arguments to launder allowed" if @ARGV; my $old = get_head(); - my ($tip,$breakwater) = walk $old; - update_head $old, $tip, 'launder'; - # no tree changes except debian/patches - runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); + my ($tip,$breakwater,$last_upstream_merge) = walk $old; + update_head_postlaunder $old, $tip, 'launder'; printf "# breakwater tip\n%s\n", $breakwater; printf "# working tip\n%s\n", $tip; + printf "# last upstream merge\n%s\n", $last_upstream_merge; } sub cmd_analyse () { @@ -798,9 +836,10 @@ sub cmd_new_upstream_v0 () { my ($n, @x) = @_; # may be '' my $pc = $pieces{$n} //= { Name => $n, - Desc => ($n ? "upstream piece $n" : "upstream (main piece"), + Desc => ($n ? "upstream piece \`$n'" : "upstream (main piece"), }; while (my $k = shift @x) { $pc->{$k} = shift @x; } + $pc; }; my @newpieces; @@ -824,10 +863,13 @@ sub cmd_new_upstream_v0 () { # now we need to investigate the branch this generates the # laundered version but we don't switch to it yet my $old_head = get_head(); - my ($old_laundered_tip,$old_bw) = walk $old_head; + my ($old_laundered_tip,$old_bw,$old_upstream_update) = walk $old_head; my $old_bw_cl = classify $old_bw; - my $old_upstream = parsecommit $old_bw_cl->{OrigParents}[0]{CommitId}; + my $old_upstream_update_cl = classify $old_upstream_update; + confess unless $old_upstream_update_cl->{OrigParents}; + my $old_upstream = parsecommit + $old_upstream_update_cl->{OrigParents}[0]{CommitId}; my $problems = 0; my $problem = sub { @@ -836,7 +878,7 @@ sub cmd_new_upstream_v0 () { print STDERR "preflight check failed: $msg\n"; }; - $piece->('', Old => $old_upstream); + $piece->('', Old => $old_upstream->{CommitId}); if ($old_upstream->{Msg} =~ m{^\[git-debrebase }m) { if ($old_upstream->{Msg} =~ @@ -856,14 +898,17 @@ sub cmd_new_upstream_v0 () { foreach my $pc (values %pieces) { if (!$pc->{Old}) { - $problem->("introducing upstream piece $pc->{Name}"); + $problem->("introducing upstream piece \`$pc->{Name}'"); } elsif (!$pc->{New}) { - $problem->("dropping upstream piece $pc->{Name}"); + $problem->("dropping upstream piece \`$pc->{Name}'"); } elsif (!is_fast_fwd $pc->{Old}, $pc->{New}) { $problem->("not fast forward: $pc->{Name} $pc->{Old}..$pc->{New}"); } } + printdebug "%pieces = ", (dd \%pieces), "\n"; + printdebug "\@newpieces = ", (dd \@newpieces), "\n"; + if ($problems) { if ($opt_force) { printf STDERR @@ -899,15 +944,12 @@ sub cmd_new_upstream_v0 () { if (@newpieces > 1) { # need to make the upstream subtree merge commit - my $us_tree = cmdoutput @git, qw(write-tree); - my @cmd = (@git, qw(commit-tree), $us_tree); - push @cmd, qw(-p), $_ foreach @upstream_merge_parents; - push @cmd, qw(-m), "Combine upstreams for $new_upstream_version"; - push @cmd, qw(-m), - "[git-debrebase new-upstream combine . ". - (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]). - "]"; - $new_upstream = cmdoutput @cmd; + $new_upstream = make_commit \@upstream_merge_parents, + [ "Combine upstreams for $new_upstream_version", + ("[git-debrebase new-upstream combine . ". + (join " ", map { $_->{Name} } @newpieces[1..$#newpieces]). + "]"), + ]; } # $new_upstream is either the single upstream commit, or the @@ -917,20 +959,15 @@ sub cmd_new_upstream_v0 () { read_tree_subdir 'debian', "$old_bw:debian"; # index now contains the breakwater merge contents - - my $bw_tree = cmdoutput @git, qw(write_tree); - my @cmd = (@git, qw(commit-tree), $bw_tree); - push @cmd, qw(-p), $old_bw, qw(-p), $new_upstream; - push @cmd, qw(-m), "Update to upstream $new_upstream_version"; - push @cmd, qw(-m), - "[git-debrebase new-upstream breakwater $new_upstream_version]"; - $new_bw = cmdoutput @git; + $new_bw = make_commit [ $old_bw, $new_upstream ], + [ "Update to upstream $new_upstream_version", + "[git-debrebase new-upstream breakwater $new_upstream_version]", + ]; # Now we have to add a changelog stanza so the Debian version # is right. - die if unlink "debian"; - die unless $!==ENOTEMPTY; + die $! unless $!==ENOTEMPTY; unlink "debian/changelog" or die $!; open CN, ">", "debian/changelog" or die $!; my $oldclog = git_cat_file ":debian/changelog"; @@ -949,15 +986,10 @@ END runcmd @git, qw(update-index --add --replace), 'debian/changelog'; # Now we have the final new breakwater branch in the index - - $bw_tree = cmdoutput @git, qw(write_tree); - @cmd = (@git, qw(commit-tree), $bw_tree); - push @cmd, qw(-p), $new_bw; - push @cmd, qw(-m), - "Update changelog for new upstream $new_upstream_version"; - push @cmd, qw(-m), - "[git-debrebase new-upstream changelog $new_upstream_version]"; - $new_bw = cmdoutput @git; + $new_bw = make_commit [ $new_bw ], + [ "Update changelog for new upstream $new_upstream_version", + "[git-debrebase new-upstream changelog $new_upstream_version]", + ]; }; # we have constructed the new breakwater. we now need to commit to