X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=d6bd8a5148c356380d4ec196d57260e7fa3e5669;hb=b11760cf2a4d85e63085db5ed504804e6ffe36a8;hp=e2a1a325ed3bb02fa978483f4965bd0610a8710a;hpb=f2c6ef698b8cacd4e55b09000454960f50bbc6ea;p=dgit.git diff --git a/git-debrebase b/git-debrebase index e2a1a325..d6bd8a51 100755 --- a/git-debrebase +++ b/git-debrebase @@ -105,10 +105,16 @@ use strict; use Memoize; +use Carp; use Data::Dumper; use Debian::Dgit qw(:DEFAULT $wa); +sub badusage ($) { + my ($m) = @_; + die "bad usage: $m\n"; +} + sub cfg ($) { my ($k) = @_; $/ = "\0"; @@ -136,6 +142,7 @@ sub D_PAT_OTH () { return 0x8; } # debian/patches other changes our $rd = ".git/git-debrebase"; our $ud = "$rd/work"; +our @git = qw(git); sub commit_pr_info ($) { my ($r) = @_; @@ -144,7 +151,7 @@ sub commit_pr_info ($) { sub calculate_committer_authline () { my $c = cmdoutput @git, qw(commit-tree --no-gpg-sign -m), - 'DUMMY COMMIT (git-debrebase)', "$basis:"; + 'DUMMY COMMIT (git-debrebase)', "HEAD:"; my ($h,$m) = get_commit $c; $h =~ m/^committer .*$/m or confess "($h) ?"; return $&; @@ -191,13 +198,13 @@ sub classify ($) { my ($h,$m) = get_commit $objid; - my ($t) = $h =~ m/^tree (\w+)$/m or die $cur; + my ($t) = $h =~ m/^tree (\w+)$/m or die $objid; my (@ph) = $h =~ m/^parent (\w+)$/m; my @p; my $r = { CommitId => $objid, - Hdr => $hdr, + Hdr => $h, Msg => $m, Tree => $t, Parents => \@p, @@ -213,26 +220,26 @@ sub classify ($) { my $classify = sub { my ($type, @rest) = @_; - $r = { %r, Type => $type, @rest }; + $r = { %$r, Type => $type, @rest }; return $r; }; my $unknown = sub { my ($why) = @_; - $r = { %r, Type => Unknown }; + $r = { %$r, Type => qw(Unknown) }; return $r; - } + }; if (@p == 1) { my $d = $r->{Parents}[0]{Differs}; - if ($d == D_DPAT_ADD) { + if ($d == D_PAT_ADD) { return $classify->(qw(AddPatches)); - } elsif ($d & (D_DPAT_ADD|D_DPAT_OTH)) { + } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) { return $unknown->("edits debian/patches"); } elsif ($d == D_DEB) { return $classify->(qw(Packaging)); } elsif ($d == D_UPS) { return $classify->(qw(Upstream)); - } elsif ($d == D_DEB|D_UPS) { + } elsif ($d == (D_DEB|D_UPS)) { return $classify->(qw(Mixed)); } elsif ($d == 0) { return $unknown->("no changes"); @@ -262,16 +269,16 @@ sub classify ($) { SubType => qw(Ambiguous), Overwritten => $bytime[0], Contributor => $bytime[1]); - }! + } foreach my $p (@p) { my ($p_h, $p_m) = get_commit $p; $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m; ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m; } - my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' }; + my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p; my $m2 = $m; if (!(grep { !$_->{IsOrigin} } @p) and - (@origs >= @p - 1) and + (@orig_ps >= @p - 1) and $m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) { $r->{NewMsg} = $m2; return $classify->(qw(DgitImportUnpatched), @@ -300,9 +307,11 @@ sub classify ($) { return $unknown->("complex merge"); } -sub walk ($$;$$$) { - my ($input, $wantdebonly, - $report, $depth, $report_anomaly, $report_only) = @_; +sub walk ($;$$$$); +sub walk { + my ($input, + $nogenerate,$report, + $wantdebonly,$depth) = @_; # go through commits backwards # we generate two lists of commits to apply # => ($tip, $breakwater_tip) @@ -310,11 +319,6 @@ sub walk ($$;$$$) { my %found; my @pseudomerges; - $report //= sub { }; - $report_anomaly //= sub { - my ($cl, $msg) = @_; - die "commit $cl: $msg\n"; - }; $depth //= 0; my $cl; @@ -330,12 +334,19 @@ sub walk ($$;$$$) { }; my $cur = $input; + my $basis; + + my $prdelim = ""; + my $prprdelim = sub { print $report $prdelim if $report; $prdelim=""; }; for (;;) { $cl = classify $cur; my $ty = $cl->{Type}; my $st = $cl->{SubType}; - $report->($cl); + if ($report) { + print $report $prdelim, "$cl->{CommitId} $cl->{Type}"; + $prdelim = "\n"; + } $found{$ty. ( defined($st) ? "-$st" : '' )}++; push @processed, $cl; my $p0 = $cl->{Parents}[0]{CommitId}; @@ -362,6 +373,7 @@ sub walk ($$;$$$) { $rewrite_from_here->(); next; } elsif ($ty eq 'Pseudomerge') { + print $report " Contributor=$ty->{Contributor}" if $report; push @pseudomerges, $cl; $rewrite_from_here->(); $cur = $ty->{Contributor}; @@ -382,32 +394,43 @@ sub walk ($$;$$$) { # of a new upstream version. We can tell these apart # by looking at the tree of the supposed upstream. my $differs = get_differs $previous_breakwater, $cl->{Tree}; + printf $report " Differs=%#x", $differs if $report; if ($differs & D_UPS) { + printf $report " D_UPS" if $report; push @deb_cl, { - %r, + %$cl, SpecialMethod => 'DgitImportUpstreamUpdate', $xmsg->("convert dgit import: debian changes") }; } push @deb_cl, { - %r, + %$cl, SpecialMethod => 'DgitImportDebianUpdate', $xmsg->("convert dgit import: upstream changes") }; - $basis = launder $pseudomerges[0]{Overwritten}, undef, 1, - $report, $depth+1, $nogenerate; + $prprdelim->(); + $basis = walk + $pseudomerges[0]{Overwritten}, + $nogenerate, $report, + 1, $depth+1; $rewrite_from_here->(); last; } else { - $report_anomaly->($cl, "Cannot cope with this commit"); + print $report " Unprocessable" if $report; + $prprdelim->(); + if ($nogenerate) { + return (undef,undef); + } + die "commit $cur: Cannot cope with this commit"; } } - # Now we build it back up again - + $prprdelim->(); if ($nogenerate) { return (undef, $basis); } + # Now we build it back up again + workarea_fresh(); my $rewriting = 0; @@ -441,9 +464,9 @@ sub walk ($$;$$$) { $current_method = $cl; next; } - $method = $cl->{SpecialMethod} // $current_method; + my $method = $cl->{SpecialMethod} // $current_method; my @parents = ($build); - my $cltree = $cl->{CommitId} + my $cltree = $cl->{CommitId}; if ($method eq 'Debian') { $read_tree_debian->($cltree); } elsif ($method eq 'Upstream') { @@ -457,7 +480,7 @@ sub walk ($$;$$$) { next; } elsif ($method eq 'DgitImportDebianUpdate') { $read_tree_debian->($cltree); - $rm_tree_cached(qw(debian/patches)); + $rm_tree_cached->(qw(debian/patches)); } elsif ($method eq 'DgitImportUpstreamUpdate') { $read_tree_upstream->($cltree); push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} }; @@ -469,28 +492,28 @@ sub walk ($$;$$$) { my $ch = $cl->{Hdr}; $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?"; $ch =~ s{^parent .*\n}{}m; - $ch =~ s{(?=^author}{ + $ch =~ s{(?=^author)}{ map { "parent $_\n" } @parents }me or confess "$ch ?"; - if ($rewrite) { + if ($rewriting) { $ch =~ s{^committer .*$}{$committer_authline}m or confess "$ch ?"; } - my $cf = "$rd/m$rewrite" - open CD, ">", $cf or die $!; - print CD $ch, "\n", $cl->{Msg}; or die $!; + my $cf = "$rd/m$rewriting"; + open CD, ">", $cf or die $!; + print CD $ch, "\n", $cl->{Msg} or die $!; close CD or die $!; my @cmd = (@git, qw(hash-object)); - push @cmd, qw(-w) if $rewrite; + push @cmd, qw(-w) if $rewriting; push @cmd, qw(-t commit), $cf; my $newcommit = cmdoutput @cmd; - confess "$ch ?" unless $rewrite or $newcommit eq $cl->{CommitId}; + confess "$ch ?" unless $rewriting or $newcommit eq $cl->{CommitId}; $build = $newcommit; } }; runcmd @git, qw(diff-tree --quiet), - map { $wantdebonly ? "$_:debian" : $_ }, + map { $wantdebonly ? "$_:debian" : $_ } $input, $build; return ($build, $breakwater); @@ -503,16 +526,28 @@ sub update_head ($$) { runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old; } -sub cmd_analyse () { - - sub cmd_launder () { + badusage "no arguments to launder allowed"; my $old = get_head(); - my ($tip,$breakwater) = launder $old, 0, undef, 0; + my ($tip,$breakwater) = walk $old; update_head $old, $tip, 'launder'; # no tree changes except debian/patches runcmd @git, qw(rm --quiet -rf debian/patches); - printf "# breakwater tip:\n%s\n", $breakwater; + printf "# breakwater tip\n%s\n", $breakwater; +} + +sub cmd_analyse () { + die if ($ARGV[0]//'') =~ m/^-/; + badusage "too many arguments to analyse" if @ARGV>1; + my ($old) = @ARGV; + if (defined $old) { + $old = git_rev_parse $old; + } else { + $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);