# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# git-debrebase new-upstreams-v0 \
+# NEW-VERSION ORIG-COMMITISH
+# [EXTRA-ORIG-NAME EXTRA-ORIG-COMMITISH ...]
+
# usages:
# git-debrebase status
# git-debrebase start # like ffqrebase start + debrebase launder
use strict;
+use Debian::Dgit qw(:DEFAULT :playground);
+setup_sigwarn();
+
use Memoize;
use Carp;
use POSIX;
use Data::Dumper;
-
-use Debian::Dgit qw(:DEFAULT $wa);
+use Getopt::Long qw(:config posix_default gnu_compat bundling);
sub badusage ($) {
my ($m) = @_;
sub get_commit ($) {
my ($objid) = @_;
- my ($type,$data) = git_cat_file $objid;
- die unless $type eq 'commit';
- $data =~ m/(?<=\n)\n/;
+ my $data = git_cat_file $objid, 'commit';
+ $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
return ($`,$');
}
-sub D_DEB () { return 0x1; } # debian/ (not including debian/patches/)
-sub D_UPS () { return 0x2; } # upstream files
-sub D_PAT_ADD () { return 0x4; } # debian/patches/ extra patches at end
-sub D_PAT_OTH () { return 0x8; } # debian/patches other changes
+sub D_UPS () { 0x02; } # upstream files
+sub D_PAT_ADD () { 0x04; } # debian/patches/ extra patches at end
+sub D_PAT_OTH () { 0x08; } # debian/patches other changes
+sub D_DEB_CLOG () { 0x10; } # debian/ (not patches/ or changelog)
+sub D_DEB_OTH () { 0x20; } # debian/changelog
+sub DS_DEB () { D_DEB_CLOG | D_DEB_OTH; } # debian/ (not patches/)
+
+our $playprefix = 'debrebase';
+our $rd;
+our $workarea;
-our $rd = ".git/git-debrebase";
-our $ud = "$rd/work";
our @git = qw(git);
+sub in_workarea ($) {
+ my ($sub) = @_;
+ changedir $workarea;
+ my $r = eval { $sub->(); };
+ { local $@; changedir $maindir; }
+ die $@ if $@;
+}
+
+sub fresh_workarea () {
+ $workarea = fresh_playground "$playprefix/work";
+ in_workarea sub { playtree_setup };
+}
+
sub get_differs ($$) {
my ($x,$y) = @_;
# This resembles quiltify_trees_differ, in dgit, a bit.
my $differs = 0;
- my $f;
my $rundiff = sub {
- my ($opts, $sfx, $fn) = @_;
- $opts //= [qw(--name-only)];
+ my ($opts, $limits, $fn) = @_;
my @cmd = (@git, qw(diff-tree -z --no-renames));
push @cmd, @$opts;
- push @cmd, "$_:$sfx" foreach $x, $y;
- my $diffs = cmdoutput @cmd, $x, $y;
- foreach $f (split /\0/, $diffs) { $fn->(); }
+ push @cmd, "$_:" foreach $x, $y;
+ push @cmd, @$limits;
+ my $diffs = cmdoutput @cmd;
+ foreach (split /\0/, $diffs) { $fn->(); }
};
- $rundiff->(undef, '', sub {
- $differs |= $f eq 'debian' ? D_DEB : D_UPS;
+ $rundiff->([qw(--name-only)], [], sub {
+ $differs |= $_ eq 'debian' ? DS_DEB : D_UPS;
});
- if ($differs & D_DEB) {
- $differs &= ~D_DEB;
- $rundiff->(undef, ':debian', sub {
- $differs |= $f eq 'patches' ? D_PAT_OTH : D_DEB;
+ if ($differs & DS_DEB) {
+ $differs &= ~DS_DEB;
+ $rundiff->([qw(--name-only -r)], [qw(debian)], sub {
+ $differs |=
+ m{^debian/patches/} ? D_PAT_OTH :
+ $_ eq 'debian/changelog' ? D_DEB_CLOG :
+ D_DEB_OTH;
});
die "mysterious debian changes $x..$y"
- unless $differs & (D_PAT_OTH|D_DEB);
+ unless $differs & (D_PAT_OTH|DS_DEB);
}
if ($differs & D_PAT_OTH) {
$differs |= D_PAT_OTH;
no warnings qw(exiting); last;
};
- $rundiff->([qw(--name-status)], ':debian/patches', sub {
+ $rundiff->([qw(--name-status -r)], [qw(debian/patches/)], sub {
no warnings qw(exiting);
if (!defined $mode) {
- $mode = $f; next;
+ $mode = $_; next;
}
+ die unless s{^debian/patches/}{};
my $ok;
- if ($mode eq 'A' && $f !~ m/(?:^|\.)series$/s) {
+ if ($mode eq 'A' && !m/\.series$/s) {
$ok = 1;
- } elsif ($mode eq 'M' && $f eq 'series') {
+ } elsif ($mode eq 'M' && $_ eq 'series') {
my $x_s = git_cat_file "$x:debian/patches/series", 'blob';
my $y_s = git_cat_file "$y:debian/patches/series", 'blob';
chomp $x_s; $x_s .= "\n";
unless $differs & (D_PAT_ADD|D_PAT_OTH);
}
+ printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs;
+
return $differs;
}
#
# Types:
# Packaging
+# Changelog
# Upstream
# AddPatches
# Mixed
#
# BreakwaterUpstreamMerge
# has additional entry in classification result
-# OrigParents = [ subset of Parents ]
+# OrigParents = [ subset of Parents ] # singleton list
-sub classify ($) {
- my ($objid) = @_;
+sub parsecommit ($;$) {
+ my ($objid, $p_ref) = @_;
+ # => hash with CommitId Hdr Msg Tree Parents
+ # Parents entries have only Ix CommitId
+ # $p_ref, if provided, must be [] and is used as a base for Parents
+
+ $p_ref //= [];
+ die if @$p_ref;
my ($h,$m) = get_commit $objid;
my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
- my (@ph) = $h =~ m/^parent (\w+)$/m;
- my @p;
+ my (@ph) = $h =~ m/^parent (\w+)$/mg;
my $r = {
CommitId => $objid,
Hdr => $h,
Msg => $m,
Tree => $t,
- Parents => \@p,
+ Parents => $p_ref,
};
foreach my $ph (@ph) {
- push @p, {
- Ix => $#p,
+ push @$p_ref, {
+ Ix => $#$p_ref,
CommitId => $ph,
- Differs => (get_differs $t, $ph),
};
}
+ return $r;
+}
+
+sub classify ($) {
+ my ($objid) = @_;
+
+ my @p;
+ my $r = parsecommit($objid, \@p);
+ my $t = $r->{Tree};
+
+ foreach my $p (@p) {
+ $p->{Differs} => (get_differs $p->{CommitId}, $t),
+ }
+
+ printdebug "classify $objid \$t=$t \@p",
+ (map { sprintf " %s/%#x", $_->{CommitId}, $_->{Differs} } @p),
+ "\n";
+
my $classify = sub {
my ($type, @rest) = @_;
$r = { %$r, Type => $type, @rest };
+ if ($debuglevel) {
+ my $dd = new Data::Dumper [ $r ];
+ Terse $dd 1; Indent $dd 0; Useqq $dd 1;
+ printdebug " = $type ".(Dump $dd)."\n";
+ }
return $r;
};
my $unknown = sub {
my ($why) = @_;
$r = { %$r, Type => qw(Unknown) };
+ printdebug " ** Unknown\n";
return $r;
};
return $classify->(qw(AddPatches));
} elsif ($d & (D_PAT_ADD|D_PAT_OTH)) {
return $unknown->("edits debian/patches");
- } elsif ($d == D_DEB) {
+ } elsif ($d & DS_DEB and !($d & ~DS_DEB)) {
my ($ty,$dummy) = git_cat_file "$ph[0]:debian";
if ($ty eq 'tree') {
- return $classify->(qw(Packaging));
+ if ($d == D_DEB_CLOG) {
+ return $classify->(qw(Changelog));
+ } else {
+ return $classify->(qw(Packaging));
+ }
} elsif ($ty eq 'missing') {
return $classify->(qw(BreakwaterStart));
} else {
}
} elsif ($d == D_UPS) {
return $classify->(qw(Upstream));
- } elsif ($d == (D_DEB|D_UPS)) {
+ } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) {
return $classify->(qw(Mixed));
} elsif ($d == 0) {
return $unknown->("no changes");
Contributor => $bytime[1]);
}
foreach my $p (@p) {
- my ($p_h, $p_m) = get_commit $p;
+ my ($p_h, $p_m) = get_commit $p->{CommitId};
$p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
}
my @orig_ps = grep { ($_->{IsDgitImport}//'X') eq 'orig' } @p;
- my $m2 = $m;
+ my $m2 = $r->{Msg};
if (!(grep { !$_->{IsOrigin} } @p) and
(@orig_ps >= @p - 1) and
$m2 =~ s{^\[(dgit import unpatched .*)\]$}{[was: $1]}m) {
# debian/) so debian breakwater branch should be 1st parent; that
# way also there's also an easy rune to look for the upstream
# patches (--topo-order).
- if (@p == 2 &&
- !$haspatches &&
- !$p[0]{IsOrigin} && # breakwater merge never starts with an origin
- !($p[0]{Differs} & ~D_DEB) &&
- !($p[1]{Differs} & ~D_UPS)) {
- return $classify->(qw(BreakwaterUpstreamMerge),
- OrigParents => [ $p[1] ]);
+
+ # The above tells us which way *we* will generate them. But we
+ # might encounter ad-hoc breakwater merges generated manually,
+ # which might be the other way around. In principle, in some odd
+ # situations, a breakwater merge might have two identical parents.
+ # In that case we guess which way round it is (ie, which parent
+ # has the upstream history). The order of the 2-iteration loop
+ # controls which guess we make.
+
+ foreach my $prevbrw (qw(0 1)) {
+ if (@p == 2 &&
+ !$haspatches &&
+ !$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
+ !($p[$prevbrw]{Differs} & ~DS_DEB) &&
+ !($p[!$prevbrw]{Differs} & ~D_UPS)) {
+ return $classify->(qw(BreakwaterUpstreamMerge),
+ OrigParents => [ $p[!$prevbrw] ]);
+ }
}
- # xxx multi-.orig upstreams
+
+ # multi-orig upstreams are represented with a breakwater merge
+ # from a single upstream commit which combines the orig tarballs
return $unknown->("complex merge");
}
if ($nogenerate) {
return (undef,undef);
}
- die "commit $cur: Cannot cope with this commit";
+ die "commit $cur: Cannot cope with this commit (d.".
+ (join ' ', map { sprintf "%#x", $_->{Differs} }
+ @{ $cl->{Parents} }). ")";
};
my $build;
$cur = $p0;
$rewrite_from_here->();
next;
- } elsif ($ty eq 'Packaging') {
+ } elsif ($ty eq 'Packaging' or $ty eq 'Changelog') {
push @brw_cl, $cl;
$cur = $p0;
next;
} elsif ($ty eq 'Mixed') {
my $queue = sub {
my ($q, $wh) = @_;
- my $cls = { $cl, $xmsg->("split mixed commit: $wh part") };
+ my $cls = { %$cl, $xmsg->("split mixed commit: $wh part") };
push @$q, $cls;
};
$queue->(\@brw_cl, "debian");
$cur = $p0;
next;
} elsif ($ty eq 'Pseudomerge') {
- print $report " Contributor=$ty->{Contributor}" if $report;
+ my $contrib = $cl->{Contributor}{CommitId};
+ print $report " Contributor=$contrib" if $report;
push @pseudomerges, $cl;
$rewrite_from_here->();
- $cur = $ty->{Contributor};
+ $cur = $contrib;
next;
} elsif ($ty eq 'BreakwaterUpstreamMerge') {
$build_start->("PreviousBreakwater", $cur);
# Now we build it back up again
- workarea_fresh();
+ fresh_workarea();
my $rewriting = 0;
my $rm_tree_cached = sub {
my ($subdir) = @_;
- runcmd @git, qw(rm --quiet -rf --cached), $subdir;
+ runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
};
my $read_tree_debian = sub {
my ($treeish) = @_;
my $committer_authline = calculate_committer_authline();
+ printdebug "WALK REBUILD $build ".(scalar @processed)."\n";
+
+ confess "internal error" unless $build eq (pop @processed)->{CommitId};
+
in_workarea sub {
mkdir $rd or $!==EEXIST or die $!;
my $current_method;
+ runcmd @git, qw(read-tree), $build;
foreach my $cl (qw(Debian), (reverse @brw_cl),
{ SpecialMethod => 'RecordBreakwaterTip' },
qw(Upstream), (reverse @upp_cl)) {
my $method = $cl->{SpecialMethod} // $current_method;
my @parents = ($build);
my $cltree = $cl->{CommitId};
+ printdebug "WALK BUILD ".($cltree//'undef').
+ " $method (rewriting=$rewriting)\n";
if ($method eq 'Debian') {
$read_tree_debian->($cltree);
} elsif ($method eq 'Upstream') {
} else {
confess "$method ?";
}
- $rewriting ||= $cl ne pop @processed;
+ if (!$rewriting) {
+ my $procd = (pop @processed) // 'UNDEF';
+ if ($cl ne $procd) {
+ $rewriting = 1;
+ printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n";
+ }
+ }
my $newtree = cmdoutput @git, qw(write-tree);
my $ch = $cl->{Hdr};
$ch =~ s{^tree .*}{tree $newtree}m or confess "$ch ?";
$ch =~ s{^parent .*\n}{}m;
$ch =~ s{(?=^author)}{
- map { "parent $_\n" } @parents
+ join '', map { "parent $_\n" } @parents
}me or confess "$ch ?";
if ($rewriting) {
$ch =~ s{^committer .*$}{$committer_authline}m
}
};
- runcmd @git, qw(diff-tree --quiet), $input, $build;
+ my $final_check = get_differs $build, $input;
+ die sprintf "internal error %#x %s %s", $final_check, $build, $input
+ if $final_check & ~D_PAT_ADD;
return ($build, $breakwater);
}
sub update_head ($$$) {
my ($old, $new, $mrest) = @_;
- runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
+ runcmd @git, qw(update-ref -m), "debrebase: $mrest", 'HEAD', $new, $old;
+}
+
+sub update_head_checkout ($$$) {
+ my ($old, $new, $mrest) = @_;
+ my $symref = git_get_symref();
+ runcmd @git, qw(checkout), $new, qw(.);
+ update_head $old, $new, $mrest;
}
sub cmd_launder () {
- badusage "no arguments to launder allowed";
+ badusage "no arguments to launder allowed" if @ARGV;
my $old = get_head();
my ($tip,$breakwater) = walk $old;
update_head $old, $tip, 'launder';
# no tree changes except debian/patches
- runcmd @git, qw(rm --quiet -rf debian/patches);
+ 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 () {
$old = get_head();
}
my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
- print "$breakwater BREAKWATER\n";
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';
+ }
+}
+
+GetOptions("D+" => \$debuglevel) or die badusage "bad options\n";
+initdebug('git-debrebase ');
+enabledebug if $debuglevel;
+
my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
chdir $toplevel or die "chdir $toplevel: $!";
+$rd = fresh_playground "$playprefix/misc";
+
my $cmd = shift @ARGV;
my $cmdfn = $cmd;
$cmdfn =~ y/-/_/;
~ianmdlvl / dgit.git / blobdiff