X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=e8dfbf99dad4e747490b2a304f66124ed8fce96e;hp=0a73bdc849d1637ec787199c368d8720837f4d4c;hb=ec2d9d708e0d45cfc4623b20057d042127690599;hpb=8ac8810ed80449a437ee8bba3b9fc5457824c371 diff --git a/git-debrebase b/git-debrebase index 0a73bdc8..e8dfbf99 100755 --- a/git-debrebase +++ b/git-debrebase @@ -116,6 +116,7 @@ use Carp; use POSIX; use Data::Dumper; use Getopt::Long qw(:config posix_default gnu_compat bundling); +use Dpkg::Version; our ($opt_force); @@ -136,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'; @@ -262,7 +270,7 @@ sub rm_subdir_cached ($) { sub read_tree_subdir ($$) { my ($subdir, $new_tree_object) = @_; rm_subdir_cached $subdir; - runcmd @git, qw(read-tree), "--prefix=$subdir/"; + runcmd @git, qw(read-tree), "--prefix=$subdir/", $new_tree_object; } # classify returns an info hash like this @@ -326,7 +334,7 @@ sub parsecommit ($;$) { foreach my $ph (@ph) { push @$p_ref, { - Ix => $#$p_ref, + Ix => scalar @$p_ref, CommitId => $ph, }; } @@ -342,7 +350,7 @@ sub classify ($) { my $t = $r->{Tree}; foreach my $p (@p) { - $p->{Differs} => (get_differs $p->{CommitId}, $t), + $p->{Differs} = (get_differs $p->{CommitId}, $t), } printdebug "classify $objid \$t=$t \@p", @@ -353,9 +361,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; }; @@ -373,7 +379,7 @@ sub classify ($) { } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) { return $unknown->("edits debian/patches"); } elsif ($d & DS_DEB and !($d & ~DS_DEB)) { - my ($ty,$dummy) = git_cat_file "$ph[0]:debian"; + my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian"; if ($ty eq 'tree') { if ($d == D_DEB_CLOG) { return $classify->(qw(Changelog)); @@ -455,8 +461,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] ]); } @@ -472,9 +478,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 @@ -528,6 +536,8 @@ sub walk ($;$$) { no warnings qw(exiting); last; }; + my $last_upstream_update; + for (;;) { $cl = classify $cur; my $ty = $cl->{Type}; @@ -545,6 +555,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; @@ -569,6 +580,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]; @@ -585,6 +597,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}; @@ -622,6 +635,7 @@ sub walk ($;$$) { $prline->(" Import"); $rewrite_from_here->(); $upp_limit //= $#upp_cl; # further, deeper, patches discarded + die 'BUG $upp_limit is not used anywhere?'; $cur = $ovwr; next; } else { @@ -636,10 +650,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 @@ -651,6 +670,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) = @_; @@ -727,6 +747,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; + } } }; @@ -734,7 +757,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); } @@ -754,12 +779,13 @@ sub update_head_checkout ($$$) { sub cmd_launder () { badusage "no arguments to launder allowed" if @ARGV; my $old = get_head(); - my ($tip,$breakwater) = walk $old; + my ($tip,$breakwater,$last_upstream_merge) = walk $old; update_head $old, $tip, 'launder'; # no tree changes except debian/patches runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); 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 () { @@ -787,7 +813,7 @@ sub cmd_new_upstream_v0 () { my %pieces; # parse args - low commitment - my $new_version = (new Dpkg::Version scalar(shift @ARGV), 1); + my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1); my $new_upstream_version = $new_version->version(); my $new_upstream = git_rev_parse shift @ARGV; @@ -804,14 +830,14 @@ sub cmd_new_upstream_v0 () { my @newpieces; my $newpiece = sub { my ($n, @x) = @_; # may be '' - $pc = $piece->($n, @x, NewIx => (scalar @newpieces)); + my $pc = $piece->($n, @x, NewIx => (scalar @newpieces)); push @newpieces, $pc; }; $newpiece->('', OldIx => 0, New => $new_upstream, - }; + ); while (@ARGV) { my $n = shift @ARGV; my $c = git_rev_parse shift @ARGV; @@ -822,10 +848,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_ups = 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 { @@ -834,20 +863,20 @@ sub cmd_new_upstream_v0 () { print STDERR "preflight check failed: $msg\n"; }; - $piece->('', Old => $old_orig); + $piece->('', Old => $old_upstream->{CommitId}); - if ($old_orig_ci =~ m{^\[git-debrebase }m) { - if ($old_orig_ci =~ + if ($old_upstream->{Msg} =~ m{^\[git-debrebase }m) { + if ($old_upstream->{Msg} =~ m{^\[git-debrebase new-upstream combine \.((?: $extra_orig_namepart_re)+)\]} ) { my @oldpieces = ('', split / /, $1); - my $parentix = -1 + scalar @{ $old_orig->{Parents} }; - foreach my $i (0..$#$oldpieces) { + my $parentix = -1 + scalar @{ $old_upstream->{Parents} }; + foreach my $i (0..$#oldpieces) { my $n = $oldpieces[$i]; - $piece->($n, Old => $old_orig.'^'.$parentix); + $piece->($n, Old => $old_upstream->{CommitId}.'^'.$parentix); } } else { - $problem->("previous upstream $old_orig->{CommitId} is from". + $problem->("previous upstream $old_upstream->{CommitId} is from". " git-debrebase but not a \`new-upstream combine' commit"); } } @@ -874,17 +903,19 @@ sub cmd_new_upstream_v0 () { } } + my $new_bw; + fresh_workarea(); in_workarea sub { my @upstream_merge_parents; if (!$problems) { - push @upstream_merge_parents, $old_orig->{CommitId}; + push @upstream_merge_parents, $old_upstream->{CommitId}; } foreach my $pc (@newpieces) { # always has '' first if ($pc->{Name}) { - read_tree_subdir $pcname, $pc->{New]; + read_tree_subdir $pc->{Name}, $pc->{New}; } else { runcmd @git, qw(read-tree), $pc->{New}; } @@ -920,7 +951,7 @@ sub cmd_new_upstream_v0 () { push @cmd, qw(-m), "Update to upstream $new_upstream_version"; push @cmd, qw(-m), "[git-debrebase new-upstream breakwater $new_upstream_version]"; - my $new_bw = cmdoutput @git; + $new_bw = cmdoutput @git; # Now we have to add a changelog stanza so the Debian version # is right. @@ -933,7 +964,7 @@ sub cmd_new_upstream_v0 () { $oldclog =~ m/^($package_re) \(\S+\) / or fail "cannot parse old changelog to get package name"; my $p = $1; - print CN, <