+ runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
+ printf "# breakwater tip\n%s\n", $breakwater;
+ printf "# working tip\n%s\n", $tip;
+}
+
+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;
+ STDOUT->error and die $!;
+}
+
+sub cmd_new_upstream_v0 () {
+ badusage
+ "need NEW-VERSION ORIG-COMMITISH [EXTRA-ORIG-NAME EXTRA-ORIG-COMMITISH...]"
+ unless @ARGV % 2 == 0 and @ARGV >= 2;
+ # tree should be clean and this is not checked
+ # automatically and unconditionally launders before rebasing
+ # if rebase --abort is used, laundering has still been done
+
+ # parse args - low commitment
+ my $new_version = new Dpkg::Version scalar(shift @ARGV), 1;
+ my $new_upstream_version = $new_version->version();
+ my $new_orig_commitish = git_rev_parse shift @ARGV;
+ my @extra_origs;
+ while (@ARGV) {
+ my $xo = {
+ Name => shift @ARGV,
+ New => git_rev_parse shift @ARGV,
+ };
+ die unless $xo->{Name} =~ m/^$extra_orig_namepart_re$/;
+ push @extra_origs, $xo;
+ }
+
+ # now we need to investigate the branch this generates the
+ # laundered version but we don't switch to it yet
+ my $old = get_head();
+ my ($laundered_tip,$breakwater) = walk $old;
+
+ my $breakwater_cl = classify $breakwater;
+ my $old_orig_pi = $breakwater_cl->{OrigParents}[0];
+
+ fresh_workarea();
+ in_workarea sub {
+ my $ff_still_ok = 1;
+
+ my $ffnot = sub {
+ my ($msg) = @_;
+ $ff_still_ok = 0;
+ print STDERR "upstream not fast forward: $msg\n";
+ };
+
+ if (@extra_origs) {
+ # check fast forward, and make new combined-orig commit
+ my $old_orig_ci = parsecommit $old_orig_pi->{CommitId};
+ my $n_old_origs = scalar @{ $old_orig_cp->{Parents} };
+ @{ $n_old_origs } == @extra_origs+1 or
+ $ffnot->(sprintf
+ "previous breakwater upstream has %d parents".
+ " but new upstream has %d pieces, cannot check ff",
+ $n_old_origs,
+ (1 + scalar @extra_origs));
+ }
+
+ my @upstream_merge_parents;
+
+ foreach my $piece_ix (0..$n_old_origs-1) {
+ my $prevpc = $breakwater.'^'.($old_orig_pi->{Ix} + 1);
+ if (@extra_origs) {
+ $prevpc .= '^'.($piece_ix + 1);
+ }
+ die unless $ git_rev_parse $prevpc;
+ my ($newpc,$newdesc,$pcname);
+ if (!$piece_ix) {
+ $newpc = $new_orig_commitish;
+ $newdesc = 'new main upstream piece';
+ } else {
+ $newpc = $extra_origs[$piece_ix+1]{New};
+ $pcname = $extra_origs[$piece_ix-1]{Name}
+ $newdesc = "new upstream extra piece \`$pcname";
+ }
+ $ffwant->($prevpc, "previous upstream piece ($prevpc)",
+ $newpc, "newdesc ($newpc)");
+
+ push @upstream_merge_parents, $newpc;
+
+ my @cmd = @git, qw(read-tree);
+ if (defined $pcname) {
+ push @cmd, "-prefix=$pcname/";
+ runcmd @git, qw(rm --cached -f --ignore-unmatch), $pcname;
+ }
+ push @cmd, $newpc;
+ runcmd @cmd;
+ }
+
+ # index now contains the new upstream
+ if (!$ff_still_ok) {
+ die "upstreams not fast forward, stopping".
+ " (xxx should be an override option)";
+ }
+
+ if (@extra_origs) {
+ # need to make the upstream subtree merge commit
+ my $us_tree = cmdoutput @git, qw(write-tree);
+ my @cmd = @git, qw(commit-tree), $us_tree;
+ if ($ff_still_ok) {
+ push @cmd, qw(-p),
+ } else {
+ die 'do we want to make ff from previous upstream comb?"';
+ }
+ push @cmd, qw(-p), $_ foreach @upstream_merge_parents;
+ push @cmd, qw(-m), "Combine upstreams for $new_upstream_version";
+ push @cmd, qw(-m),
+ "[git-debrebase combine-upstreams . ".
+ (join " ", map { $_->{Name} } @extra_upstreams)."]";
+ my $combined = cmdoutput @cmd;
+ }
+
+
+ my $us_txt = "
+ make_commit_te
+
+ update_head
+ xxx check new orig version is reasonable;
+ xxx decorate new orig version to get new debian version;
+
+
+sub cmd_downstream_rebase_launder_v0 () {
+ badusage "needs 1 argument, the baseline" unless @ARGV==1;
+ my ($base) = @ARGV;
+ $base = git_rev_parse $base;
+ my $old_head = get_head();
+ my $current = $old_head;
+ my $topmost_keep;
+ for (;;) {
+ if ($current eq $base) {
+ $topmost_keep //= $current;
+ print " $current BASE stop\n";
+ last;
+ }
+ my $cl = classify $current;
+ print " $current $cl->{Type}";
+ my $keep = 0;
+ my $p0 = $cl->{Parents}[0]{CommitId};
+ my $next;
+ if ($cl->{Type} eq 'Pseudomerge') {
+ print " ^".($cl->{Contributor}{Ix}+1);
+ $next = $cl->{Contributor}{CommitId};
+ } elsif ($cl->{Type} eq 'AddPatches' or
+ $cl->{Type} eq 'Changelog') {
+ print " strip";
+ $next = $p0;
+ } else {
+ print " keep";
+ $next = $p0;
+ $keep = 1;
+ }
+ print "\n";
+ if ($keep) {
+ $topmost_keep //= $current;
+ } else {
+ die "to-be stripped changes not on top of the branch\n"
+ if $topmost_keep;
+ }
+ $current = $next;
+ }
+ if ($topmost_keep eq $old_head) {
+ print "unchanged\n";
+ } else {
+ print "updating to $topmost_keep\n";
+ update_head_checkout
+ $old_head, $topmost_keep,
+ 'downstream-rebase-launder-v0';
+ }