# 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] <upstreaminfo>
+# git-debrebase new-upstream [-f] <upstreaminfo>
# git-debrebase <git-rebase options> # does debrebase start if necessary
#
+# <upstreaminfo> is
+# [,][<subdir>:][+]<commitid>[,...]
+#
+# if initial comma is supplied, entries are not positional. Unspecified
+# <subdir> means root (and there may be only one).
+# xxx want auto branch names
+# xxx too complicated
+# how about for now
+# [+]<commit> [<subdir:> [+]<commit>...]
+# ? 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
#
# 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;
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);
return (Msg => $ms);
};
+ my $cur = $input;
+
for (;;) {
$cl = classify $cur;
my $ty = $cl->{Type};
$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;
$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);
my $committer_authline = calculate_committer_authline();
+ my $need_rewrite = 0;
+
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;
} elsif ($method eq 'DgitImportDebianUpdate') {
$read_tree_debian->($cltree);
$rm_tree_cached(qw(debian/patches));
+ $need_rewrite = 1;
} elsif ($method eq 'DgitImportUpstreamUpdate') {
$read_tree_upstream->($cltree);
push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
+ $need_rewrite = 1;
} else {
confess "$method ?";
}
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 $!;
- 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;
+ $ch =~ s{^parent .*\n}{}m;
+ $ch =~ s{(?=^author}{
+ map { "parent $_\n" } @parents
+ }me or confess "$ch ?";
+ foreach my $rewrite ($need_rewrite ? 1 : qw(0 1)) {
+ if ($rewrite) {
+ $ch =~ s{^committer .*$}{$committer_authline}m
+ or confess "$ch ?";
+ $need_rewrite = 1;
+ }
+ my $cf = "$rd/m$rewrite"
+ 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(-t commit), $cf;
+ my $newcommit = cmdoutput @cmd;
+ next unless $rewrite or $newcommit eq $cl->{CommitId};
+ $build = $newcommit;
+ last;
+ }
}
};
-}
-
-
-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->();
~ianmdlvl / dgit.git / blobdiff