X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=e73526e9e6207606df78647aa5b902e9580175da;hp=4fb5e91fd7e62c96a41a6b27b0ed5e15519d77ef;hb=675a7f895eb4768ae4078342f880852196626948;hpb=96b80209efcfc22f5c7e5251b1e1878cad797b5a diff --git a/git-debrebase b/git-debrebase index 4fb5e91f..e73526e9 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,21 +131,108 @@ 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. + # 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' ? DS_DEB : D_UPS; + }); + + 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|DS_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)]); @@ -175,6 +264,7 @@ sub calculate_committer_authline () { # # Types: # Packaging +# Changelog # Upstream # AddPatches # Mixed @@ -199,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 = { @@ -218,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; }; @@ -235,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 { @@ -246,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"); @@ -278,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; } @@ -301,21 +405,32 @@ 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"); } sub walk ($;$$); -sub walk { +sub walk ($;$$) { my ($input, $nogenerate,$report) = @_; # => ($tip, $breakwater_tip) @@ -353,13 +468,6 @@ sub walk { $prdelim = "\n"; }; - my $build_start = sub { - my ($msg, $parents) = @_; - $prline->(" $msg"); - push @brw_cl, { ExactlyParents => $parents }; - no warnings qw(exiting); last; - }; - my $bomb = sub { # usage: return $bomb->(); print $report " Unprocessable" if $report; $prprdelim->(); @@ -369,10 +477,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) { - $build_start->('Origin', []); - } $cl = classify $cur; my $ty = $cl->{Type}; my $st = $cl->{SubType}; @@ -384,12 +499,12 @@ 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; } elsif ($ty eq 'BreakwaterStart') { - $build_start->('FirstPackaging',[$cur]); + $build_start->('FirstPackaging', $cur); } elsif ($ty eq 'Upstream') { push @upp_cl, $cl; $cur = $p0; @@ -406,13 +521,14 @@ 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]); + $build_start->("PreviousBreakwater", $cur); } elsif ($ty eq 'DgitImportUnpatched') { my $pm = $pseudomerges[-1]; if (defined $pm) { @@ -475,7 +591,7 @@ sub walk { # 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 - $build_start->("ImportOrigin",[$cur]); + $build_start->("ImportOrigin", $cur); } die "$ty ?"; } else { @@ -487,15 +603,13 @@ sub walk { # 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) = @_; @@ -531,7 +645,6 @@ sub walk { $rewriting = 1; next; } elsif ($method eq 'RecordBreakwaterTip') { - last if $wantbrwonly; $breakwater = $build; next; } elsif ($method eq 'DgitImportDebianUpdate') { @@ -568,22 +681,27 @@ 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), "debrebase: $mrest", 'HEAD', $new, $old; +} + +sub update_head_checkout ($$$) { my ($old, $new, $mrest) = @_; - runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old; + my $symref = git_get_symref(); + runcmd @git, qw(checkout), $new, qw(.); + update_head $old, $new, $mrest; } 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'; @@ -602,13 +720,63 @@ 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); +sub cmd_downstream_rebase_launder_v0 () { + badusage "needs 1 argument, the baseline" unless @ARGV=0; + my ($base) = @ARGV; + $base = git_rev_parse $base; + my $old_head = get_head(); + my $current = $old_head; + my $topmost_keep; + for (;;) { + if ($current eq $base) { + $topmust_keep //= $current; + print "$current BASE: stopping\n"; + last; + } + my $cl = classify $current; + print " $current $cl->{Type}"; + my $keep = 0; + my $p0 = $cl->{Parents}[0]{CommitId}; + if ($cl->{Type} eq 'Pseudomerge') { + $current = $cl->{Contributor}{CommitId}; + print " ^".($cl->{Contributor}{Ix}+1); + } elsif ($cl->{Type} eq 'AddPatches' or + $cl->{Type} eq 'Changelog') { + print " strip"; + $current = $p0; + } else { + print " keep"; + $current = $p0; + $keep = 1; + } + print "\n"; + if ($keep) { + $topmost_keep //= $current; + } else { + die "to-be stripped changes not on top of the branch\n" + if $topmost_unstripped; + } + } + if ($topmost_keep eq $old_head) { + print "unchanged\n"; + } else { + print "updating to $topmost_keep\n"; + update_head $old_head, $topmost_keep, 'downstream-rebase-launder-v0'; + } +} + +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/-/_/;