From 50bccc16393352ecf57a6aa6bb64cd140874ca05 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 2 Oct 2018 16:29:11 +0100 Subject: [PATCH] i18n: git-debrebase: mark some messages (2) Signed-off-by: Ian Jackson --- git-debrebase | 106 ++++++++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 46 deletions(-) diff --git a/git-debrebase b/git-debrebase index 22fd1ef7..947feb1e 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1213,6 +1213,8 @@ sub walk ($;$$$) { my $cl; my $xmsg = sub { my ($prose, $info) = @_; + # We deliberately do not translate $prose, since this mostly + # appears in commits in Debian and they should be in English. my $ms = $cl->{Msg}; chomp $ms; confess unless defined $info; @@ -1247,9 +1249,9 @@ sub walk ($;$$$) { join ' ', map { sprintf "%#x", $_->{Differs} } @{ $cl->{Parents} }; - fail_unprocessable sprintf +(defined $cl->{Why} - ? 'found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)' - : 'found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)'), + fail_unprocessable f_ +(defined $cl->{Why} + ? i_ 'found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)' + : i_ 'found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)'), $cur, $d, $cl->{Why}; }; @@ -1370,7 +1372,7 @@ sub walk ($;$$$) { # patches as commits. Unfortunately it contains # debian/patches/. printdebug "*** WALK BOMB bare dgit import\n"; - $cl->{Why} = "bare dgit dsc import"; + $cl->{Why} = __ "bare dgit dsc import"; return $bomb->(); } confess "$ty ?"; @@ -1581,7 +1583,7 @@ sub walk ($;$$$) { printdebug "WALK REBUILD $build ".(scalar @processed)."\n"; - confess "internal error" unless $build eq (pop @processed)->{CommitId}; + confess __ "internal error" unless $build eq (pop @processed)->{CommitId}; in_workarea sub { mkdir $rd or $!==EEXIST or confess $!; @@ -1710,13 +1712,13 @@ sub walk ($;$$$) { my ($n) = @_; no warnings qw(exiting); next if $n eq 'debian/'; - confess "mismatch @_ ?"; + confess f_ "mismatch %s ?", "@_"; }; trees_diff_walk "$want_debian:debian", "$build:debian", sub { - confess "mismatch @_ ?"; + confess f_ "mismatch %s ?", "@_"; }; my @old_parents = map { $_->{CommitId} } @{ $cl->{Parents} }; - confess "mismatch @parents != @old_parents ?" + confess f_ "mismatch %s != %s ?", "@parents", "@old_parents" unless "@parents" eq "@old_parents"; } if (grep { $method eq $_ } qw(DgitImportUpstreamUpdate)) { @@ -1726,7 +1728,7 @@ sub walk ($;$$$) { }; my $final_check = get_differs $build, $input; - confess sprintf "internal error %#x %s %s", $final_check, $input, $build + confess f_ "internal error %#x %s %s", $final_check, $input, $build if $final_check & ~D_PAT_ADD; my @r = ($build, $breakwater, $last_anchor); @@ -1754,7 +1756,7 @@ sub update_head_checkout ($$$) { sub update_head_postlaunder ($$$) { my ($old, $tip, $reflogmsg) = @_; return if $tip eq $old && !@deferred_updates; - print "$us: laundered (head was $old)\n"; + print f_ "%s: laundered (head was %s)\n", $us, $old; update_head $old, $tip, $reflogmsg; # no tree changes except debian/patches runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); @@ -1768,7 +1770,7 @@ sub currently_rebasing() { } sub bail_if_rebasing() { - fail "you are in the middle of a git-rebase already" + fail __ "you are in the middle of a git-rebase already" if currently_rebasing(); } @@ -1799,9 +1801,9 @@ sub defaultcmd_rebase () { } sub cmd_analyse () { - badusage "analyse does not support any options" + badusage __ "analyse does not support any options" if @ARGV and $ARGV[0] =~ m/^-/; - badusage "too many arguments to analyse" if @ARGV>1; + badusage __ "too many arguments to analyse" if @ARGV>1; my ($old) = @ARGV; if (defined $old) { $old = git_rev_parse $old; @@ -1834,9 +1836,9 @@ sub ffq_check ($;$$) { return ($status, $message) unless $status eq 'branch'; my $exists = git_get_ref $ffq_prev; - return ('exists',"$ffq_prev already exists") if $exists; + return ('exists', f_ "%s already exists", $ffq_prev) if $exists; - return ('not-branch', 'HEAD symref is not to refs/heads/') + return ('not-branch', __ 'HEAD symref is not to refs/heads/') unless $current =~ m{^refs/heads/}; my $branch = $'; @@ -1859,14 +1861,15 @@ sub ffq_check ($;$$) { return unless length $lrval; if (is_fast_fwd $lrval, $currentval) { - $ff->("OK, you are ahead of $lrref\n"); + $ff->(f_ "OK, you are ahead of %s\n", $lrref); $checked{$lrref} = 1; } elsif (is_fast_fwd $currentval, $lrval) { $checked{$lrref} = -1; - $notff->('behind', "you are behind $lrref, divergence risk"); + $notff->('behind', f_ "you are behind %s, divergence risk", + $lrref); } else { $checked{$lrref} = -1; - $notff->('diverged', "you have diverged from $lrref"); + $notff->('diverged', f_ "you have diverged from %s", $lrref); } }; @@ -1887,9 +1890,11 @@ sub ffq_check ($;$$) { 'remote push branch'); } if ($branch =~ m{^dgit/}) { - $check->("refs/remotes/dgit/$branch", 'remote dgit branch'); + $check->("refs/remotes/dgit/$branch", + __ 'remote dgit branch'); } elsif ($branch =~ m{^master$}) { - $check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid'); + $check->("refs/remotes/dgit/dgit/sid", + __ 'remote dgit branch for sid'); } return (undef, undef, $ffq_prev, $gdrlast); } @@ -1916,7 +1921,8 @@ sub record_ffq_prev_deferred () { push @deferred_updates, "update $ffq_prev $currentval $git_null_obj"; push @deferred_updates, "delete $gdrlast"; - push @deferred_update_messages, "Recorded previous head for preservation"; + push @deferred_update_messages, + __ "Recorded previous head for preservation"; return ('deferred', undef); } @@ -1924,7 +1930,7 @@ sub record_ffq_auto () { my ($status, $message) = record_ffq_prev_deferred(); if ($status eq 'deferred' || $status eq 'exists') { } else { - snag $status, "could not record ffq-prev: $message"; + snag $status, f_ "could not record ffq-prev: %s", $message; snags_maybe_bail(); } } @@ -1935,7 +1941,7 @@ sub ffq_prev_info () { my ($status, $message, $current, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); if ($status ne 'branch') { - snag $status, "could not check ffq-prev: $message"; + snag $status, f_ "could not check ffq-prev: %s", $message; snags_maybe_bail(); } my $ffq_prev_commitish = $ffq_prev && git_get_ref $ffq_prev; @@ -1955,7 +1961,7 @@ sub stitch ($$$$$) { # Just wind forwards rather than making a pointless pseudomerge. record_gdrlast $gdrlast, $ffq_prev_commitish; update_head_checkout $old_head, $ffq_prev_commitish, - "stitch (fast forward)"; + sprintf "stitch (%s)", __ 'fast forward'; return; } } @@ -1963,7 +1969,9 @@ sub stitch ($$$$$) { # We make pseudomerges with L as the contributing parent. # This makes git rev-list --first-parent work properly. my $new_head = make_commit [ $old_head, $ffq_prev ], [ - 'Declare fast forward / record previous work', + # we translate this against the time when this same code is + # used outside Debian, for downstreams and users + (__ 'Declare fast forward / record previous work'), "[git-debrebase pseudomerge: $prose]", ]; record_gdrlast $gdrlast, $new_head; @@ -1975,7 +1983,7 @@ sub do_stitch ($;$) { my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info(); if (!$ffq_prev_commitish) { - fail "No ffq-prev to stitch." unless $opt_noop_ok; + fail __ "No ffq-prev to stitch." unless $opt_noop_ok; return; } my $dangling_head = get_head(); @@ -2004,9 +2012,11 @@ sub resolve_upstream_version ($$) { my @tried; $new_upstream = upstream_commitish_search $upstream_version, \@tried; if (!length $new_upstream) { - fail "Could not determine appropriate upstream commitish.\n". - " (Tried these tags: @tried)\n". - " Check version, and specify upstream commitish explicitly."; + fail f_ + "Could not determine appropriate upstream commitish.\n". + " (Tried these tags: %s)\n". + " Check version, and specify upstream commitish explicitly.", + "@tried"; } } $new_upstream = git_rev_parse $new_upstream; @@ -2020,12 +2030,13 @@ sub cmd_new_upstream () { my %pieces; - badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1; + badusage __ "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1; # parse args - low commitment my $spec_version = shift @ARGV; my $new_version = (new Dpkg::Version $spec_version, check => 1); - fail "bad version number \`$spec_version'" unless defined $new_version; + fail f_ "bad version number \`%s'", $spec_version + unless defined $new_version; if ($new_version->is_native()) { $new_version = (new Dpkg::Version "$spec_version-1", check => 1); } @@ -2041,7 +2052,8 @@ sub cmd_new_upstream () { my ($n, @x) = @_; # may be '' my $pc = $pieces{$n} //= { Name => $n, - Desc => ($n ? "upstream piece \`$n'" : "upstream (main piece"), + Desc => ($n ? (f_ "upstream piece \`%s'", $n) + : (__ "upstream (main piece")), }; while (my $k = shift @x) { $pc->{$k} = shift @x; } $pc; @@ -2061,7 +2073,7 @@ sub cmd_new_upstream () { while (@ARGV && $ARGV[0] !~ m{^-}) { my $n = shift @ARGV; - badusage "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" + badusage __ "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH" unless @ARGV && $ARGV[0] !~ m{^-}; my $c = git_rev_parse shift @ARGV; @@ -2094,7 +2106,7 @@ sub cmd_new_upstream () { my $old_n_parents = scalar @{ $old_upstream->{Parents} }; if ($old_n_parents != @oldpieces && $old_n_parents != @oldpieces + 1) { - snag 'upstream-confusing', sprintf + snag 'upstream-confusing', f_ "previous upstream combine %s". " mentions %d pieces (each implying one parent)". " but has %d parents". @@ -2103,7 +2115,7 @@ sub cmd_new_upstream () { (scalar @oldpieces), $old_n_parents; } elsif ($oldpieces[0] ne '.') { - snag 'upstream-confusing', sprintf + snag 'upstream-confusing', f_ "previous upstream combine %s". " first piece is not \`.'", $oldpieces[0]; @@ -2116,9 +2128,10 @@ sub cmd_new_upstream () { } } } else { - snag 'upstream-confusing', - "previous upstream $old_upstream->{CommitId} is from". - " git-debrebase but not an \`upstream-combine' commit"; + snag 'upstream-confusing', f_ + "previous upstream %s is from". + " git-debrebase but not an \`upstream-combine' commit", + $old_upstream->{CommitId}; } } @@ -2127,13 +2140,14 @@ sub cmd_new_upstream () { # we have complained already } elsif (!$pc->{Old}) { snag 'upstream-new-piece', - "introducing upstream piece \`$pc->{Name}'"; + f_ "introducing upstream piece \`%s'", $pc->{Name}; } elsif (!$pc->{New}) { snag 'upstream-rm-piece', - "dropping upstream piece \`$pc->{Name}'"; + f_ "dropping upstream piece \`%s'", $pc->{Name}; } elsif (!is_fast_fwd $pc->{Old}, $pc->{New}) { snag 'upstream-not-ff', - "not fast forward: $pc->{Name} $pc->{Old}..$pc->{New}"; + f_ "not fast forward: %s %s", + $pc->{Name}, "$pc->{Old}..$pc->{New}"; } } @@ -2243,28 +2257,28 @@ sub cmd_record_ffq_prev () { badusage "no arguments allowed" if @ARGV; my ($status, $msg) = record_ffq_prev_deferred(); if ($status eq 'exists' && $opt_noop_ok) { - print "Previous head already recorded\n" or confess $!; + print __ "Previous head already recorded\n" or confess $!; } elsif ($status eq 'deferred') { run_deferred_updates 'record-ffq-prev'; } else { - fail "Could not preserve: $msg"; + fail f_ "Could not preserve: %s", $msg; } } sub cmd_anchor () { - badusage "no arguments allowed" if @ARGV; + badusage __ "no arguments allowed" if @ARGV; my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0; print "$bw\n" or confess $!; } sub cmd_breakwater () { - badusage "no arguments allowed" if @ARGV; + badusage __ "no arguments allowed" if @ARGV; my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0; print "$bw\n" or confess $!; } sub cmd_status () { - badusage "no arguments allowed" if @ARGV; + badusage __ "no arguments allowed" if @ARGV; # todo: gdr status should print divergence info # todo: gdr status should print upstream component(s) info -- 2.30.2