From: Ian Jackson Date: Tue, 2 Oct 2018 12:45:41 +0000 (+0100) Subject: i18n: git-debrebase: mark some messages (1) X-Git-Tag: archive/debian/7.0~35 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=22c4f9bd68ac3cfc6a88fe4b4baf0a3ffda0a8b2;p=dgit.git i18n: git-debrebase: mark some messages (1) Signed-off-by: Ian Jackson --- diff --git a/git-debrebase b/git-debrebase index c1bef12c..28d96ec5 100755 --- a/git-debrebase +++ b/git-debrebase @@ -40,7 +40,7 @@ use File::Copy; $debugcmd_when_debuglevel = 2; -our ($usage_message) = <<'END'; +our ($usage_message) = i_ <<'END'; usages: git-debrebase [] [--|-i ] git-debrebase [] status @@ -64,7 +64,7 @@ $|=1; sub badusage ($) { my ($m) = @_; - print STDERR "$us: bad usage: $m\n"; + print STDERR f_ "%s: bad usage: %s\n", $us, $m; finish 8; } @@ -75,7 +75,7 @@ sub getoptions_main { } sub getoptions { my $sc = shift; - getoptions_main "bad options follow \`git-debrebase $sc'", @_; + getoptions_main +(f_ "bad options follow \`git-debrebase %s'", $sc), @_; } sub cfg ($;$) { @@ -86,7 +86,7 @@ sub cfg ($;$) { push @cmd, $k; my $out = cmdoutput_errok @cmd; if (!defined $out) { - fail "missing required git config $k" unless $optional; + fail f_ "missing required git config %s", $k unless $optional; return (); } my @l = split /\0/, $out; @@ -173,7 +173,8 @@ sub all_snags_summarised () { sub run_deferred_updates ($) { my ($mrest) = @_; - confess 'dangerous internal error' unless all_snags_summarised(); + my $m = 'dangerous internal error'; + confess $m.' - '.__ $m unless all_snags_summarised(); merge_wreckage_cleaning \@deferred_updates; run_ref_updates_now $mrest, \@deferred_updates; @@ -397,10 +398,10 @@ sub snag ($$;@) { my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits if (grep { $_ eq $tag } @snag_force_opts) { $snags_forced++; - print STDERR "$us: snag ignored (-f$tag): $msg\n"; + print STDERR f_ "%s: snag ignored (-f%s): %s\n", $us, $tag, $msg; } else { $snags_tripped++; - print STDERR "$us: snag detected (-f$tag): $msg\n"; + print STDERR f_ "%s: snag detected (-f%s): %s\n", $us, $tag, $msg; } } @@ -412,17 +413,17 @@ sub snag ($$;@) { sub snags_maybe_bail () { return if all_snags_summarised(); if ($snags_forced) { - printf STDERR + print STDERR f_ "%s: snags: %d overriden by individual -f options\n", $us, $snags_forced; } if ($snags_tripped) { if ($opt_force) { - printf STDERR + print STDERR f_ "%s: snags: %d overriden by global --force\n", $us, $snags_tripped; } else { - fail sprintf + fail f_ "%s: snags: %d blocker(s) (you could -f, or --force)", $us, $snags_tripped; } @@ -454,26 +455,26 @@ sub fail_unprocessable ($) { changedir $maindir; my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); - my $mangled = <("git-debrebase \`anchor' but @_"); }; - @p == 2 or return $badanchor->("has other than two parents"); - $haspatches and return $badanchor->("contains debian/patches"); + my $badanchor = sub { + $unknown->(f_ "git-debrebase \`anchor' but %s", "@_"); + }; + @p == 2 or return $badanchor->(__ "has other than two parents"); + $haspatches and return $badanchor->(__ "contains debian/patches"); # How to decide about l/r ordering of anchors ? git # --topo-order prefers to expand 2nd parent first. There's @@ -958,11 +961,11 @@ sub classify ($) { # parents from left to right, in order, so it's easy to see # which way round a pseudomerge is. - $p[0]{IsOrigin} and $badanchor->("is an origin commit"); + $p[0]{IsOrigin} and $badanchor->(__ "is an origin commit"); $p[1]{Differs} & ~DS_DEB and - $badanchor->("upstream files differ from left parent"); + $badanchor->(__ "upstream files differ from left parent"); $p[0]{Differs} & ~D_UPS and - $badanchor->("debian/ differs from right parent"); + $badanchor->(__ "debian/ differs from right parent"); return $classify->(qw(Anchor), OrigParents => [ $p[1] ]); @@ -973,7 +976,7 @@ sub classify ($) { if ($d == D_PAT_ADD) { return $classify->(qw(AddPatches)); } elsif ($d & (D_PAT_ADD|D_PAT_OTH)) { - return $unknown->("edits debian/patches"); + return $unknown->(__ "edits debian/patches"); } elsif ($d & DS_DEB and !($d & ~DS_DEB)) { my ($ty,$dummy) = git_cat_file "$p[0]{CommitId}:debian"; if ($ty eq 'tree') { @@ -985,20 +988,20 @@ sub classify ($) { } elsif ($ty eq 'missing') { return $classify->(qw(BreakwaterStart)); } else { - return $unknown->("parent's debian is not a directory"); + return $unknown->(__ "parent's debian is not a directory"); } } elsif ($d == D_UPS) { return $classify->(qw(Upstream)); } elsif ($d & DS_DEB and $d & D_UPS and !($d & ~(DS_DEB|D_UPS))) { return $classify->(qw(Mixed)); } elsif ($d == 0) { - return $unknown->("no changes"); + return $unknown->(__ "no changes"); } else { confess "internal error $objid ?"; } } if (!@p) { - return $unknown->("origin commit"); + return $unknown->(__ "origin commit"); } if (@p == 2 && @identical == 1) { @@ -1049,14 +1052,14 @@ sub classify ($) { return $classify->("MergedBreakwaters"); } if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) { - return $unknown->("unknown kind of merge from $1"); + return $unknown->(f_ "unknown kind of merge from %s", $1); } if (@p > 2) { - return $unknown->("octopus merge"); + return $unknown->(__ "octopus merge"); } if (!$opt_merges) { - return $unknown->("general two-parent merge"); + return $unknown->(__ "general two-parent merge"); } return $classify->("VanillaMerge"); @@ -1073,7 +1076,8 @@ sub mergedbreakwaters_anchor ($) { $best_anchor = $panchor if !defined $best_anchor or is_fast_fwd $best_anchor, $panchor; - fail "inconsistent anchors in merged-breakwaters $p->{CommitId}" + fail f_ "inconsistent anchors in merged-breakwaters %s", + $p->{CommitId} unless is_fast_fwd $panchor, $best_anchor; } return $best_anchor; @@ -1112,7 +1116,7 @@ sub keycommits ($;$$$$$) { my $x = sub { my ($cb, $tagsfx, $mainwhy, $xwhy) = @_; my $why = $mainwhy.$xwhy; - my $m = "branch needs laundering (run git-debrebase): $why"; + my $m = f_ "branch needs laundering (run git-debrebase): %s", $why; fail $m unless defined $cb; return unless $cb; $cb->("unclean-$tagsfx", $why, $cl, $mainwhy); @@ -1140,41 +1144,47 @@ sub keycommits ($;$$$$$) { $found_anchor->($head); } elsif ($ty eq 'Upstream') { $x->($unclean, 'ordering', - "packaging change ($breakwater) follows upstream change"," (eg $head)") + (f_ "packaging change (%s) follows upstream change", $breakwater), + (f_ " (eg %s)", $head)) if defined $breakwater; $clogonly = undef; $breakwater = undef; } elsif ($ty eq 'Mixed') { $x->($unclean, 'mixed', - "found mixed upstream/packaging commit"," ($head)"); + (__ "found mixed upstream/packaging commit"), + (f_ " (%s)", $head)); $clogonly = undef; $breakwater = undef; } elsif ($ty eq 'Pseudomerge' or $ty eq 'AddPatches') { my $found_pm = 1; $x->($furniture, (lc $ty), - "found interchange bureaucracy commit ($ty)"," ($head)"); + (f_ "found interchange bureaucracy commit (%s)", $ty), + (f_ " (%s)", $head)); } elsif ($ty eq 'DgitImportUnpatched') { if ($found_pm) { $x->($trouble, 'dgitimport', - "found dgit dsc import"," ($head)"); + (__ "found dgit dsc import"), + (f_ " (%s)", $head)); return (undef,undef); } else { $x->($fatal, 'unprocessable', - "found bare dgit dsc import with no prior history", - " ($head)"); + (__ "found bare dgit dsc import with no prior history"), + (f_ " (%s)", $head)); return (undef,undef); } } elsif ($ty eq 'VanillaMerge') { $x->($trouble, 'vanillamerge', - "found vanilla merge"," ($head)"); + (__ "found vanilla merge"), + (f_ " (%s)", $head)); return (undef,undef); } elsif ($ty eq 'MergedBreakwaters') { $found_anchor->(mergedbreakwaters_anchor $cl); } else { $x->($fatal, 'unprocessable', - "found unprocessable commit, cannot cope: $cl->{Why}", - " ($head)"); + (f_ "found unprocessable commit, cannot cope: %s", + $cl->{Why}), + (f_ " (%s)", $head)); return (undef,undef); } $head = $cl->{Parents}[0]{CommitId}; @@ -2988,7 +2998,7 @@ getoptions_main push @$opt_defaultcmd_interactive, @ARGV; @ARGV=(); }, - 'help' => sub { print $usage_message or die $!; finish 0; }, + 'help' => sub { print __ $usage_message or confess $!; finish 0; }, ); initdebug('git-debrebase ');