+ push @deb_cl, {
+ %r,
+ SpecialMethod => 'DgitImportUpstreamUpdate',
+ $xmsg->("convert dgit import: debian changes")
+ };
+ }
+ push @deb_cl, {
+ %r,
+ SpecialMethod => 'DgitImportDebianUpdate',
+ $xmsg->("convert dgit import: upstream changes")
+ };
+ my $differs = get_differs $previous_breakwater, $cl->{Tree};
+ $basis = launder $pseudomerges[0]{Overwritten}, 1;
+ last;
+ } else {
+ die "Reached difficult commit $cur: ".Dumper($cl);
+ }
+ }
+ # Now we build it back up again
+
+ workarea_fresh();
+ in_workarea sub { xxx attributes xxx };
+
+ my $build = $basis;
+
+ my $rm_tree_cached = sub {
+ my ($subdir) = @_;
+ runcmd @git, qw(rm --quiet -rf --cached), $subdir;
+ };
+ my $read_tree_debian = sub {
+ my ($treeish) = @_;
+ $rm_tree_cached->(qw(debian));
+ runcmd @git, qw(read-tree --prefix=debian/), "$treeish:debian";
+ };
+ my $read_tree_upstream = sub {
+ my ($treeish) = @_;
+ runcmd @git, qw(read-tree), $treeish;
+ $read_tree_debian->($build);
+ };
+
+ my $committer_authline = calculate_committer_authline();
+
+ in_workarea sub {
+ my $current_method;
+ foreach my $cl (qw(Debian), @deb_cl, qw(Upstream), @ups_cl) {
+ if (!ref $cl) {
+ $current_method = $cl;
+ next;
+ }
+ $method = $cl->{SpecialMethod} // $current_method;
+ my @parents = ($build);
+ my $cltree = $cl->{CommitId}
+ if ($method eq 'Debian') {
+ $read_tree_debian->($cltree);
+ } elsif ($method eq 'Upstream') {
+ $read_tree_upstream->($cltree);
+ } elsif ($method eq 'DgitImportDebianUpdate') {
+ $read_tree_debian->($cltree);
+ $rm_tree_cached(qw(debian/patches));
+ } elsif ($method eq 'DgitImportUpstreamUpdate') {
+ $read_tree_upstream->($cltree);
+ push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };
+ } else {
+ confess "$method ?";
+ }
+ my $newtree = cmdoutput @git, qw(write-tree);
+ 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 $
+ };
+