dgit: Refactor and simplify `quilt fixup cannot be linear' generation

Fold $reportnot into its one call site, and make the print a simple
substitution rather than a complex concatenation.

No functional change.

This will make the translation markup auditable.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 4 insertions, 9 deletions

diff --git a/dgit b/dgit
index 4f38d9c..2ac6d51 100755
--- a/dgit
+++ b/dgit
@@ -5519,19 +5519,14 @@ sub quiltify ($$$$) {
 	    $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
 	    return $x;
 	};
-	my $reportnot = sub {
-	    my ($notp) = @_;
-	    my $s = $abbrev->($notp);
-	    my $c = $notp->{Child};
-	    $s .= "..".$abbrev->($c) if $c;
-	    $s .= ": ".$notp->{Whynot};
-	    return $s;
-	};
 	if ($quilt_mode eq 'linear') {
 	    print STDERR "\n$us: error: quilt fixup cannot be linear.  Stopped at:\n";
 	    my $all_gdr = !!@nots;
 	    foreach my $notp (@nots) {
-		print STDERR "$us:  ", $reportnot->($notp), "\n";
+		my $c = $notp->{Child};
+		my $cprange = $abbrev->($notp);
+		$cprange .= "..".$abbrev->($c) if $c;
+		print STDERR "$us:  $cprange: $notp->{Whynot}\n";
 		$all_gdr &&= $notp->{Child} &&
 		    (git_cat_file $notp->{Child}{Commit}, 'commit')
 		    =~ m{^\[git-debrebase(?! split[: ]).*\]$}m;