X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=a1d277e54c7a6bf82417eb28c3689ef2063d6432;hp=15196fe42eba2214e4835ee62c84c62d6455eb45;hb=5f5a11b1abc80453bd91268e859a41757f02313a;hpb=bb4bf5def7c06e5451fabe8d0a7d028873d753cf diff --git a/git-debrebase b/git-debrebase index 15196fe4..a1d277e5 100755 --- a/git-debrebase +++ b/git-debrebase @@ -108,8 +108,9 @@ 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) = @_; @@ -130,21 +131,36 @@ 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 ($`,$'); } -sub D_DEB () { return 0x1; } # debian/ (not including debian/patches/) -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 +sub D_UPS () { 0x02; } # upstream files +sub D_PAT_ADD () { 0x04; } # debian/patches/ extra patches at end +sub D_PAT_OTH () { 0x08; } # debian/patches other changes +sub D_DEB_CLOG () { 0x10; } # debian/ (not patches/ or changelog) +sub D_DEB_OTH () { 0x20; } # debian/changelog +sub DS_DEB () { D_DEB_CLOG | D_DEB_OTH; } # debian/ (not patches/) + +our $playprefix = 'debrebase'; +our $rd; +our $workarea; -our $rd = ".git/git-debrebase"; -our $ud = "$rd/work"; our @git = qw(git); +sub in_workarea ($) { + my ($sub) = @_; + changedir $workarea; + my $r = eval { $sub->(); }; + changedir $maindir; +} + +sub fresh_workarea () { + $workarea = fresh_playground "$playprefix/work"; + in_workarea sub { playtree_setup }; +} + sub get_differs ($$) { my ($x,$y) = @_; # This resembles quiltify_trees_differ, in dgit, a bit. @@ -155,28 +171,30 @@ sub get_differs ($$) { my $differs = 0; - my $f; my $rundiff = sub { - my ($opts, $sfx, $fn) = @_; - $opts //= [qw(--name-only)]; + my ($opts, $limits, $fn) = @_; my @cmd = (@git, qw(diff-tree -z --no-renames)); push @cmd, @$opts; - push @cmd, "$_:$sfx" foreach $x, $y; - my $diffs = cmdoutput @cmd, $x, $y; - foreach $f (split /\0/, $diffs) { $fn->(); } + push @cmd, "$_:" foreach $x, $y; + push @cmd, @$limits; + my $diffs = cmdoutput @cmd; + foreach (split /\0/, $diffs) { $fn->(); } }; - $rundiff->(undef, '', sub { - $differs |= $f eq 'debian' ? D_DEB : D_UPS; + $rundiff->([qw(--name-only)], [], sub { + $differs |= $_ eq 'debian' ? DS_DEB : D_UPS; }); - if ($differs & D_DEB) { - $differs &= ~D_DEB; - $rundiff->(undef, ':debian', sub { - $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB; + if ($differs & DS_DEB) { + $differs &= ~DS_DEB; + $rundiff->([qw(--name-only -r)], [qw(debian)], sub { + $differs |= + m{^debian/patches/} ? D_PAT_OTH : + $_ eq 'debian/changelog' ? D_DEB_CLOG : + D_DEB_OTH; }); die "mysterious debian changes $x..$y" - unless $differs & (D_PAT_OTH|D_DEB); + unless $differs & (D_PAT_OTH|DS_DEB); } if ($differs & D_PAT_OTH) { @@ -186,15 +204,16 @@ sub get_differs ($$) { $differs |= D_PAT_OTH; no warnings qw(exiting); last; }; - $rundiff->([qw(--name-status)], ':debian/patches', sub { + $rundiff->([qw(--name-status -r)], [qw(debian/patches/)], sub { no warnings qw(exiting); if (!defined $mode) { - $mode = $f; next; + $mode = $_; next; } + die unless s{^debian/patches/}{}; my $ok; - if ($mode eq 'A' && $f !~ m/(?:^|\.)series$/s) { + if ($mode eq 'A' && !m/(?:^|\.)series$/s) { $ok = 1; - } elsif ($mode eq 'M' && $f eq 'series') { + } 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"; @@ -209,6 +228,8 @@ sub get_differs ($$) { unless $differs & (D_PAT_ADD|D_PAT_OTH); } + printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs; + return $differs; } @@ -243,6 +264,7 @@ sub calculate_committer_authline () { # # Types: # Packaging +# Changelog # Upstream # AddPatches # Mixed @@ -267,7 +289,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 = { @@ -286,14 +308,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; }; @@ -303,10 +335,14 @@ sub classify ($) { return $classify->(qw(AddPatches)); } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) { return $unknown->("edits debian/patches"); - } elsif ($d == D_DEB) { + } elsif ($d & DS_DEB and !($d & ~DS_DEB)) { my ($ty,$dummy) = git_cat_file "$ph[0]:debian"; if ($ty eq 'tree') { - return $classify->(qw(Packaging)); + if ($d == D_DEB_CLOG) { + return $classify->(qw(Changelog)); + } else { + return $classify->(qw(Packaging)); + } } elsif ($ty eq 'missing') { return $classify->(qw(BreakwaterStart)); } else { @@ -314,7 +350,7 @@ sub classify ($) { } } elsif ($d == D_UPS) { return $classify->(qw(Upstream)); - } elsif ($d == (D_DEB|D_UPS)) { + } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) { return $classify->(qw(Mixed)); } elsif ($d == 0) { return $unknown->("no changes"); @@ -346,7 +382,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; } @@ -369,15 +405,26 @@ sub classify ($) { # debian/) so debian breakwater branch should be 1st parent; that # way also there's also an easy rune to look for the upstream # patches (--topo-order). - if (@p == 2 && - !$haspatches && - !$p[0]{IsOrigin} && # breakwater merge never starts with an origin - !($p[0]{Differs} & ~D_DEB) && - !($p[1]{Differs} & ~D_UPS)) { - return $classify->(qw(BreakwaterUpstreamMerge), - OrigParents => [ $p[1] ]); + + # The above tells us which way *we* will generate them. But we + # might encounter ad-hoc breakwater merges generated manually, + # which might be the other way around. In principle, in some odd + # situations, a breakwater merge might have two identical parents. + # In that case we guess which way round it is (ie, which parent + # has the upstream history). The order of the 2-iteration loop + # controls which guess we make. + + foreach my $prevbrw (qw(0 1)) { + if (@p == 2 && + !$haspatches && + !$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin + !($p[$prevbrw]{Differs} & ~DS_DEB) && + !($p[!$prevbrw]{Differs} & ~D_UPS)) { + return $classify->(qw(BreakwaterUpstreamMerge), + OrigParents => [ $p[!$prevbrw] ]); + } + # xxx multi-.orig upstreams } - # xxx multi-.orig upstreams return $unknown->("complex merge"); } @@ -452,7 +499,7 @@ sub walk ($;$$) { $cur = $p0; $rewrite_from_here->(); next; - } elsif ($ty eq 'Packaging') { + } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') { push @brw_cl, $cl; $cur = $p0; next; @@ -474,10 +521,11 @@ sub walk ($;$$) { $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') { $build_start->("PreviousBreakwater", $cur); @@ -555,13 +603,13 @@ sub walk ($;$$) { # Now we build it back up again - workarea_fresh(); + fresh_workarea(); my $rewriting = 0; 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) = @_; @@ -646,7 +694,7 @@ sub update_head ($$$) { } 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'; @@ -665,13 +713,18 @@ sub cmd_analyse () { $old = get_head(); } my ($dummy,$breakwater) = walk $old, 1,*STDOUT; - print "$breakwater BREAKWATER\n"; STDOUT->error and die $!; } +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: $!"; +$rd = fresh_playground "$playprefix/misc"; + my $cmd = shift @ARGV; my $cmdfn = $cmd; $cmdfn =~ y/-/_/;