X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=5808cf33f7f1b702f29c5e57b1ef01e707a0428f;hp=f16b9b590de949f1e18a45df360886d6d28470b2;hb=747c6f2eaf1929665a4c19ad4654bba0790b9e01;hpb=150aff96f5a8740d928e2f677f987bb821b54b4b diff --git a/git-debrebase b/git-debrebase index f16b9b59..5808cf33 100755 --- a/git-debrebase +++ b/git-debrebase @@ -104,14 +104,15 @@ use strict; +use Debian::Dgit qw(:DEFAULT :playground); +setup_sigwarn(); + use Memoize; use Carp; use POSIX; use Data::Dumper; use Getopt::Long qw(:config posix_default gnu_compat bundling); -use Debian::Dgit qw(:DEFAULT :playground); - sub badusage ($) { my ($m) = @_; die "bad usage: $m\n"; @@ -153,7 +154,8 @@ sub in_workarea ($) { my ($sub) = @_; changedir $workarea; my $r = eval { $sub->(); }; - changedir $maindir; + { local $@; changedir $maindir; } + die $@ if $@; } sub fresh_workarea () { @@ -211,7 +213,7 @@ sub get_differs ($$) { } die unless s{^debian/patches/}{}; my $ok; - if ($mode eq 'A' && !m/(?:^|\.)series$/s) { + 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'; @@ -264,6 +266,7 @@ sub calculate_committer_authline () { # # Types: # Packaging +# Changelog # Upstream # AddPatches # Mixed @@ -280,7 +283,7 @@ sub calculate_committer_authline () { # # BreakwaterUpstreamMerge # has additional entry in classification result -# OrigParents = [ subset of Parents ] +# OrigParents = [ subset of Parents ] # singleton list sub classify ($) { my ($objid) = @_; @@ -303,7 +306,7 @@ sub classify ($) { push @p, { Ix => $#p, CommitId => $ph, - Differs => (get_differs $t, $ph), + Differs => (get_differs $ph, $t), }; } @@ -337,7 +340,11 @@ sub classify ($) { } 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 { @@ -469,7 +476,9 @@ sub walk ($;$$) { if ($nogenerate) { return (undef,undef); } - die "commit $cur: Cannot cope with this commit"; + die "commit $cur: Cannot cope with this commit (d.". + (join ' ', map { sprintf "%#x", $_->{Differs} } + @{ $cl->{Parents} }). ")"; }; my $build; @@ -494,7 +503,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; @@ -507,7 +516,7 @@ sub walk ($;$$) { } elsif ($ty eq 'Mixed') { my $queue = sub { my ($q, $wh) = @_; - my $cls = { $cl, $xmsg->("split mixed commit: $wh part") }; + my $cls = { %$cl, $xmsg->("split mixed commit: $wh part") }; push @$q, $cls; }; $queue->(\@brw_cl, "debian"); @@ -619,9 +628,14 @@ sub walk ($;$$) { my $committer_authline = calculate_committer_authline(); + printdebug "WALK REBUILD $build ".(scalar @processed)."\n"; + + confess "internal error" unless $build eq (pop @processed)->{CommitId}; + in_workarea sub { mkdir $rd or $!==EEXIST or die $!; my $current_method; + runcmd @git, qw(read-tree), $build; foreach my $cl (qw(Debian), (reverse @brw_cl), { SpecialMethod => 'RecordBreakwaterTip' }, qw(Upstream), (reverse @upp_cl)) { @@ -632,6 +646,8 @@ sub walk ($;$$) { my $method = $cl->{SpecialMethod} // $current_method; my @parents = ($build); my $cltree = $cl->{CommitId}; + printdebug "WALK BUILD ".($cltree//'undef'). + " $method (rewriting=$rewriting)\n"; if ($method eq 'Debian') { $read_tree_debian->($cltree); } elsif ($method eq 'Upstream') { @@ -651,13 +667,19 @@ sub walk ($;$$) { } else { confess "$method ?"; } - $rewriting ||= $cl ne pop @processed; + if (!$rewriting) { + my $procd = (pop @processed) // 'UNDEF'; + if ($cl ne $procd) { + $rewriting = 1; + printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n"; + } + } my $newtree = cmdoutput @git, qw(write-tree); my $ch = $cl->{Hdr}; $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?"; $ch =~ s{^parent .*\n}{}m; $ch =~ s{(?=^author)}{ - map { "parent $_\n" } @parents + join '', map { "parent $_\n" } @parents }me or confess "$ch ?"; if ($rewriting) { $ch =~ s{^committer .*$}{$committer_authline}m @@ -676,7 +698,9 @@ sub walk ($;$$) { } }; - runcmd @git, qw(diff-tree --quiet), $input, $build; + my $final_check = get_differs $build, $input; + die sprintf "internal error %#x %s %s", $final_check, $build, $input + if $final_check & ~D_PAT_ADD; return ($build, $breakwater); } @@ -685,7 +709,14 @@ sub get_head () { return git_rev_parse qw(HEAD); } sub update_head ($$$) { my ($old, $new, $mrest) = @_; - runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old; + runcmd @git, qw(update-ref -m), "debrebase: $mrest", 'HEAD', $new, $old; +} + +sub update_head_checkout ($$$) { + my ($old, $new, $mrest) = @_; + my $symref = git_get_symref(); + runcmd @git, qw(checkout), $new, qw(.); + update_head $old, $new, $mrest; } sub cmd_launder () { @@ -694,8 +725,9 @@ sub cmd_launder () { my ($tip,$breakwater) = walk $old; update_head $old, $tip, 'launder'; # no tree changes except debian/patches - runcmd @git, qw(rm --quiet -rf 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; } sub cmd_analyse () { @@ -711,6 +743,55 @@ sub cmd_analyse () { STDOUT->error and die $!; } +sub cmd_downstream_rebase_launder_v0 () { + badusage "needs 1 argument, the baseline" unless @ARGV==1; + 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) { + $topmost_keep //= $current; + print " $current BASE stop\n"; + last; + } + my $cl = classify $current; + print " $current $cl->{Type}"; + my $keep = 0; + my $p0 = $cl->{Parents}[0]{CommitId}; + my $next; + if ($cl->{Type} eq 'Pseudomerge') { + print " ^".($cl->{Contributor}{Ix}+1); + $next = $cl->{Contributor}{CommitId}; + } elsif ($cl->{Type} eq 'AddPatches' or + $cl->{Type} eq 'Changelog') { + print " strip"; + $next = $p0; + } else { + print " keep"; + $next = $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_keep; + } + $current = $next; + } + if ($topmost_keep eq $old_head) { + print "unchanged\n"; + } else { + print "updating to $topmost_keep\n"; + update_head_checkout + $old_head, $topmost_keep, + 'downstream-rebase-launder-v0'; + } +} + GetOptions("D+" => \$debuglevel) or die badusage "bad options\n"; initdebug('git-debrebase '); enabledebug if $debuglevel;