X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=d6bd8a5148c356380d4ec196d57260e7fa3e5669;hb=b11760cf2a4d85e63085db5ed504804e6ffe36a8;hp=1c902a262266db30d864c2e10d79c6180e692947;hpb=873877b3ec9f20ebfd8ca1b8365d68c0e1f296c1;p=dgit.git diff --git a/git-debrebase b/git-debrebase index 1c902a26..d6bd8a51 100755 --- a/git-debrebase +++ b/git-debrebase @@ -63,7 +63,7 @@ # - no fast forward checks # for now only explicit with commitids - # implicitly uses `upstream' +# implicitly uses `upstream' # # (or multiple other branches) # git-debrebase new-upstream \ # [/]= @@ -87,14 +87,34 @@ # refs/ffqrebase-prev/BRANCH BRANCH may be refs/...; if not it means # refs/ffqrebase-base/BRANCH refs/heads/BRANCH # zero, one, or both of these may exist +# +# git-debrebase without start, if already started, is willing +# to strip pseudomerges provided that they overwrite exactly +# the previous HEAD +# xxxx is this right ? what matters is have we pushed +# I think in fact the right answer is: +# git-debrebase always strips out pseudomerges from its branch +# a pseudomerge is put in at the time we want to push +# at that time, we make a pseudomerge of the remote tracking +# branch (if raw git) or the dgit view (if dgit) +# for raw git git-ffqrebase, do want preciseley to record +# value of remote tracking branch or our branch, on start, so we +# overwrite only things we intend to +# the previous pseudomerge check for tags and remote branches ? 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"; @@ -122,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) = @_; @@ -130,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 $&; @@ -177,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, @@ -199,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"); @@ -248,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), @@ -279,20 +300,27 @@ sub classify ($) { !($p[0]{Differs} & ~D_DEB) && !($p[1]{Differs} & ~D_UPS)) { return $classify->(qw(BreakwaterUpstreamMerge), - Upstream => $p[1]); + OrigParents => [ $p[1] ]); } + # xxx multi-.orig upstreams return $unknown->("complex merge"); } -sub launder ($$$) { - my ($input, $pseudos_must_overwrite_this, $wantdebonly) = @_; +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) my (@deb_cl, @ups_cl, @processed); my %found; my @pseudomerges; + $depth //= 0; + my $cl; my $xmsg = sub { my ($appendinfo) = @_; @@ -306,12 +334,21 @@ sub launder ($$$) { }; 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}; + 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}; if ($ty eq 'AddPatches') { $cur = $p0; @@ -319,12 +356,10 @@ sub launder ($$$) { next; } elsif ($ty eq 'Packaging') { push @deb_cl, $cl; - push @processed, $cl; $cur = $p0; next; } elsif ($ty eq 'Upstream') { push @ups_cl, $cl; - push @processed, $cl; $cur = $p0; next; } elsif ($ty eq 'Mixed') { @@ -338,9 +373,7 @@ sub launder ($$$) { $rewrite_from_here->(); next; } elsif ($ty eq 'Pseudomerge') { - if (defined $pseudos_must_overwrite_this) { - confess 'xxx actually check this'; - } + print $report " Contributor=$ty->{Contributor}" if $report; push @pseudomerges, $cl; $rewrite_from_here->(); $cur = $ty->{Contributor}; @@ -360,32 +393,47 @@ sub launder ($$$) { # precisely right. Otherwise, it was a non-gitish upload # 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") }; - my $differs = get_differs $previous_breakwater, $cl->{Tree}; - $basis = launder $pseudomerges[0]{Overwritten}, undef, 1; + $prprdelim->(); + $basis = walk + $pseudomerges[0]{Overwritten}, + $nogenerate, $report, + 1, $depth+1; $rewrite_from_here->(); last; } else { - die "Reached difficult commit $cur: ".Dumper($cl); + print $report " Unprocessable" if $report; + $prprdelim->(); + if ($nogenerate) { + return (undef,undef); + } + die "commit $cur: Cannot cope with this commit"; } } + $prprdelim->(); + if ($nogenerate) { + return (undef, $basis); + } + # Now we build it back up again workarea_fresh(); - in_workarea sub { xxx attributes xxx }; - my $rewriting = 1; + my $rewriting = 0; my $build = $basis; @@ -416,9 +464,9 @@ sub launder ($$$) { $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') { @@ -432,7 +480,7 @@ sub launder ($$$) { 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} }; @@ -444,28 +492,28 @@ sub launder ($$$) { 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); @@ -479,10 +527,27 @@ sub update_head ($$) { } sub cmd_launder () { + badusage "no arguments to launder allowed"; my $old = get_head(); - my ($tip,$breakwater) = launder $old, 0, undef, 0; - update_head $old, $tip, 'launder'; # no tree changes! xxx debian/patches - printf "# breakwater tip:\n%s\n", $breakwater; + 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; +} + +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);