Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
$report->($cl);
$found{$ty. ( defined($st) ? "-$st" : '' )}++;
my $p0 = $cl->{Parents}[0]{CommitId};
$report->($cl);
$found{$ty. ( defined($st) ? "-$st" : '' )}++;
my $p0 = $cl->{Parents}[0]{CommitId};
- $cl->{Abbrev} = lc substr $ty,0,1;
if ($ty eq 'AddPatches') {
if ($ty eq 'AddPatches') {
$cur = $p0;
$rewrite_from_here->();
next;
} elsif ($ty eq 'Packaging') {
$cur = $p0;
$rewrite_from_here->();
next;
} elsif ($ty eq 'Packaging') {
push @deb_cl, $cl;
push @processed, $cl;
$cur = $p0;
push @deb_cl, $cl;
push @processed, $cl;
$cur = $p0;
$rewrite_from_here->();
next;
} elsif ($ty eq 'Pseudomerge') {
$rewrite_from_here->();
next;
} elsif ($ty eq 'Pseudomerge') {
if (defined $pseudos_must_overwrite_this &&
!grep {
is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
if (defined $pseudos_must_overwrite_this &&
!grep {
is_fast_fwd $pseudos_must_overwrite_this, $_->{CommitId}
last;
} elsif ($ty eq 'DgitImportUnpatched' &&
@pseudomerges == 1) {
last;
} elsif ($ty eq 'DgitImportUnpatched' &&
@pseudomerges == 1) {
# This import has a tree which is just like a breakwater
# tree, but it has the wrong history. Its ought to have
# the previous breakwater (which dgit ought to have
# This import has a tree which is just like a breakwater
# tree, but it has the wrong history. Its ought to have
# the previous breakwater (which dgit ought to have