X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=c999dd62c89390f5ffdee37b2d502245515ab6bd;hb=4297c0a55a779c5fbc5032b962d1bd766b33b581;hp=2a6aea7a85d671fc01299a330e1e98aeab632bb7;hpb=619204c5cce3f7629c51af512c711aa5d5a237db;p=dgit.git diff --git a/git-debrebase b/git-debrebase index 2a6aea7a..c999dd62 100755 --- a/git-debrebase +++ b/git-debrebase @@ -106,9 +106,11 @@ use strict; use Memoize; use Carp; +use POSIX; use Data::Dumper; +use Getopt::Long qw(:config posix_default gnu_compat bundling); -use Debian::Dgit qw(:DEFAULT $wa); +use Debian::Dgit qw(:DEFAULT :playground); sub badusage ($) { my ($m) = @_; @@ -129,9 +131,8 @@ memoize('cfg'); sub get_commit ($) { my ($objid) = @_; - my ($type,$data) = git_cat_file $objid; - die unless $type eq 'commit'; - $data =~ m/(?<=\n)\n/; + my $data = git_cat_file $objid, 'commit'; + $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?"; return ($`,$'); } @@ -140,10 +141,96 @@ sub D_UPS () { return 0x2; } # upstream files sub D_PAT_ADD () { return 0x4; } # debian/patches/ extra patches at end sub D_PAT_OTH () { return 0x8; } # debian/patches other changes -our $rd = ".git/git-debrebase"; -our $ud = "$rd/work"; + +our $playprefix = 'debrebase'; +our $rd; + our @git = qw(git); +sub in_workarea ($) { + my ($sub) = @_; + changedir "$playground/work"; + my $r = eval { $sub->(); }; + changedir $maindir; +} + +sub fresh_workarea () { + do { + local $playground; + fresh_playground "$playprefix/work"; + }; + in_workarea sub { playtree_setup }; +} + +sub get_differs ($$) { + my ($x,$y) = @_; + # This resembles quiltify_trees_differ, in dgit, a bit. + # But we don't care about modes, or dpkg-source-unrepresentable + # changes, and we don't need the plethora of different modes. + # Conversely we need to distinguish different kinds of changes to + # debian/ and debian/patches/. + + my $differs = 0; + + my $rundiff = sub { + my ($opts, $limits, $fn) = @_; + my @cmd = (@git, qw(diff-tree -z --no-renames)); + push @cmd, @$opts; + push @cmd, "$_:" foreach $x, $y; + push @cmd, @$limits; + my $diffs = cmdoutput @cmd; + foreach (split /\0/, $diffs) { $fn->(); } + }; + + $rundiff->([qw(--name-only)], [], sub { + $differs |= $_ eq 'debian' ? D_DEB : D_UPS; + }); + + if ($differs & D_DEB) { + $differs &= ~D_DEB; + $rundiff->([qw(--name-only -r)], [qw(debian)], sub { + $differs |= $_ eq m{^debian/patches/} ? D_PAT_OTH : D_DEB; + }); + die "mysterious debian changes $x..$y" + unless $differs & (D_PAT_OTH|D_DEB); + } + + if ($differs & D_PAT_OTH) { + my $mode; + $differs &= ~D_PAT_OTH; + my $pat_oth = sub { + $differs |= D_PAT_OTH; + no warnings qw(exiting); last; + }; + $rundiff->([qw(--name-status -r)], [qw(debian/patches/)], sub { + no warnings qw(exiting); + if (!defined $mode) { + $mode = $_; next; + } + die unless s{^debian/patches/}{}; + my $ok; + if ($mode eq 'A' && !m/(?:^|\.)series$/s) { + $ok = 1; + } elsif ($mode eq 'M' && $_ eq 'series') { + my $x_s = git_cat_file "$x:debian/patches/series", 'blob'; + my $y_s = git_cat_file "$y:debian/patches/series", 'blob'; + chomp $x_s; $x_s .= "\n"; + $ok = $x_s eq substr($y_s, 0, length $x_s); + } else { + # nope + } + $mode = undef; + $differs |= $ok ? D_PAT_ADD : D_PAT_OTH; + }); + die "mysterious debian/patches changes $x..$y" + unless $differs & (D_PAT_ADD|D_PAT_OTH); + } + + printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs; + + return $differs; +} + sub commit_pr_info ($) { my ($r) = @_; return Data::Dumper->dump([$r], [qw(commit)]); @@ -199,7 +286,7 @@ sub classify ($) { my ($h,$m) = get_commit $objid; my ($t) = $h =~ m/^tree (\w+)$/m or die $objid; - my (@ph) = $h =~ m/^parent (\w+)$/m; + my (@ph) = $h =~ m/^parent (\w+)$/mg; my @p; my $r = { @@ -218,14 +305,24 @@ sub classify ($) { }; } + printdebug "classify $objid \$t=$t \@p", + (map { sprintf " %s/%#x", $_->{CommitId}, $_->{Differs} } @p), + "\n"; + my $classify = sub { 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"; + } return $r; }; my $unknown = sub { my ($why) = @_; $r = { %$r, Type => qw(Unknown) }; + printdebug " ** Unknown\n"; return $r; }; @@ -278,7 +375,7 @@ sub classify ($) { Contributor => $bytime[1]); } foreach my $p (@p) { - my ($p_h, $p_m) = get_commit $p; + my ($p_h, $p_m) = get_commit $p->{CommitId}; $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m; ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m; } @@ -295,6 +392,8 @@ sub classify ($) { my ($stype, $series) = git_cat_file "$t:debian/patches/series"; my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m; +@p = reverse @p; #xxx + # How to decide about l/r ordering of breakwater merges ? git # --topo-order prefers to expand 2nd parent first. There's # already an easy rune to look for debian/ history anyway (git log @@ -314,22 +413,21 @@ sub classify ($) { return $unknown->("complex merge"); } -sub walk ($;$$$$); -sub walk { +sub walk ($;$$); +sub walk ($;$$) { my ($input, - $nogenerate,$report, - $wantbrwonly,$depth) = @_; + $nogenerate,$report) = @_; # => ($tip, $breakwater_tip) + # (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) = @_; @@ -339,9 +437,10 @@ 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 $cur = $input; my $prdelim = ""; @@ -362,12 +461,17 @@ sub walk { die "commit $cur: Cannot cope with this commit"; }; + my $build; + my $breakwater; + + my $build_start = sub { + my ($msg, $parent) = @_; + $prline->(" $msg"); + $build = $parent; + no warnings qw(exiting); last; + }; + for (;;) { - if (!defined $cur) { - push @brw_cl, { ExactlyParents => [] }; - $prline->("Origin"); - last; - } $cl = classify $cur; my $ty = $cl->{Type}; my $st = $cl->{SubType}; @@ -383,10 +487,8 @@ sub walk { push @brw_cl, $cl; $cur = $p0; next; - } elsif ($ty eq 'Packaging') { - push @brw_cl, $cl; - $cur = $p0; - next; + } elsif ($ty eq 'BreakwaterStart') { + $build_start->('FirstPackaging', $cur); } elsif ($ty eq 'Upstream') { push @upp_cl, $cl; $cur = $p0; @@ -400,17 +502,17 @@ sub walk { $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; + my $contrib = $cl->{Contributor}{CommitId}; + print $report " Contributor=$contrib" if $report; push @pseudomerges, $cl; $rewrite_from_here->(); - $cur = $ty->{Contributor}; + $cur = $contrib; next; } elsif ($ty eq 'BreakwaterUpstreamMerge') { - push @brw_cl, { ExactlyParents => [$cur] }; - $prline->("PreviousBreakwater"); - last; + $build_start->("PreviousBreakwater", $cur); } elsif ($ty eq 'DgitImportUnpatched') { my $pm = $pseudomerges[-1]; if (defined $pm) { @@ -460,26 +562,20 @@ sub walk { $xmsg->("convert dgit import: upstream changes") }; } - $prline->("Import"); - $prprdelim->(); - my ($dummy,$basis) = walk - $ovwr, - $nogenerate, $report, - 1, $depth+1; - push @brw_cl, { ExactlyParents => [$basis] }; + $prline->(" Import"); $rewrite_from_here->(); - last; + $upp_limit //= $#upp_cl; # 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; - push @brw_cl, { ExactlyParents => [$cur] }; # 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 - $prline->("ImportOrigin"); - last; + $build_start->("ImportOrigin", $cur); } die "$ty ?"; } else { @@ -487,19 +583,17 @@ sub walk { } } $prprdelim->(); - return () if $nogenerate; + return if $nogenerate; # Now we build it back up again - workarea_fresh(); + fresh_workarea(); my $rewriting = 0; - my $build = $basis; - my $rm_tree_cached = sub { my ($subdir) = @_; - runcmd @git, qw(rm --quiet -rf --cached), $subdir; + runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir; }; my $read_tree_debian = sub { my ($treeish) = @_; @@ -535,7 +629,6 @@ sub walk { $rewriting = 1; next; } elsif ($method eq 'RecordBreakwaterTip') { - last if $wantbrwonly; $breakwater = $build; next; } elsif ($method eq 'DgitImportDebianUpdate') { @@ -572,22 +665,20 @@ sub walk { } }; - runcmd @git, qw(diff-tree --quiet), - map { $wantdebonly ? "$_:debian" : $_ } - $input, $build; + runcmd @git, qw(diff-tree --quiet), $input, $build; return ($build, $breakwater); } sub get_head () { return git_rev_parse qw(HEAD); } -sub update_head ($$) { +sub update_head ($$$) { my ($old, $new, $mrest) = @_; runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old; } sub cmd_launder () { - badusage "no arguments to launder allowed"; + badusage "no arguments to launder allowed" if @ARGV; my $old = get_head(); my ($tip,$breakwater) = walk $old; update_head $old, $tip, 'launder'; @@ -606,13 +697,19 @@ sub cmd_analyse () { $old = get_head(); } my ($dummy,$breakwater) = walk $old, 1,*STDOUT; - print "$breakwater BREAKWATER\n"; STDOUT->error and die $!; } -my $toplevel = runcmd @git, qw(rev-parse --show-toplevel); +GetOptions("D+" => \$debuglevel) or die badusage "bad options\n"; +initdebug('git-debrebase '); +enabledebug if $debuglevel; + +my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel); chdir $toplevel or die "chdir $toplevel: $!"; +fresh_playground $playprefix; +$rd = ensure_a_playground "playprefix/misc"; + my $cmd = shift @ARGV; my $cmdfn = $cmd; $cmdfn =~ y/-/_/;