$us, $snags_tripped;
} else {
fail sprintf
- "%s: snags: %d blockers (you could -f<tag>, or --force)",
+ "%s: snags: %d blocker(s) (you could -f<tag>, or --force)",
$us, $snags_tripped;
}
}
badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1;
# parse args - low commitment
- my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1);
+ my $spec_version = shift @ARGV;
+ my $new_version = (new Dpkg::Version $spec_version, check => 1);
+ if ($new_version->is_native()) {
+ $new_version = (new Dpkg::Version "$spec_version-1", check => 1);
+ }
my $new_upstream_version = $new_version->version();
my $new_upstream = shift @ARGV;
# todo: gdr status should print upstream component(s) info
# todo: gdr should leave/maintain some refs with this kind of info ?
- my $oldest = [ 0 ];
+ my $oldest = { Badness => 0 };
my $newest;
my $note = sub {
- my ($badness, $ourmsg, $snagname, $kcmsg, $cl) = @_;
- if ($oldest->[0] < $badness) {
+ my ($badness, $ourmsg, $snagname, $dummy, $cl, $kcmsg) = @_;
+ if ($oldest->{Badness} < $badness) {
$oldest = $newest = undef;
}
- $oldest = \@_; # we're walking backwards
- $newest //= \@_;
+ $oldest = {
+ Badness => $badness,
+ CommitId => $cl->{CommitId},
+ OurMsg => $ourmsg,
+ KcMsg => $kcmsg,
+ };
+ $newest //= $oldest;
};
my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
};
print "current branch contents, in git-debrebase terms:\n";
- if (!$oldest->[0]) {
+ if (!$oldest->{Badness}) {
print " branch is laundered\n";
} else {
- print " $oldest->[1]\n";
+ print " $oldest->{OurMsg}\n";
my $printed = '';
foreach my $info ($oldest, $newest) {
- my $cid = $info->[4]{CommitId};
+ my $cid = $info->{CommitId};
next if $cid eq $printed;
$printed = $cid;
- print " $info->[3]\n";
+ print " $info->{KcMsg}\n";
$prcommitinfo->($cid);
}
}