X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=6542c65cfee53f82197a336a76465689ead3772f;hb=c67e1d4470f98bb98365e54c9e872b05b7da6b45;hp=c25c18d9e91739b1f10dd392fac2ff93b135197b;hpb=a23a044a9486d1aebdfaea9ff1c0ed2635339109;p=dgit.git diff --git a/git-debrebase b/git-debrebase index c25c18d9..6542c65c 100755 --- a/git-debrebase +++ b/git-debrebase @@ -22,9 +22,30 @@ # git-debrebase launder # prints breakwater tip # git-debrebase analyse # git-debrebase start # like ffrebase start + debrebase launder -# git-debrebase new-upstream [-f] UPSTREAM +# git-debrebase create-new-upstream [-f] +# git-debrebase new-upstream [-f] # git-debrebase # does debrebase start if necessary # +# is +# [,][:][+][,...] +# +# if initial comma is supplied, entries are not positional. Unspecified +# means root (and there may be only one). +# xxx want auto branch names +# xxx too complicated +# how about for now +# [+] [ [+]...] +# ? plus options +# --new-upstream-different-subtrees + +# UPSTREAM[,[[SUBDIR:]SUBUPSTREAM] +# default for SUBDIR: is from previous upstream merge[xxx terminology] +# +# +#xxx +# when starting must record original start (for ff) +# and new rebase basis +# # git-ffrebase start [BASE] # records previous HEAD so it can be overwritten # # records base for future git-ffrebase # git-ffrebase set-base BASE @@ -197,11 +218,11 @@ sub classify ($) { return $unknown->("complex merge"); } -sub launder ($;$) { - my ($cur, $pseudos_must_overwrite, $wantdebonly) = @_; +sub launder ($$$) { + my ($input, $pseudos_must_overwrite_this, $wantdebonly) = @_; # go through commits backwards # we generate two lists of commits to apply - my (@deb_cl, @ups_cl); + my (@deb_cl, @ups_cl, @processed); my %found; my @pseudomerges; @@ -213,6 +234,11 @@ sub launder ($;$) { $ms .= "\n\n[git-debrebase $appendinfo]\n"; return (Msg => $ms); }; + my $rewrite_from_here = sub { + push @processed, { SpecialMethod => 'StartRewrite' }; + }; + + my $cur = $input; for (;;) { $cl = classify $cur; @@ -222,13 +248,16 @@ sub launder ($;$) { my $p0 = $cl->{Parents}[0]{CommitId}; if ($ty eq 'AddPatches') { $cur = $p0; + $rewrite_from_here->(); 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') { @@ -239,11 +268,14 @@ sub launder ($;$) { }; $queue->(\@deb_cl, "debian"); $queue->(\@ups_cl, "upstream"); + $rewrite_from_here->(); next; } elsif ($ty eq 'Pseudomerge') { - if (defined $pseudos_must_overwrite) { + if (defined $pseudos_must_overwrite_this) { + confess 'xxx actually check this'; } push @pseudomerges, $cl; + $rewrite_from_here->(); $cur = $ty->{Contributor}; next; } elsif ($ty eq 'BreakwaterUpstreamMerge') { @@ -274,7 +306,8 @@ sub launder ($;$) { $xmsg->("convert dgit import: upstream changes") }; my $differs = get_differs $previous_breakwater, $cl->{Tree}; - $basis = launder $pseudomerges[0]{Overwritten}, 1; + $basis = launder $pseudomerges[0]{Overwritten}, undef, 1; + $rewrite_from_here->(); last; } else { die "Reached difficult commit $cur: ".Dumper($cl); @@ -285,6 +318,8 @@ sub launder ($;$) { workarea_fresh(); in_workarea sub { xxx attributes xxx }; + my $rewriting = 1; + my $build = $basis; my $rm_tree_cached = sub { @@ -306,9 +341,9 @@ sub launder ($;$) { in_workarea sub { mkdir $rd or $!==EEXIST or die $!; - my $current_method; - foreach my $cl (qw(Debian), @deb_cl, qw(Upstream), @ups_cl) { + foreach my $cl (qw(Debian), (reverse @deb_cl), + qw(Upstream), (reverse @ups_cl)) { if (!ref $cl) { $current_method = $cl; next; @@ -320,6 +355,9 @@ sub launder ($;$) { $read_tree_debian->($cltree); } elsif ($method eq 'Upstream') { $read_tree_upstream->($cltree); + } elsif ($method eq 'StartRewrite') { + $rewriting = 1; + next; } elsif ($method eq 'DgitImportDebianUpdate') { $read_tree_debian->($cltree); $rm_tree_cached(qw(debian/patches)); @@ -329,58 +367,58 @@ sub launder ($;$) { } else { confess "$method ?"; } + $rewriting ||= $cl ne pop @processed; my $newtree = cmdoutput @git, qw(write-tree); - my $ch = $cl->{Msg}; + my $ch = $cl->{Hdr}; $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?"; - $ch =~ s{^committer .*$}{$committer_authline}m or confess "$ch ?"; - open CD, ">", "$rd/m" or die $!; + $ch =~ s{^parent .*\n}{}m; + $ch =~ s{(?=^author}{ + map { "parent $_\n" } @parents + }me or confess "$ch ?"; + if ($rewrite) { + $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 $!; close CD or die $!; - my $newcommit = cmdoutput @git, qw(hash-object -t commit), "$rd/m"; + my @cmd = (@git, qw(hash-object)); + push @cmd, qw(-w) if $rewrite; + push @cmd, qw(-t commit), $cf; + my $newcommit = cmdoutput @cmd; + confess "$ch ?" unless $rewrite or $newcommit eq $cl->{CommitId}; $build = $newcommit; } }; -} - - -chdir $GIT_DIR + runcmd @git, qw(diff-tree --quiet), + map { $wantdebonly ? "$_:debian" : $_ }, + $input, $build; - -if ($ARGV[0] eq 'launder') { - launder(); + return $build; } -use Data::Dumper; -print Dumper(cfg('wombat.foo.bar')); - - - ((git_cat_file "$t:debian/patches/series" - - - my @ - - - - return $r; - $r->{Type} = ' - $r->{Type} = ' - return - # changes on debian/patches, discard it - - $cur = $p[0]; - next; - } - if ($d & DPAT) { - - - ($r->{Tree},) = - - +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; +} +sub cmd_launder () { + my $old = get_head(); + my $got = launder $old, 0, undef, 0; + update_head $old, $new, 'launder'; # no tree changes! +} +my $toplevel = runcmd @git, qw(rev-parse --show-toplevel); +chdir $toplevel or die "chdir $toplevel: $!"; - when starting must record original start (for ff) - and new rebase basis +my $cmd = shift @ARGV; +my $cmdfn = $cmd; +$cmdfn =~ y/-/_/; +$cmdfn = ${*::}{"cmd_$cmdfn"}; +$cmdfn or badusage "unknown git-debrebase sub-operation $cmd"; +$cmdfn->();