use Data::Dumper;
use Getopt::Long qw(:config posix_default gnu_compat bundling);
-use Debian::Dgit qw(:DEFAULT $wa);
+use Debian::Dgit qw(:DEFAULT :playground);
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->(); };
+ changedir $maindir;
+}
+
+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 $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;
+ push @cmd, "$_:" foreach $x, $y;
+ push @cmd, @$limits;
my $diffs = cmdoutput @cmd;
foreach (split /\0/, $diffs) { $fn->(); }
};
- $rundiff->(undef, '', sub {
- $differs |= $_ 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 |= $_ 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 = $_; next;
}
+ die unless s{^debian/patches/}{};
my $ok;
if ($mode eq 'A' && !m/(?:^|\.)series$/s) {
$ok = 1;
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));
}
} 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;
}
# 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
}
- # xxx multi-.orig upstreams
return $unknown->("complex merge");
}
$cur = $p0;
next;
} elsif ($ty eq 'Pseudomerge') {
- print $report " Contributor=$cl->{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) = @_;
}
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';
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/-/_/;