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

[code]

revision:            3d96895e9ff2ea7d2eaa5ad2c46f60cfbf146461
date:                2011-03-08T11:07:35
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.string-sanitization
changelog:
* src/**/*.cc: More capitalization and punctuation

manifest:
format_version "1"

new_manifest [dee1f4d9a3b77699809cb4591e5a781ba335bb40]

old_revision [fd5b630851cddb0a0a45c8212e19e87ff752c11c]

patch "src/automate.cc"
 from [915b82a6054adec8837057ad378405c30a555a55]
   to [efa4ecceab7f1e31f71778f325da312bf6aefba5]

patch "src/cmd_merging.cc"
 from [7f9ada8c00c393a6581f5d2045a40076b6f98bcf]
   to [84b177469ecb60664be23c42c38cc649d23899a7]

patch "src/cmd_ws_commit.cc"
 from [f6649899be34a722109d31d12bb407cb3ff8f0a1]
   to [d9dbacb820c6d070c4952ee2b0f143e61e85631e]

patch "src/key_store.cc"
 from [954b32ff72e019e6423a704ab3f5c3cba8b0fefa]
   to [64c4c4bed1fadc26b51207b9f61343f9dd7d3c6e]

patch "src/network/connection_info.cc"
 from [91b8c343c905c4a0e47408d38ca1fbdcac5949ec]
   to [b5868dad7e81cc1f021a0666034e258a6d8b785b]

patch "src/network/netsync_session.cc"
 from [4beb680160507ed35cb14464f8fd054773d59836]
   to [2c9ac6ccefe471f1ba7e1f261715501375cc0c0f]

patch "src/option.cc"
 from [114fe5c490e33f31d186f9ee5ba89b3f6e541fe4]
   to [7d0c3b6ca2eccfcdb1907e5498abdd74507a3612]
============================================================
--- src/automate.cc	915b82a6054adec8837057ad378405c30a555a55
+++ src/automate.cc	efa4ecceab7f1e31f71778f325da312bf6aefba5
@@ -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/key_store.cc	954b32ff72e019e6423a704ab3f5c3cba8b0fefa
+++ src/key_store.cc	64c4c4bed1fadc26b51207b9f61343f9dd7d3c6e
@@ -849,7 +849,7 @@ key_store::make_signature(database & db,
   //sign with ssh-agent (if connected)
   E(agent.connected() || s->ssh_sign_mode != "only", origin::user,
     F("you have chosen to sign only with ssh-agent but ssh-agent"
-      " does not seem to be running."));
+      " does not seem to be running"));
   if (s->ssh_sign_mode == "yes"
       || s->ssh_sign_mode == "check"
       || s->ssh_sign_mode == "only")
============================================================
--- src/cmd_merging.cc	7f9ada8c00c393a6581f5d2045a40076b6f98bcf
+++ src/cmd_merging.cc	84b177469ecb60664be23c42c38cc649d23899a7
@@ -174,7 +174,7 @@ pick_branch_for_update(options & opts, d
             branch_list += "\n  " + (*i)();
           E(false, origin::user,
             F("target revision is in multiple branches:%s\n\n"
-              "try again with explicit '--branch'") % branch_list);
+              "Try again with explicit '--branch'") % branch_list);
         }
       else if (branches.size() == 1)
         {
@@ -184,8 +184,8 @@ pick_branch_for_update(options & opts, d
         }
       else
         {
-          W(F("target revision not in any branch\n"
-              "next commit will use branch '%s'")
+          W(F("target revision not in any branch.\n"
+              "Next commit will use branch '%s'")
             % opts.branch);
         }
     }
@@ -1286,9 +1286,9 @@ CMD(pluck, "pluck", "", CMD_REF(workspac
       std::set<revision_id> parents;
       db.get_revision_parents(to_rid, parents);
       E(parents.size() == 1, origin::user,
-        F("revision %s is a merge\n"
-          "to apply the changes relative to one of its parents, use:\n"
-          "  '%s pluck -r PARENT -r %s'")
+        F("revision %s is a merge.\n"
+          "To apply the changes relative to one of its parents, use:\n"
+          "  %s pluck -r PARENT -r %s")
         % to_rid
         % prog_name
         % to_rid);
============================================================
--- src/cmd_ws_commit.cc	f6649899be34a722109d31d12bb407cb3ff8f0a1
+++ src/cmd_ws_commit.cc	d9dbacb820c6d070c4952ee2b0f143e61e85631e
@@ -1568,8 +1568,8 @@ void perform_commit(app_state & app,
   E(!(log_message_given && work.has_contents_user_log() &&
       app.opts.msgfile() != "_MTN/log"), origin::user,
     F("'_MTN/log' is non-empty and log message "
-      "was specified on command line\n"
-      "perhaps move or delete '_MTN/log',\n"
+      "was specified on command line.\n"
+      "Perhaps move or delete '_MTN/log',\n"
       "or remove '--message'/'--message-file' from the command line?"));
 
   date_t date;
============================================================
--- src/option.cc	114fe5c490e33f31d186f9ee5ba89b3f6e541fe4
+++ src/option.cc	7d0c3b6ca2eccfcdb1907e5498abdd74507a3612
@@ -235,7 +235,7 @@ tokenize_for_command_line(string const &
         {
           if (type != one)
             ++i;
-          E(i != from.end(), origin::user, F("Invalid escape in '--xargs' file"));
+          E(i != from.end(), origin::user, F("invalid escape in '--xargs' file"));
           cur += *i;
           have_tok = true;
         }
============================================================
--- src/network/netsync_session.cc	4beb680160507ed35cb14464f8fd054773d59836
+++ src/network/netsync_session.cc	2c9ac6ccefe471f1ba7e1f261715501375cc0c0f
@@ -976,7 +976,7 @@ netsync_session::process_data_cmd(netcmd
             bool am_server = (get_voice() == server_voice);
             error(error_codes::mixing_versions,
                   (F("mismatched epoch on branch %s."
-                     " Server has '%s', client has '%s'.")
+                     " Server has '%s', client has '%s'")
                    % branch
                    % (am_server ? my_epoch : their_epoch)()
                    % (am_server ? their_epoch : my_epoch)()).str());
@@ -1018,7 +1018,7 @@ netsync_session::process_data_cmd(netcmd
             if (!matched)
               {
                 W(F("dropping incoming cert which claims to be signed by key\n"
-                    "'%s' (name '%s'), but has a bad signature")
+                    "%s (name '%s'), but has a bad signature")
                   % c.key % keyname);
               }
           }
============================================================
--- src/network/connection_info.cc	91b8c343c905c4a0e47408d38ca1fbdcac5949ec
+++ src/network/connection_info.cc	b5868dad7e81cc1f021a0666034e258a6d8b785b
@@ -530,7 +530,7 @@ netsync_connection_info::setup_for_serve
           "(see hook persist_phrase_ok())"));
     }
   else if (!opts.bind_stdio)
-    W(F("The '--no-transport-auth' option is usually only used "
+    W(F("the '--no-transport-auth' option is usually only used "
         "in combination with '--stdio'"));
 }