git-debrebase: git-debrebase WIP minimal executable ?

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 0fb7c3c7c0517bc68f0ba6854d4a1a63a62601f6..b306d60d576ffb3feffba894c769009a6297d557 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -18,6 +18,28 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# usages:
+#    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 <git-rebase options>  # does debrebase start if necessary
+#
+#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
+#    git-ffrebase <git-rebase options>
+#    git-ffrebase finish
+#    git-ffrebase status [BRANCH]
+#
+#  refs/ffrebase-prev/BRANCH    BRANCH may be refs/...; if not it means
+#  refs/ffrebase-base/BRANCH      refs/heads/BRANCH
+#                               zero, one, or both of these may exist
+
 use strict;
 
 use Memoize;
@@ -37,9 +59,6 @@ sub cfg ($) {
 
 memoize('cfg');
 
-# usage
-#  git debrebase launder
-
 sub get_commit ($) {
     my ($objid) = @_;
     my ($type,$data) = git_cat_file $objid;
@@ -182,8 +201,8 @@ sub classify ($) {
     return $unknown->("complex merge");
 }
 
-sub launder ($;$) {
-    my ($cur, $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);
@@ -199,6 +218,8 @@ sub launder ($;$) {
        return (Msg => $ms);
     };
 
+    my $cur = $input;
+
     for (;;) {
        $cl = classify $cur;
        my $ty = $cl->{Type};
@@ -226,6 +247,9 @@ sub launder ($;$) {
            $queue->(\@ups_cl, "upstream");
            next;
        } elsif ($ty eq 'Pseudomerge') {
+           if (defined $pseudos_must_overwrite_this) {
+               confess 'xxx actually check this';
+           }
            push @pseudomerges, $cl;
            $cur = $ty->{Contributor};
            next;
@@ -257,7 +281,7 @@ 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;
            last;
        } else {
            die "Reached difficult commit $cur: ".Dumper($cl);
@@ -288,6 +312,8 @@ sub launder ($;$) {
     my $committer_authline = calculate_committer_authline();
 
     in_workarea sub {
+       mkdir $rd or $!==EEXIST or die $!;
+
        my $current_method;
        foreach my $cl (qw(Debian), @deb_cl, qw(Upstream), @ups_cl) {
            if (!ref $cl) {
@@ -314,66 +340,41 @@ sub launder ($;$) {
            my $ch = $cl->{Msg};
            $ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
            $ch =~ s{^committer .*$}{$committer_authline}m or confess "$ch ?";
-           my $newcommit = cmdoutput @git, qw(hash-object -t commit),
-               $ch."\n".$cl->{Msg};
-           
-
-           #my $cdata = <<END;
-tree $newtree
-author $
+           open CD, ">", "$rd/m" 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";
+           $build = $newcommit;
+       }
     };
 
-               $r->{FixupUpstreamMerge} = $
+    runcmd @git, qw(diff-tree --quiet),
+       map { $wantdebonly ? "$_:debian" : $_ },
+       $input, $build;
 
-               push @deb_cl, {
-                    $cl,
-                    Type => NonGitNewUpstreamDgitImport,
-                    PreviousBreakwaterMerge => 
-               
-
-           push @phases, [ @deb_cl, @ups_cl ];
-           
-           if (@pseudomerges != 1) {
-}   
-
-
-chdir $GIT_DIR
-
-                              
-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->();