i18n: git-debrebase: mark some messages (3)

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

diff --git a/git-debrebase b/git-debrebase
index e6d75b7efa3dd9c98ae5fd2ac3ad6813f180df67..3101ae7d9dcddb39902d3aa6b71d976d694c5c3c 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1796,7 +1796,7 @@ sub cmd_launder_v0 () {
 
 sub defaultcmd_rebase () {
     push @ARGV, @{ $opt_defaultcmd_interactive // [] };
 
 sub defaultcmd_rebase () {
     push @ARGV, @{ $opt_defaultcmd_interactive // [] };

-    my ($tip,$breakwater) = do_launder_head 'launder for rebase';
+    my ($tip,$breakwater) = do_launder_head __ 'launder for rebase';

     runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
 }
 
     runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
 }
 


@@ -2300,10 +2300,10 @@ sub cmd_status () {
        $newest //= $oldest;
     };
     my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),
        $newest //= $oldest;
     };
     my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'),

-       sub { $note->(1, 'branch contains furniture (not laundered)', @_); },
-       sub { $note->(2, 'branch is unlaundered', @_); },
-       sub { $note->(3, 'branch needs laundering', @_); },
-       sub { $note->(4, 'branch not in git-debrebase form', @_); };
+       sub { $note->(1, __ 'branch contains furniture (not laundered)',@_); },
+       sub { $note->(2, __ 'branch is unlaundered', @_); },
+       sub { $note->(3, __ 'branch needs laundering', @_); },
+       sub { $note->(4, __ 'branch not in git-debrebase form', @_); };

 
     my $prcommitinfo = sub {
        my ($cid) = @_;
 
     my $prcommitinfo = sub {
        my ($cid) = @_;


@@ -2313,9 +2313,9 @@ sub cmd_status () {
            $cid;
     };
 
            $cid;
     };
 

-    print "current branch contents, in git-debrebase terms:\n";
+    print __ "current branch contents, in git-debrebase terms:\n";

     if (!$oldest->{Badness}) {
     if (!$oldest->{Badness}) {

-       print "  branch is laundered\n";
+       print __ "  branch is laundered\n";

     } else {
        print "  $oldest->{OurMsg}\n";
        my $printed = '';
     } else {
        print "  $oldest->{OurMsg}\n";
        my $printed = '';


@@ -2331,44 +2331,44 @@ sub cmd_status () {
     my $prab = sub {
        my ($cid, $what) = @_;
        if (!defined $cid) {
     my $prab = sub {
        my ($cid, $what) = @_;
        if (!defined $cid) {

-           print "  $what is not well-defined\n";
+           print f_ "  %s is not well-defined\n", $what;

        } else {
            print "  $what\n";
            $prcommitinfo->($cid);
        }
     };
        } else {
            print "  $what\n";
            $prcommitinfo->($cid);
        }
     };

-    print "key git-debrebase commits:\n";
-    $prab->($anchor, 'anchor');
-    $prab->($bw, 'breakwater');
+    print __ "key git-debrebase commits:\n";
+    $prab->($anchor, __ 'anchor');
+    $prab->($bw, __ 'breakwater');

 
     my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
        ffq_prev_branchinfo();
 
 
     my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
        ffq_prev_branchinfo();
 

-    print "branch and ref status, in git-debrebase terms:\n";
+    print __ "branch and ref status, in git-debrebase terms:\n";

     if ($ffq_msg) {
        print "  $ffq_msg\n";
     } else {
        $ffq_prev = git_get_ref $ffq_prev;
        $gdrlast = git_get_ref $gdrlast;
        if ($ffq_prev) {
     if ($ffq_msg) {
        print "  $ffq_msg\n";
     } else {
        $ffq_prev = git_get_ref $ffq_prev;
        $gdrlast = git_get_ref $gdrlast;
        if ($ffq_prev) {

-           print "  unstitched; previous tip was:\n";
+           print __ "  unstitched; previous tip was:\n";

            $prcommitinfo->($ffq_prev);
        } elsif (!$gdrlast) {
            $prcommitinfo->($ffq_prev);
        } elsif (!$gdrlast) {

-           print "  stitched? (no record of git-debrebase work)\n";
+           print __ "  stitched? (no record of git-debrebase work)\n";

        } elsif (is_fast_fwd $gdrlast, 'HEAD') {
        } elsif (is_fast_fwd $gdrlast, 'HEAD') {

-           print "  stitched\n";
+           print __ "  stitched\n";

        } else {
        } else {

-           print "  not git-debrebase (diverged since last stitch)\n"
+           print __ "  not git-debrebase (diverged since last stitch)\n"

        }
     }
        }
     }

-    print "you are currently rebasing\n" if currently_rebasing();
+    print __ "you are currently rebasing\n" if currently_rebasing();

 }
 
 sub cmd_stitch () {
     my $prose = 'stitch';
     getoptions("stitch",
               'prose=s', \$prose);
 }
 
 sub cmd_stitch () {
     my $prose = 'stitch';
     getoptions("stitch",
               'prose=s', \$prose);

-    badusage "no arguments allowed" if @ARGV;
+    badusage __ "no arguments allowed" if @ARGV;

     do_stitch $prose, 0;
 }
 sub cmd_prepush () {
     do_stitch $prose, 0;
 }
 sub cmd_prepush () {


@@ -2377,21 +2377,21 @@ sub cmd_prepush () {
 }
 
 sub cmd_quick () {
 }
 
 sub cmd_quick () {

-    badusage "no arguments allowed" if @ARGV;
-    do_launder_head 'launder for git-debrebase quick';
+    badusage __ "no arguments allowed" if @ARGV;
+    do_launder_head __ 'launder for git-debrebase quick';

     do_stitch 'quick';
 }
 
 sub cmd_conclude () {
     my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
     if (!$ffq_prev_commitish) {
     do_stitch 'quick';
 }
 
 sub cmd_conclude () {
     my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
     if (!$ffq_prev_commitish) {

-       fail "No ongoing git-debrebase session." unless $opt_noop_ok;
+       fail __ "No ongoing git-debrebase session." unless $opt_noop_ok;

        return;
     }
     my $dangling_head = get_head();
     
     badusage "no arguments allowed" if @ARGV;
        return;
     }
     my $dangling_head = get_head();
     
     badusage "no arguments allowed" if @ARGV;

-    do_launder_head 'launder for git-debrebase quick';
+    do_launder_head __ 'launder for git-debrebase quick';

     do_stitch 'quick';
 }
 
     do_stitch 'quick';
 }
 


@@ -2401,7 +2401,7 @@ sub cmd_scrap () {
        push @deferred_updates, 'verify HEAD HEAD';
        # noop, but stops us complaining that scrap was a noop
     }
        push @deferred_updates, 'verify HEAD HEAD';
        # noop, but stops us complaining that scrap was a noop
     }

-    badusage "no arguments allowed" if @ARGV;
+    badusage __ "no arguments allowed" if @ARGV;

     my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
     my $scrapping_head;
     if ($ffq_prev_commitish) {
     my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
     my $scrapping_head;
     if ($ffq_prev_commitish) {


@@ -2415,7 +2415,7 @@ sub cmd_scrap () {
            "delete $merge_cache_ref";
     }
     if (!@deferred_updates) {
            "delete $merge_cache_ref";
     }
     if (!@deferred_updates) {

-       fail "No ongoing git-debrebase session." unless $opt_noop_ok;
+       fail __ "No ongoing git-debrebase session." unless $opt_noop_ok;

        finish 0;
     }
     snags_maybe_bail();
        finish 0;
     }
     snags_maybe_bail();


@@ -2454,7 +2454,7 @@ sub make_patches ($) {
            rm_subdir_cached 'debian/patches';
        }
        $out = make_commit [$head], [
            rm_subdir_cached 'debian/patches';
        }
        $out = make_commit [$head], [

-            'Commit patch queue (exported by git-debrebase)',
+            (__ 'Commit patch queue (exported by git-debrebase)'),

             '[git-debrebase make-patches: export and commit patches]',
         ];
     };
             '[git-debrebase make-patches: export and commit patches]',
         ];
     };


@@ -2465,22 +2465,23 @@ sub cmd_make_patches () {
     my $opt_quiet_would_amend;
     getoptions("make-patches",
               'quiet-would-amend!', \$opt_quiet_would_amend);
     my $opt_quiet_would_amend;
     getoptions("make-patches",
               'quiet-would-amend!', \$opt_quiet_would_amend);

-    badusage "no arguments allowed" if @ARGV;
+    badusage __ "no arguments allowed" if @ARGV;

     bail_if_rebasing();
     my $old_head = get_head();
     my $new = make_patches $old_head;
     my $d = get_differs $old_head, $new;
     if ($d == 0) {
     bail_if_rebasing();
     my $old_head = get_head();
     my $new = make_patches $old_head;
     my $d = get_differs $old_head, $new;
     if ($d == 0) {

-       fail "No (more) patches to export." unless $opt_noop_ok;
+       fail __ "No (more) patches to export." unless $opt_noop_ok;

        return;
     } elsif ($d == D_PAT_ADD) {
        snags_maybe_bail();
        update_head_checkout $old_head, $new, 'make-patches';
     } else {
        return;
     } elsif ($d == D_PAT_ADD) {
        snags_maybe_bail();
        update_head_checkout $old_head, $new, 'make-patches';
     } else {

-       print STDERR failmsg
+       print STDERR failmsg f_

            "Patch export produced patch amendments".
            "Patch export produced patch amendments".

-           " (abandoned output commit $new).".
-           "  Try laundering first."
+           " (abandoned output commit %s).".
+           "  Try laundering first.",
+           $new

            unless $opt_quiet_would_amend;
        finish 7;
     }
            unless $opt_quiet_would_amend;
        finish 7;
     }


@@ -2496,18 +2497,20 @@ sub check_series_has_all_patches ($) {
     our $comments_snagged;
     foreach my $f (grep /\S/, grep {!m/^\s\#/} split /\n/, $series) {
        if ($f =~ m/^\s*\#/) {
     our $comments_snagged;
     foreach my $f (grep /\S/, grep {!m/^\s\#/} split /\n/, $series) {
        if ($f =~ m/^\s*\#/) {

-           snag 'series-comments',
-               "$seriesfn contains comments, which will be discarded"
+           snag 'series-comments', f_
+               "%s contains comments, which will be discarded",
+               $seriesfn

                unless $comments_snagged++;
            next;
        }
                unless $comments_snagged++;
            next;
        }

-       fail "patch $f repeated in $seriesfn !" if $series{$f}++;
+       fail f_ "patch %s repeated in %s !", $f, $seriesfn if $series{$f}++;

     }
     foreach my $patchfile (get_tree "$head:debian/patches", 1,1) {
        my ($f,$i) = @$patchfile;
        next if $series{$f};
        next if $f eq 'series';
     }
     foreach my $patchfile (get_tree "$head:debian/patches", 1,1) {
        my ($f,$i) = @$patchfile;
        next if $series{$f};
        next if $f eq 'series';

-       snag 'unused-patches', "Unused patch file $f will be discarded";
+       snag 'unused-patches', f_
+           "Unused patch file %s will be discarded", $f;

     }
 }
 
     }
 }
 


@@ -2515,11 +2518,11 @@ sub begin_convert_from () {
     my $head = get_head();
     my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo();
 
     my $head = get_head();
     my ($ffqs, $ffqm, $symref, $ffq_prev, $gdrlast) = ffq_prev_branchinfo();
 

-    fail "ffq-prev exists, this is already managed by git-debrebase!"
+    fail __ "ffq-prev exists, this is already managed by git-debrebase!"

        if $ffq_prev && git_get_ref $ffq_prev;
 
     my $gdrlast_obj = $gdrlast && git_get_ref $gdrlast;
        if $ffq_prev && git_get_ref $ffq_prev;
 
     my $gdrlast_obj = $gdrlast && git_get_ref $gdrlast;

-    snag 'already-converted',
+    snag 'already-converted', __

        "ahead of debrebase-last, this is already managed by git-debrebase!"
        if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
     return ($head, { LastRef => $gdrlast, LastObj => $gdrlast_obj });
        "ahead of debrebase-last, this is already managed by git-debrebase!"
        if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
     return ($head, { LastRef => $gdrlast, LastObj => $gdrlast_obj });


@@ -2535,12 +2538,12 @@ sub complete_convert_from ($$$$) {
 }
 
 sub cmd_convert_from_gbp () {
 }
 
 sub cmd_convert_from_gbp () {

-    badusage "want only 1 optional argument, the upstream git commitish"
+    badusage __ "want only 1 optional argument, the upstream git commitish"

        unless @ARGV<=1;
 
     my $clogp = parsechangelog();
     my $version = $clogp->{'Version'}
        unless @ARGV<=1;
 
     my $clogp = parsechangelog();
     my $version = $clogp->{'Version'}

-       // die "missing Version from changelog\n";
+       // fail __ "missing Version from changelog\n";

 
     my ($upstream_spec) = @ARGV;
 
 
     my ($upstream_spec) = @ARGV;
 


@@ -2555,30 +2558,32 @@ sub cmd_convert_from_gbp () {
        runcmd @git, qw(--no-pager diff --stat),
            $upstream, $old_head,
            qw( -- :!/debian :/);
        runcmd @git, qw(--no-pager diff --stat),
            $upstream, $old_head,
            qw( -- :!/debian :/);

-       fail <<END;
-upstream ($upstream_spec) and HEAD are not
+       fail f_ <<END, $upstream_spec, $upstream_spec;
+upstream (%s) and HEAD are not

 identical in upstream files.  See diffstat above, or run
 identical in upstream files.  See diffstat above, or run

-  git diff $upstream_spec HEAD -- :!/debian :/
+  git diff %s HEAD -- :!/debian :/

 END
     }
 
     if (!is_fast_fwd $upstream, $old_head) {
        snag 'upstream-not-ancestor',
 END
     }
 
     if (!is_fast_fwd $upstream, $old_head) {
        snag 'upstream-not-ancestor',

-           "upstream ($upstream) is not an ancestor of HEAD";
+           f_ "upstream (%s) is not an ancestor of HEAD", $upstream;

     } else {
        my $wrong = cmdoutput
            (@git, qw(rev-list --ancestry-path), "$upstream..HEAD",
             qw(-- :/ :!/debian));
        if (length $wrong) {
     } else {
        my $wrong = cmdoutput
            (@git, qw(rev-list --ancestry-path), "$upstream..HEAD",
             qw(-- :/ :!/debian));
        if (length $wrong) {

-           snag 'unexpected-upstream-changes',
-               "history between upstream ($upstream) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?";
-           print STDERR "list expected changes with:  git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'\n";
+           snag 'unexpected-upstream-changes', f_
+               "history between upstream (%s) and HEAD contains direct changes to upstream files - are you sure this is a gbp (patches-unapplied) branch?",
+               $upstream;
+           print STDERR f_ "list expected changes with:  %s\n", 
+ "git log --stat --ancestry-path $upstream_spec..HEAD -- :/ ':!/debian'";

        }
     }
 
     if ((git_cat_file "$upstream:debian")[0] ne 'missing') {
        snag 'upstream-has-debian',
        }
     }
 
     if ((git_cat_file "$upstream:debian")[0] ne 'missing') {
        snag 'upstream-has-debian',

-           "upstream ($upstream) contains debian/ directory";
+           f_ "upstream (%s) contains debian/ directory", $upstream;

     }
 
     check_series_has_all_patches $old_head;
     }
 
     check_series_has_all_patches $old_head;


@@ -2596,29 +2601,30 @@ END
            $suite = $stz->{Distribution};
            last;
        };
            $suite = $stz->{Distribution};
            last;
        };

-       die "neither of the first two changelog entries are released\n"
+       die __ "neither of the first two changelog entries are released\n"

            unless defined $lvsn;
        print "last finished-looking changelog entry: ($lvsn) $suite\n";
        my $mtag_pat = debiantag_maintview $lvsn, '*';
        my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
            $mtag_pat;
            unless defined $lvsn;
        print "last finished-looking changelog entry: ($lvsn) $suite\n";
        my $mtag_pat = debiantag_maintview $lvsn, '*';
        my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
            $mtag_pat;

-       die "could not find suitable maintainer view tag $mtag_pat\n"
+       die f_ "could not find suitable maintainer view tag %s\n", $mtag_pat

            unless $mtag =~ m{/};
        is_fast_fwd $mtag, 'HEAD' or
            unless $mtag =~ m{/};
        is_fast_fwd $mtag, 'HEAD' or

-           die "HEAD is not FF from maintainer tag $mtag!";
+           die f_ "HEAD is not FF from maintainer tag %s!", $mtag;

        my $dtag = "archive/$mtag";
        git_get_ref "refs/tags/$dtag" or
        my $dtag = "archive/$mtag";
        git_get_ref "refs/tags/$dtag" or

-           die "dgit view tag $dtag not found\n";
+           die f_ "dgit view tag %s not found\n", $dtag;

        is_fast_fwd $mtag, $dtag or
        is_fast_fwd $mtag, $dtag or

-           die "dgit view tag $dtag is not FF from maintainer tag $mtag\n";
-       print "will stitch in dgit view, $dtag\n";
+           die f_ "dgit view tag %s is not FF from maintainer tag %s\n",
+                  $dtag, $mtag;
+       print f_ "will stitch in dgit view, %s\n", $dtag;

        git_rev_parse $dtag;
     };
     if (!$previous_dgit_view) {
        $@ =~ s/^\n+//;
        chomp $@;
        git_rev_parse $dtag;
     };
     if (!$previous_dgit_view) {
        $@ =~ s/^\n+//;
        chomp $@;

-       print STDERR <<END;
-Cannot confirm dgit view: $@
+       print STDERR f_ <<END, "$@";
+Cannot confirm dgit view: %s

 Failed to stitch in dgit view (see messages above).
 dgit --overwrite will be needed on the first dgit push after conversion.
 END
 Failed to stitch in dgit view (see messages above).
 dgit --overwrite will be needed on the first dgit push after conversion.
 END


@@ -2663,8 +2669,8 @@ END
     };
 
     complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp';
     };
 
     complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp';

-    print <<END or confess $!;
-$us: converted from patched-unapplied (gbp) branch format, OK
+    print f_ <<END, $us or confess $!;
+%s: converted from patched-unapplied (gbp) branch format, OK

 END
 }
 
 END
 }