[Monotone-commits-diffs] net.venge.monotone.string-sanitization: e7e4be49817435b7c0e7971b8ad5cbbcc4da07ac

[code]

revision:            e7e4be49817435b7c0e7971b8ad5cbbcc4da07ac
date:                2011-03-08T00:33:34
author:              address@hidden
branch:              net.venge.monotone.string-sanitization
changelog:
* src/**/.cc: some more forgotten quotation changes and other fixes

manifest:
format_version "1"

new_manifest [b3f6145b9954a3055ca6aace321582701db56824]

old_revision [4e5e9cc671359dea149cbf8e5b3dc7434f0f17eb]

patch "src/automate.cc"
 from [88bf3c76888c70149bc0397f571838dc5d2a844f]
   to [5c2e2de5f4ef001eb4920f367c83c6b6c2f344f4]

patch "src/cmd_ws_commit.cc"
 from [8d8674622bda303746d30bc337c9de4c87ba6fd1]
   to [78622bdfa00dbeac44492a318e3f01ad321a0bbc]

patch "src/options_list.hh"
 from [ae42a6656ba42780c0550abb534e53362c315d23]
   to [0462e302b89179f4acb28ecb91f4255140d4a4a7]

patch "src/unix/fs.cc"
 from [3f5cca4380add5229be7d91fce1f55d763942846]
   to [4a432ccc7d7f5926ba00b108f45960aa013d23b8]

patch "src/unix/process.cc"
 from [9740ec9fabd2b28af895d9c6b045530e5e771014]
   to [d554e321288eff496800047d5ff13ee63345ba41]

patch "src/win32/fs.cc"
 from [39d894522c91d40820d328e0782463abb9953bea]
   to [e524671f74e0644fb08b16e3535fe00f80106328]
============================================================
--- src/automate.cc	88bf3c76888c70149bc0397f571838dc5d2a844f
+++ src/automate.cc	5c2e2de5f4ef001eb4920f367c83c6b6c2f344f4
@@ -905,7 +905,7 @@ inventory_determine_states(workspace & w
           // file that is ignored but not in an ignored directory.
           if (work.ignore_file(fs_path))
             W(F("'%s' is both known and ignored; "
-              "it will be shown as 'missing'. Check .mtn-ignore.")
+              "it will be shown as 'missing'. Check '.mtn-ignore'.")
             % fs_path);
         }
     }
============================================================
--- src/unix/process.cc	9740ec9fabd2b28af895d9c6b045530e5e771014
+++ src/unix/process.cc	d554e321288eff496800047d5ff13ee63345ba41
@@ -60,7 +60,7 @@ bool is_executable(const char *path)
     {
       const int err = errno;
       E(false, origin::user,
-        F("error getting status of file %s: %s") % path % os_strerror(err));
+        F("error getting status of file '%s': %s") % path % os_strerror(err));
     }
 
   return (s.st_mode & S_IXUSR) && !(s.st_mode & S_IFDIR);
@@ -84,7 +84,7 @@ int change_xbits(const char *path, const
     {
       const int err = errno;
       E(false, origin::user,
-        F("error opening file %s: %s") % path % os_strerror(err));
+        F("error opening file '%s': %s") % path % os_strerror(err));
     }
   if (fstat(fd, &s))
     return -1;
@@ -100,13 +100,13 @@ int change_xbits(const char *path, const
     {
       if (set)
         {
-          P(F("setting execute permission on %s") % path);
-          L(FL("setting execute permission on %s with mode %s") % path % new_mode);
+          P(F("setting execute permission on '%s'") % path);
+          L(FL("setting execute permission on '%s' with mode %s") % path % new_mode);
         }
       else
         {
-          P(F("clearing execute permission on %s") % path);
-          L(FL("clearing execute permission on %s with mode %s") % path % new_mode);
+          P(F("clearing execute permission on '%s'") % path);
+          L(FL("clearing execute permission on '%s' with mode %s") % path % new_mode);
         }
 
       status = fchmod(fd, new_mode);
@@ -116,7 +116,7 @@ int change_xbits(const char *path, const
     {
       const int err = errno;
       E(false, origin::system,
-        F("error closing file %s: %s") % path % os_strerror(err));
+        F("error closing file '%s': %s") % path % os_strerror(err));
     }
 
   return status;
============================================================
--- src/unix/fs.cc	3f5cca4380add5229be7d91fce1f55d763942846
+++ src/unix/fs.cc	4a432ccc7d7f5926ba00b108f45960aa013d23b8
@@ -58,7 +58,7 @@ change_current_working_dir(string const 
     {
       const int err = errno;
       E(false, origin::system,
-        F("cannot change to directory %s: %s") % to % os_strerror(err));
+        F("cannot change to directory '%s': %s") % to % os_strerror(err));
     }
 }
 
@@ -113,7 +113,7 @@ tilde_expand(string const & in)
   // filesystem charset)
   pw = getpwnam(user.c_str());
   E(pw != NULL, origin::user,
-    F("could not find home directory for user %s") % user);
+    F("could not find home directory for user '%s'") % user);
 
   return string(pw->pw_dir) + after;
 }
@@ -131,7 +131,7 @@ get_path_status(string const & path)
         return path::nonexistent;
       else
         E(false, origin::system,
-          F("error accessing file %s: %s") % path % os_strerror(err));
+          F("error accessing file '%s': %s") % path % os_strerror(err));
     }
   if (S_ISREG(buf.st_mode))
     return path::file;
@@ -140,7 +140,7 @@ get_path_status(string const & path)
   else
     {
       // fifo or device or who knows what...
-      E(false, origin::system, F("cannot handle special file %s") % path);
+      E(false, origin::system, F("cannot handle special file '%s'") % path);
     }
 }
 
@@ -453,7 +453,7 @@ make_temp_file(string const & dir, strin
       // diagnostics from this E() than we would from an I().)
 
       E(err == EEXIST, origin::system,
-        F("cannot create temp file %s: %s") % tmp % os_strerror(err));
+        F("cannot create temp file '%s': %s") % tmp % os_strerror(err));
 
       // This increment is relatively prime to 'limit', therefore 'value'
       // will visit every number in its range.
@@ -504,14 +504,14 @@ write_data_worker(string const & fname,
         ssize_t written = write(fd, ptr, remaining);
         const int err = errno;
         E(written >= 0, origin::system,
-          F("error writing to temp file %s: %s") % tmp % os_strerror(err));
+          F("error writing to temp file '%s': %s") % tmp % os_strerror(err));
         if (written == 0)
           {
             deadcycles++;
             E(deadcycles < 4, origin::system,
-              FP("giving up after four zero-length writes to %s "
+              FP("giving up after four zero-length writes to '%s' "
                  "(%d byte written, %d left)",
-                 "giving up after four zero-length writes to %s "
+                 "giving up after four zero-length writes to '%s' "
                  "(%d bytes written, %d left)",
                  ptr - dat.data())
               % tmp % (ptr - dat.data()) % remaining);
============================================================
--- src/win32/fs.cc	39d894522c91d40820d328e0782463abb9953bea
+++ src/win32/fs.cc	e524671f74e0644fb08b16e3535fe00f80106328
@@ -39,7 +39,7 @@ change_current_working_dir(std::string c
 change_current_working_dir(std::string const & to)
 {
   E(!chdir(to.c_str()), origin::system,
-    F("cannot change to directory %s: %s") % to % strerror(errno));
+    F("cannot change to directory '%s': %s") % to % strerror(errno));
 }
 
 std::string
@@ -141,7 +141,7 @@ get_path_status(std::string const & path
          || err == ERROR_BAD_NETPATH)
         return path::nonexistent;
 
-          E(false, origin::system, F("%s: GetFileAttributes error: %s") % path % os_strerror(err));
+          E(false, origin::system, F("'%s': GetFileAttributes error: %s") % path % os_strerror(err));
     }
   else if (attrs & FILE_ATTRIBUTE_DIRECTORY)
     return path::directory;
@@ -448,7 +448,7 @@ make_temp_file(std::string const & dir, 
       // GetLastError() value is a plain error.  (Presumably, just as for
       // Unix, there are values that would represent bugs.)
       E(GetLastError() == ERROR_ALREADY_EXISTS, origin::system,
-        F("cannot create temp file %s: %s")
+        F("cannot create temp file '%s': %s")
         % tmp % os_strerror(GetLastError()));
 
       // This increment is relatively prime to any power of two, therefore
@@ -483,7 +483,7 @@ write_data_worker(std::string const & fn
   // might be recyclable to the purpose. ]
 
   if (user_private)
-    W(F("%s will be accessible to all users of this computer\n") % fname);
+    W(F("'%s' will be accessible to all users of this computer\n") % fname);
 
   struct auto_closer
   {
@@ -509,16 +509,16 @@ write_data_worker(std::string const & fn
         DWORD written;
         E(WriteFile(h, (LPCVOID)ptr, remaining, &written, (LPOVERLAPPED)0),
           origin::system,
-          F("error writing to temp file %s: %s")
+          F("error writing to temp file '%s': %s")
           % tmp % os_strerror(GetLastError()));
 
         if (written == 0)
           {
             deadcycles++;
             E(deadcycles < 4, origin::system,
-              FP("giving up after four zero-length writes to %s "
+              FP("giving up after four zero-length writes to '%s' "
                  "(%d byte written, %d left)",
-                 "giving up after four zero-length writes to %s "
+                 "giving up after four zero-length writes to '%s' "
                  "(%d bytes written, %d left)",
                  ptr - dat.data())
               % tmp % (ptr - dat.data()) % remaining);
============================================================
--- src/cmd_ws_commit.cc	8d8674622bda303746d30bc337c9de4c87ba6fd1
+++ src/cmd_ws_commit.cc	78622bdfa00dbeac44492a318e3f01ad321a0bbc
@@ -537,7 +537,7 @@ CMD(revert, "revert", "", CMD_REF(worksp
 
 CMD(revert, "revert", "", CMD_REF(workspace), N_("[PATH]..."),
     N_("Reverts files and/or directories"),
-    N_("In order to revert the entire workspace, specify \".\" as the "
+    N_("In order to revert the entire workspace, specify '.' as the "
        "file name."),
     options::opts::depth | options::opts::exclude | options::opts::missing)
 {
@@ -732,7 +732,7 @@ CMD(mkdir, "mkdir", "", CMD_REF(workspac
       // project with a mkdir statement, but one never can tell...
       E(app.opts.no_ignore || !work.ignore_file(fp),
         origin::user,
-        F("ignoring directory '%s' (see .mtn-ignore)") % fp);
+        F("ignoring directory '%s' (see '.mtn-ignore')") % fp);
 
       paths.insert(fp);
     }
============================================================
--- src/options_list.hh	ae42a6656ba42780c0550abb534e53362c315d23
+++ src/options_list.hh	0462e302b89179f4acb28ecb91f4255140d4a4a7
@@ -214,7 +214,7 @@ SIMPLE_OPTION(automate_stdio_size, "auto
 
 SIMPLE_OPTION(automate_stdio_size, "automate-stdio-size",
               restricted_long<1>,
-              gettext_noop("block size in bytes for \"automate stdio\" output"))
+              gettext_noop("block size in bytes for 'automate stdio' output"))
 
 SIMPLE_OPTION(auto_update, "update/no-update", bool,
               gettext_noop("automatically update the workspace, if it was at a head and the "