if ($differs & D_UPS) {
printf $report " D_UPS" if $report;
push @deb_cl, {
- %r,
+ %$cl,
SpecialMethod => 'DgitImportUpstreamUpdate',
$xmsg->("convert dgit import: debian changes")
};
}
push @deb_cl, {
- %r,
+ %$cl,
SpecialMethod => 'DgitImportDebianUpdate',
$xmsg->("convert dgit import: upstream changes")
};
$current_method = $cl;
next;
}
- $method = $cl->{SpecialMethod} // $current_method;
+ my $method = $cl->{SpecialMethod} // $current_method;
my @parents = ($build);
- my $cltree = $cl->{CommitId}
+ my $cltree = $cl->{CommitId};
if ($method eq 'Debian') {
$read_tree_debian->($cltree);
} elsif ($method eq 'Upstream') {
next;
} elsif ($method eq 'DgitImportDebianUpdate') {
$read_tree_debian->($cltree);
- $rm_tree_cached(qw(debian/patches));
+ $rm_tree_cached->(qw(debian/patches));
} elsif ($method eq 'DgitImportUpstreamUpdate') {
$read_tree_upstream->($cltree);
push @parents, map { $_->{CommitId} } @{ $cl->{OrigParents} };