push @brw_cl, $sp_cl;
push @processed, $sp_cl;
};
+ my $build_start = sub {
+ my ($msg, $parents) = @_;
+ $prline->(" $msg");
+ push @brw_cl, { ExactlyParents => $parents };
+ no qw(exiting); last;
+ };
my $cur = $input;
for (;;) {
if (!defined $cur) {
- push @brw_cl, { ExactlyParents => [] };
- $prline->("Origin");
- last;
+ $build_start->('Origin', []);
}
$cl = classify $cur;
my $ty = $cl->{Type};
$cur = $p0;
next;
} elsif ($ty eq 'BreakwaterStart') {
- push @brw_cl, { ExactlyParents => [$cur] };
- last;
+ $build_start('FirstPackaging',[$cur]};
} elsif ($ty eq 'Upstream') {
push @upp_cl, $cl;
$cur = $p0;
$cur = $ty->{Contributor};
next;
} elsif ($ty eq 'BreakwaterUpstreamMerge') {
- push @brw_cl, { ExactlyParents => [$cur] };
- $prline->("PreviousBreakwater");
- last;
+ $build_start->("PreviousBreakwater", [$cur]);
} elsif ($ty eq 'DgitImportUnpatched') {
my $pm = $pseudomerges[-1];
if (defined $pm) {
# is already in valid breakwater format, with the
# patches as commits.
printf $report " NoPM" if $report;
- $prline->(" ImportOrigin");
# last thing we processed will have been the first patch,
# if there is one; which is fine, so no need to rewrite
# on account of this import
- push @brw_cl, { ExactlyParents => [$cur] };
- last;
+ $build_start->("ImportOrigin",[$cur]);
}
die "$ty ?";
} else {