i18n: dgit: mark some messages (9)

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

diff --git a/dgit b/dgit
index e0ebfbadd1c230f94466f420b5dad7e1ee2996e4..051a4be568c8ab9d8651f64b21c43df1bb18cdd1 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -512,8 +512,8 @@ sub protocol_send_file ($$) {
        my $got = read PF, $d, 65536;
        die "$ourfn: $!" unless defined $got;
        last if !$got;
        my $got = read PF, $d, 65536;
        die "$ourfn: $!" unless defined $got;
        last if !$got;

-       print $fh "data-block ".length($d)."\n" or die $!;
-       print $fh $d or die $!;
+       print $fh "data-block ".length($d)."\n" or confess $!;
+       print $fh $d or confess $!;

     }
     PF->error and die "$ourfn $!";
     print $fh "data-end\n" or die $!;
     }
     PF->error and die "$ourfn $!";
     print $fh "data-end\n" or die $!;


@@ -5597,15 +5597,16 @@ sub quiltify ($$$$) {
            my ($what) = @_;
 
            eval {
            my ($what) = @_;
 
            eval {

-               die "contains unexpected slashes\n" if m{//} || m{/$};
-               die "contains leading punctuation\n" if m{^\W} || m{/\W};
-               die "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
-               die "is series file\n" if m{$series_filename_re}o;
-               die "too long\n" if length > 200;
+               die __ "contains unexpected slashes\n" if m{//} || m{/$};
+               die __ "contains leading punctuation\n" if m{^\W} || m{/\W};
+               die __ "contains bad character(s)\n" if m{[^-a-z0-9_.+=~/]}i;
+               die __ "is series file\n" if m{$series_filename_re}o;
+               die __ "too long\n" if length > 200;

            };
            return $_ unless $@;
            };
            return $_ unless $@;

-           print STDERR "quiltifying commit $cc:".
-               " ignoring/dropping Gbp-Pq $what: $@";
+           print STDERR f_
+               "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s",
+               $cc, $what, $@;

            return undef;
        };
 
            return undef;
        };
 


@@ -5633,7 +5634,7 @@ sub quiltify ($$$$) {
                $patchname = $translitname;
            };
            print STDERR
                $patchname = $translitname;
            };
            print STDERR

-               "dgit: patch title transliteration error: $@"
+               +(f_ "dgit: patch title transliteration error: %s", $@)

                if $@;
            $patchname =~ y/ A-Z/-a-z/;
            $patchname =~ y/-a-z0-9_.+=~//cd;
                if $@;
            $patchname =~ y/ A-Z/-a-z/;
            $patchname =~ y/-a-z0-9_.+=~//cd;


@@ -5655,7 +5656,7 @@ sub quiltify ($$$$) {
        for ($index='';
             stat "debian/patches/$patchname$index";
             $index++) { }
        for ($index='';
             stat "debian/patches/$patchname$index";
             $index++) { }

-       $!==ENOENT or die "$patchname$index $!";
+       $!==ENOENT or confess "$patchname$index $!";

 
        runcmd @git, qw(checkout -q), $cc;
 
 
        runcmd @git, qw(checkout -q), $cc;
 


@@ -5769,7 +5770,7 @@ sub unpack_playtree_linkorigs ($$) {
 
 sub quilt_fixup_delete_pc () {
     runcmd @git, qw(rm -rqf .pc);
 
 sub quilt_fixup_delete_pc () {
     runcmd @git, qw(rm -rqf .pc);

-    commit_admin <<END.<<ENDU
+    commit_admin +(__ <<END).<<ENDU

 Commit removal of .pc (quilt series tracking data)
 END
 
 Commit removal of .pc (quilt series tracking data)
 END
 


@@ -5780,7 +5781,7 @@ ENDU
 sub quilt_fixup_singlepatch ($$$) {
     my ($clogp, $headref, $upstreamversion) = @_;
 
 sub quilt_fixup_singlepatch ($$$) {
     my ($clogp, $headref, $upstreamversion) = @_;
 

-    progress "starting quiltify (single-debian-patch)";
+    progress __ "starting quiltify (single-debian-patch)";

 
     # dpkg-source --commit generates new patches even if
     # single-debian-patch is in debian/source/options.  In order to
 
     # dpkg-source --commit generates new patches even if
     # single-debian-patch is in debian/source/options.  In order to


@@ -5858,7 +5859,7 @@ sub quilt_fakedsc2unapplied ($$) {
 
     changedir 'fake';
 
 
     changedir 'fake';
 

-    remove_stray_gits("source package");
+    remove_stray_gits(__ "source package");

     mktree_in_ud_here();
 
     rmtree '.pc';
     mktree_in_ud_here();
 
     rmtree '.pc';


@@ -5879,8 +5880,9 @@ sub quilt_check_splitbrain_cache ($$) {
 
     my $splitbrain_cachekey;
     
 
     my $splitbrain_cachekey;
     

-    progress
- "dgit: split brain (separate dgit view) may be needed (--quilt=$quilt_mode).";
+    progress f_
+ "dgit: split brain (separate dgit view) may be needed (--quilt=%s).",
+                $quilt_mode;

     # we look in the reflog of dgit-intern/quilt-cache
     # we look for an entry whose message is the key for the cache lookup
     my @cachekey = (qw(dgit), $our_version);
     # we look in the reflog of dgit-intern/quilt-cache
     # we look for an entry whose message is the key for the cache lookup
     my @cachekey = (qw(dgit), $our_version);


@@ -5910,12 +5912,12 @@ sub quilt_check_splitbrain_cache ($$) {
        unpack_playtree_mkwork($headref);
        my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
        if ($cachehit ne $headref) {
        unpack_playtree_mkwork($headref);
        my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
        if ($cachehit ne $headref) {

-           progress "dgit view: found cached ($saved)";
+           progress f_ "dgit view: found cached (%s)", $saved;

            runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
            $split_brain = 1;
            return ($cachehit, $splitbrain_cachekey);
        }
            runcmd @git, qw(checkout -q -b dgit-view), $cachehit;
            $split_brain = 1;
            return ($cachehit, $splitbrain_cachekey);
        }

-       progress "dgit view: found cached, no changes required";
+       progress __ "dgit view: found cached, no changes required";

        return ($headref, $splitbrain_cachekey);
     }
 
        return ($headref, $splitbrain_cachekey);
     }
 


@@ -5926,7 +5928,8 @@ sub quilt_check_splitbrain_cache ($$) {
 sub quilt_fixup_multipatch ($$$) {
     my ($clogp, $headref, $upstreamversion) = @_;
 
 sub quilt_fixup_multipatch ($$$) {
     my ($clogp, $headref, $upstreamversion) = @_;
 

-    progress "examining quilt state (multiple patches, $quilt_mode mode)";
+    progress f_ "examining quilt state (multiple patches, %s mode)",
+               $quilt_mode;

 
     # Our objective is:
     #  - honour any existing .pc in case it has any strangeness
 
     # Our objective is:
     #  - honour any existing .pc in case it has any strangeness


@@ -6015,7 +6018,7 @@ sub quilt_fixup_multipatch ($$$) {
     $!=0; $?=-1;
     if (system @bbcmd) {
        failedcmd @bbcmd if $? < 0;
     $!=0; $?=-1;
     if (system @bbcmd) {
        failedcmd @bbcmd if $? < 0;

-       fail <<END;
+       fail __ <<END;

 failed to apply your git tree's patch stack (from debian/patches/) to
  the corresponding upstream tarball(s).  Your source tree and .orig
  are probably too inconsistent.  dgit can only fix up certain kinds of
 failed to apply your git tree's patch stack (from debian/patches/) to
  the corresponding upstream tarball(s).  Your source tree and .orig
  are probably too inconsistent.  dgit can only fix up certain kinds of


@@ -6030,7 +6033,7 @@ END
     my $mustdeletepc=0;
     if (stat_exists ".pc") {
         -d _ or die;
     my $mustdeletepc=0;
     if (stat_exists ".pc") {
         -d _ or die;

-       progress "Tree already contains .pc - will use it then delete it.";
+       progress __ "Tree already contains .pc - will use it then delete it.";

         $mustdeletepc=1;
     } else {
         rename '../fake/.pc','.pc' or die $!;
         $mustdeletepc=1;
     } else {
         rename '../fake/.pc','.pc' or die $!;


@@ -6066,39 +6069,40 @@ END
     }
     printdebug "differences \@dl @dl.\n";
 
     }
     printdebug "differences \@dl @dl.\n";
 

-    progress sprintf
+    progress f_

 "%s: base trees orig=%.20s o+d/p=%.20s",
               $us, $unapplied, $oldtiptree;
 "%s: base trees orig=%.20s o+d/p=%.20s",
               $us, $unapplied, $oldtiptree;

-    progress sprintf
+    progress f_

 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n".
 "%s: quilt differences:      HEAD %s o+d/p               HEAD %s o+d/p",
   $us,                      $dl[0], $dl[1],              $dl[3], $dl[4],
   $us,                          $dl[2],                     $dl[5];
 
     if (@unrepres) {
 "%s: quilt differences: src:  %s orig %s     gitignores:  %s orig %s\n".
 "%s: quilt differences:      HEAD %s o+d/p               HEAD %s o+d/p",
   $us,                      $dl[0], $dl[1],              $dl[3], $dl[4],
   $us,                          $dl[2],                     $dl[5];
 
     if (@unrepres) {

-       print STDERR "dgit:  cannot represent change: $_->[1]: $_->[0]\n"
+       print STDERR f_ "dgit:  cannot represent change: %s: %s\n",
+                       $_->[1], $_->[0]

            foreach @unrepres;
            foreach @unrepres;

-       forceable_fail [qw(unrepresentable)], <<END;
+       forceable_fail [qw(unrepresentable)], __ <<END;

 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
 END
     }
 
     my @failsuggestion;
     if (!($diffbits->{O2H} & $diffbits->{O2A})) {
 HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'
 END
     }
 
     my @failsuggestion;
     if (!($diffbits->{O2H} & $diffbits->{O2A})) {

-        push @failsuggestion, [ 'unapplied',
-                              "This might be a patches-unapplied branch." ];
+        push @failsuggestion, [ 'unapplied', __
+ "This might be a patches-unapplied branch." ];

     } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
     } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {

-        push @failsuggestion, [ 'applied',
-                               "This might be a patches-applied branch." ];
+        push @failsuggestion, [ 'applied', __
+ "This might be a patches-applied branch." ];

     }
     }

-    push @failsuggestion, [ 'quilt-mode',
+    push @failsuggestion, [ 'quilt-mode', __

  "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
 
  "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
 

-    push @failsuggestion, [ 'gitattrs',
+    push @failsuggestion, [ 'gitattrs', __

  "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)." ]
        if stat_exists '.gitattributes';
 
  "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)." ]
        if stat_exists '.gitattributes';
 

-    push @failsuggestion, [ 'origs',
+    push @failsuggestion, [ 'origs', __

  "Maybe orig tarball(s) are not identical to git representation?" ];
 
     if (quiltmode_splitbrain()) {
  "Maybe orig tarball(s) are not identical to git representation?" ];
 
     if (quiltmode_splitbrain()) {


@@ -6108,7 +6112,7 @@ END
        return;
     }
 
        return;
     }
 

-    progress "starting quiltify (multiple patches, $quilt_mode mode)";
+    progress f_ "starting quiltify (multiple patches, %s mode)", $quilt_mode;

     quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
 
     if (!open P, '>>', ".pc/applied-patches") {
     quiltify($clogp,$headref,$oldtiptree,\@failsuggestion);
 
     if (!open P, '>>', ".pc/applied-patches") {