[Monotone-commits-diffs] net.venge.monotone: 43ed9c9b4bebe876145121ae488728965030fcab

[code]

revision:            43ed9c9b4bebe876145121ae488728965030fcab
date:                2011-03-27T18:25:20
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
* src/*.cc, src/network/*.cc: Correct message casing that were still not
  according to specs in HACKING.

manifest:
format_version "1"

new_manifest [0b8ff7c418e198f867c72854cb1af08eae09b75e]

old_revision [b06e65460c792248ba28893894eacb30b1ac4bd9]

patch "src/automate_reader.cc"
 from [f647cff8c945367fbf054eb9fd3a14ff738e330b]
   to [ac60e48d6902a3cef96bc86a93640936c125beee]

patch "src/cmd.cc"
 from [077158d4777347710668422f6935bca67125b860]
   to [47891700f02feb1a6278c175fc56f5253c91ea49]

patch "src/cmd_db.cc"
 from [ad043207d9a5014f8137a23782b36a97dc9fc4c0]
   to [6bc1764d38063b0f5a23dd490f02786daafad0b7]

patch "src/cmd_netsync.cc"
 from [9dd8803cef465c834268105a42cc37dc282af520]
   to [88ca982ea191c22c88b490e87695b359754aff45]

patch "src/database.cc"
 from [ec58501c63bd6ba1b75c59f9111a4d26e0d4f19e]
   to [4c259f963c440fc95564dfec99b2f832f0bad643]

patch "src/file_io.cc"
 from [3a9cd566f250de51fefd41368c4fc1aaa1e85896]
   to [76874e5ca4978bd0fd3ba183cd19edc3447ece0d]

patch "src/lua.cc"
 from [bb919b7d41842bcc07c2d7c442ef415f7978a83b]
   to [40d590a9716e281f2004c1b5eb19c2b0926e7dde]

patch "src/network/automate_session.cc"
 from [2c77f8e025f0d9a0ac4862127944fdebd28425ca]
   to [3e42eadbc0379688a0a764ecb957f9e0dfde9adc]

patch "src/network/netsync_session.cc"
 from [d2a9eee38bb3018fd84c699070f8e28557da6cc9]
   to [3c89f6b9938ff38e4bb33ed5f9e9fa1681515c4d]

patch "src/network/session_base.cc"
 from [d44057cfd11f195fcfd95abae4d5550bd2402152]
   to [b5e1c8544dccb3532ca8047cd157f0c209055e6a]

patch "src/paths.cc"
 from [59d74d02bbdaaeda940843ab6d9f6cdd816e2caa]
   to [f4244d2b15de4c1b8005fa8b244fe8391ce61d1b]

patch "src/uri.cc"
 from [ee873c2b7f4cd405ae5a0871cdd6e33341ebec9d]
   to [f50e7599f6294a9872c055a8b230ea4933bdcc82]

patch "src/vocab.cc"
 from [1a4f7c3ab144ead8f4698c7c225c2fac6b161cc3]
   to [4c73af08de6dd30f710896835673361ee019466e]
============================================================
--- src/database.cc	ec58501c63bd6ba1b75c59f9111a4d26e0d4f19e
+++ src/database.cc	4c259f963c440fc95564dfec99b2f832f0bad643
@@ -2527,7 +2527,7 @@ database::put_file_version(file_id const
                            delta_direction() == "both");
   if (!make_reverse_deltas && !make_forward_deltas)
     {
-      W(F("Unknown delta direction '%s'; assuming 'reverse'. Valid "
+      W(F("unknown delta direction '%s'; assuming 'reverse'. Valid "
           "values are 'reverse', 'forward', 'both'.") % delta_direction);
       make_reverse_deltas = true;
     }
@@ -3486,7 +3486,7 @@ database::check_signature(key_id const &
         = boost::shared_dynamic_cast<RSA_PublicKey>(x509_key);
 
       E(pub_key, id.inner().made_from,
-        F("Failed to get RSA verifying key for %s") % id);
+        F("failed to get RSA verifying key for %s") % id);
 
       verifier.reset(get_pk_verifier(*pub_key, "EMSA3(SHA-1)"));
 
@@ -3625,7 +3625,7 @@ database_impl::oldstyle_results_to_certs
           k_id = key_id(key_res[0][0], origin::database);
         else
           E(false, origin::database,
-            F("Your database contains multiple keys named '%s'") % k_name);
+            F("your database contains multiple keys named '%s'") % k_name);
       }
 
       rsa_sha1_signature sig(res[i][4], origin::database);
============================================================
--- src/file_io.cc	3a9cd566f250de51fefd41368c4fc1aaa1e85896
+++ src/file_io.cc	76874e5ca4978bd0fd3ba183cd19edc3447ece0d
@@ -300,7 +300,7 @@ read_data_stdin(data & dat)
 {
   static bool have_consumed_stdin = false;
   E(!have_consumed_stdin, origin::user,
-    F("Cannot read standard input multiple times"));
+    F("cannot read standard input multiple times"));
   have_consumed_stdin = true;
   unfiltered_pipe->start_msg();
   cin >> *unfiltered_pipe;
============================================================
--- src/vocab.cc	1a4f7c3ab144ead8f4698c7c225c2fac6b161cc3
+++ src/vocab.cc	4c73af08de6dd30f710896835673361ee019466e
@@ -106,7 +106,7 @@ verify(netsync_session_key & val)
 
   E(val().size() == constants::netsync_session_key_length_in_bytes,
     val.made_from,
-    F("Invalid key length of %d bytes") % val().length());
+    F("invalid key length of %d bytes") % val().length());
 }
 
 inline void
@@ -120,7 +120,7 @@ verify(netsync_hmac_value & val)
 
   E(val().size() == constants::netsync_hmac_value_length_in_bytes,
     val.made_from,
-    F("Invalid hmac length of %d bytes") % val().length());
+    F("invalid hmac length of %d bytes") % val().length());
 }
 
 
============================================================
--- src/paths.cc	59d74d02bbdaaeda940843ab6d9f6cdd816e2caa
+++ src/paths.cc	f4244d2b15de4c1b8005fa8b244fe8391ce61d1b
@@ -457,7 +457,7 @@ file_path::file_path(file_path::source_t
   : any_path(path.made_from)
 {
   MM(path);
-  E(utf8_validate(path), made_from, F("Invalid utf8"));
+  E(utf8_validate(path), made_from, F("invalid utf8"));
   if (type == external)
     {
       string normalized;
@@ -481,9 +481,9 @@ bookkeeping_path::bookkeeping_path(strin
 
 bookkeeping_path::bookkeeping_path(string const & path, origin::type made_from)
 {
-  E(fully_normalized_path(path), made_from, F("Path is not normalized"));
+  E(fully_normalized_path(path), made_from, F("path is not normalized"));
   E(in_bookkeeping_dir(path), made_from,
-    F("Bookkeeping path is not in bookkeeping dir"));
+    F("bookkeeping path is not in bookkeeping directory"));
   data = ""
 }
 
============================================================
--- src/cmd_db.cc	ad043207d9a5014f8137a23782b36a97dc9fc4c0
+++ src/cmd_db.cc	6bc1764d38063b0f5a23dd490f02786daafad0b7
@@ -461,7 +461,7 @@ CMD(register_workspace, "register_worksp
     throw usage(execid);
 
   E(args.size() == 1 || workspace::found, origin::user,
-    F("No workspace given"));
+    F("no workspace given"));
 
   system_path workspace;
   if (args.size() == 1)
@@ -483,7 +483,7 @@ CMD(unregister_workspace, "unregister_wo
     throw usage(execid);
 
   E(args.size() == 1 || workspace::found, origin::user,
-    F("No workspace given"));
+    F("no workspace given"));
 
   system_path workspace;
   if (args.size() == 1)
@@ -627,7 +627,7 @@ CMD_HIDDEN(load_revisions, "load_revisio
 // loading revisions is relatively fast
 
 CMD_HIDDEN(load_revisions, "load_revisions", "", CMD_REF(db), "",
-    N_("load all revisions from the database"),
+    N_("Load all revisions from the database"),
     N_("This command loads all revisions from the database and is "
        "intended to be used for timing revision loading performance."),
     options::opts::none)
@@ -656,7 +656,7 @@ CMD_HIDDEN(load_rosters, "load_rosters",
 // loading rosters is slow compared with files, revisions or certs
 
 CMD_HIDDEN(load_rosters, "load_rosters", "", CMD_REF(db), "",
-    N_("load all roster versions from the database"),
+    N_("Load all roster versions from the database"),
     N_("This command loads all roster versions from the database and is "
        "intended to be used for timing roster reconstruction performance."),
     options::opts::none)
@@ -684,7 +684,7 @@ CMD_HIDDEN(load_files, "load_files", "",
 // loading files is slower than revisions but faster than rosters
 
 CMD_HIDDEN(load_files, "load_files", "", CMD_REF(db), "",
-    N_("load all file versions from the database"),
+    N_("Load all file versions from the database"),
     N_("This command loads all files versions from the database and is "
        "intended to be used for timing file reconstruction performance."),
     options::opts::none)
@@ -710,7 +710,7 @@ CMD_HIDDEN(load_certs, "load_certs", "",
 // loading certs is fast
 
 CMD_HIDDEN(load_certs, "load_certs", "", CMD_REF(db), "",
-    N_("load all certs from the database"),
+    N_("Load all certs from the database"),
     N_("This command loads all certs from the database and is "
        "intended to be used for timing cert loading performance."),
     options::opts::none)
============================================================
--- src/cmd_netsync.cc	9dd8803cef465c834268105a42cc37dc282af520
+++ src/cmd_netsync.cc	88ca982ea191c22c88b490e87695b359754aff45
@@ -119,7 +119,7 @@ CMD_AUTOMATE_NO_STDIO(remote_stdio,
 
   if (!app.opts.dbname_given)
     {
-      W(F("No database given; assuming '%s' database. This means that\n"
+      W(F("no database given; assuming '%s' database. This means that\n"
           "we can't verify the server key, because we have no record of\n"
           "what it should be.")
           % memory_db_identifier);
@@ -222,7 +222,7 @@ CMD_AUTOMATE_NO_STDIO(remote,
 
   if (!app.opts.dbname_given)
     {
-      W(F("No database given; assuming '%s' database. This means that\n"
+      W(F("no database given; assuming '%s' database. This means that\n"
           "we can't verify the server key, because we have no record of\n"
           "what it should be.")
           % memory_db_identifier);
============================================================
--- src/uri.cc	ee873c2b7f4cd405ae5a0871cdd6e33341ebec9d
+++ src/uri.cc	f50e7599f6294a9872c055a8b230ea4933bdcc82
@@ -147,10 +147,10 @@ urldecode(string const & in, origin::typ
         {
           char d1, d2;
           ++i;
-          E(i != in.end(), made_from, F("Bad URLencoded string '%s'") % in);
+          E(i != in.end(), made_from, F("bad URLencoded string '%s'") % in);
           d1 = *i;
           ++i;
-          E(i != in.end(), made_from, F("Bad URLencoded string '%s'") % in);
+          E(i != in.end(), made_from, F("bad URLencoded string '%s'") % in);
           d2 = *i;
 
           char c = 0;
@@ -172,7 +172,7 @@ urldecode(string const & in, origin::typ
             case 'd': case 'D': c += 13; break;
             case 'e': case 'E': c += 14; break;
             case 'f': case 'F': c += 15; break;
-            default: E(false, made_from, F("Bad URLencoded string '%s'") % in);
+            default: E(false, made_from, F("bad URLencoded string '%s'") % in);
             }
           c *= 16;
           switch(d2)
@@ -193,7 +193,7 @@ urldecode(string const & in, origin::typ
             case 'd': case 'D': c += 13; break;
             case 'e': case 'E': c += 14; break;
             case 'f': case 'F': c += 15; break;
-            default: E(false, made_from, F("Bad URLencoded string '%s'") % in);
+            default: E(false, made_from, F("bad URLencoded string '%s'") % in);
             }
           out += c;
         }
============================================================
--- src/lua.cc	bb919b7d41842bcc07c2d7c442ef415f7978a83b
+++ src/lua.cc	40d590a9716e281f2004c1b5eb19c2b0926e7dde
@@ -589,7 +589,7 @@ run_directory(lua_State * st, char const
   switch (get_path_status(path))
     {
     case path::nonexistent:
-      E(false, origin::user, F("Directory '%s' does not exist") % pathstr);
+      E(false, origin::user, F("directory '%s' does not exist") % pathstr);
     case path::file:
       E(false, origin::user, F("'%s' is not a directory") % pathstr);
     case path::directory:
============================================================
--- src/cmd.cc	077158d4777347710668422f6935bca67125b860
+++ src/cmd.cc	47891700f02feb1a6278c175fc56f5253c91ea49
@@ -456,7 +456,7 @@ namespace commands {
       app.mtn_automate_allowed = false;
 
       E(ll.ok(), origin::user,
-        F("Call to user command '%s' (lua command: '%s') failed.")
+        F("call to user command '%s' (lua command: '%s') failed.")
         % primary_name() % f_name);
     }
   };
============================================================
--- src/network/automate_session.cc	2c77f8e025f0d9a0ac4862127944fdebd28425ca
+++ src/network/automate_session.cc	3e42eadbc0379688a0a764ecb957f9e0dfde9adc
@@ -127,7 +127,7 @@ public:
     E(app.lua.hook_get_remote_automate_permitted(remote_identity,
                                                  cmdline, params),
       origin::user,
-      F("Sorry, you aren't allowed to do that."));
+      F("sorry, you aren't allowed to do that."));
   }
 };
 class remote_stdio_log_fn {
============================================================
--- src/network/netsync_session.cc	d2a9eee38bb3018fd84c699070f8e28557da6cc9
+++ src/network/netsync_session.cc	3c89f6b9938ff38e4bb33ed5f9e9fa1681515c4d
@@ -1464,7 +1464,7 @@ netsync_session::rebuild_merkle_trees(se
               if (keys.maybe_get_key_pair(*key, name, kp))
                 project.db.put_key(name, kp.pub);
               else
-                W(F("Cannot find key '%s'") % *key);
+                W(F("cannot find key '%s'") % *key);
             }
           inserted_keys.insert(*key);
           L(FL("including key %s by special request") % *key);
============================================================
--- src/network/session_base.cc	d44057cfd11f195fcfd95abae4d5550bd2402152
+++ src/network/session_base.cc	b5e1c8544dccb3532ca8047cd157f0c209055e6a
@@ -253,7 +253,7 @@ session_base::do_io(Netxx::Probe::ready_
     }
   catch (Netxx::Exception & e)
     {
-      P(F("Network error on peer %s, disconnecting")
+      P(F("network error on peer %s, disconnecting")
         % peer_id);
       ok = false;
     }
============================================================
--- src/automate_reader.cc	f647cff8c945367fbf054eb9fd3a14ff738e330b
+++ src/automate_reader.cc	ac60e48d6902a3cef96bc86a93640936c125beee
@@ -43,7 +43,7 @@ bool automate_reader::get_string(string 
       read(&c, 1);
     }
   E(c == ':', origin::user,
-    F("Bad input to automate stdio: expected ':' after string size"));
+    F("bad input to automate stdio: expected ':' after string size"));
   char *str = new char[size];
   size_t got = 0;
   while(got < size)
@@ -63,7 +63,7 @@ streamsize automate_reader::read(char *b
   rv = in.rdbuf()->sgetn(buf, nbytes);
 
   E(eof_ok || rv > 0, origin::user,
-    F("Bad input to automate stdio: unexpected EOF"));
+    F("bad input to automate stdio: unexpected EOF"));
   return rv;
 }
 void automate_reader::go_to_next_item()
@@ -91,7 +91,7 @@ void automate_reader::go_to_next_item()
     case 'l': loc = cmd; break;
     default:
       E(false, origin::user,
-        F("Bad input to automate stdio: unknown start token '%c'") % c);
+        F("bad input to automate stdio: unknown start token '%c'") % c);
     }
 }
 automate_reader::automate_reader(istream & is) : in(is), loc(none)
@@ -113,14 +113,14 @@ bool automate_reader::get_command(vector
       go_to_next_item();
     }
   E(loc == cmd, origin::user,
-    F("Bad input to automate stdio: expected '%c' token") % cmd);
+    F("bad input to automate stdio: expected '%c' token") % cmd);
   string item;
   while (get_string(item))
     {
       cmdline.push_back(item);
     }
   E(cmdline.size() > 0, origin::user,
-    F("Bad input to automate stdio: command name is missing"));
+    F("bad input to automate stdio: command name is missing"));
   return true;
 }
 void automate_reader::reset()