[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.string-sanitization: f48c74
|
From: |
code |
|
Subject: |
[Monotone-commits-diffs] net.venge.monotone.string-sanitization: f48c742334d32bc23a9eb70ad6fbafb8bdc8cff3 |
|
Date: |
Tue, 8 Mar 2011 11:17:06 +0100 (CET) |
revision: f48c742334d32bc23a9eb70ad6fbafb8bdc8cff3
date: 2011-03-08T10:16:45
author: Richard Levitte <address@hidden>
branch: net.venge.monotone.string-sanitization
changelog:
* src/**/*.c: Apply capitalization and period rules.
manifest:
format_version "1"
new_manifest [f3433cea548bdddbcddc8457572d585c2bcf7666]
old_revision [78b606805fce9206c5cf8484e97ba4aa319de814]
patch "src/automate.cc"
from [5c2e2de5f4ef001eb4920f367c83c6b6c2f344f4]
to [915b82a6054adec8837057ad378405c30a555a55]
patch "src/cmd_automate.cc"
from [35afc0ad1040244533e24ad489a8ec139d0b163b]
to [9a39706690d6edbe1233e0cb613bc3ab8d0b3fe3]
patch "src/cmd_db.cc"
from [419d06e8b256dbe4d0499e0da58725ad535d5570]
to [ad043207d9a5014f8137a23782b36a97dc9fc4c0]
patch "src/cmd_files.cc"
from [88f831d8a59a91d45039fd91825b2d81c48349dd]
to [f15378efd25e597762776ad6e9c6f78c1a4ff191]
patch "src/cmd_merging.cc"
from [dc8259075d9d3114590c0d574e5ea6c324b11112]
to [7f9ada8c00c393a6581f5d2045a40076b6f98bcf]
patch "src/cmd_ws_commit.cc"
from [78622bdfa00dbeac44492a318e3f01ad321a0bbc]
to [f6649899be34a722109d31d12bb407cb3ff8f0a1]
patch "src/database.cc"
from [026dd04c077a6a6af2bf4cb774716388c1a8bdb1]
to [874b78adc3c582abfb584493c4c8a843e7adcabf]
patch "src/key_store.cc"
from [979765328547c5b2596cf5b0a0b8f08614ec8444]
to [954b32ff72e019e6423a704ab3f5c3cba8b0fefa]
patch "src/keys.cc"
from [052dffb8c31c5fb0f7b0d4593d9d7f6cfe1b21ec]
to [5e83c66959453e7454ea99b5a403c41ab4982461]
patch "src/merge_roster.cc"
from [395bb5836bc21de80a7b3e6dafd48927faf24f16]
to [98297d6264f77d540fc8e1578b1ebc5b2f36ec38]
patch "src/migrate_ancestry.cc"
from [68b3c5e54c47a50bfcaf49e05a94fd7ec21ec265]
to [e193114e2881198a24c5d7ed9a7ad8742aa0f191]
patch "src/migrate_schema.cc"
from [778717ded91866aaabea3752ebd5d44400ce8595]
to [6795de38c20c625b5f5d955cc4beb26b243dcf57]
patch "src/migrate_work.cc"
from [e154bf66a9477bc8ad6f7dbb17a38803c54398cc]
to [c8352aa8e2c0ac586bfc10258a4a53bf45c6e523]
patch "src/monotone.cc"
from [a2b9556443f70695532d0916c30c2f7379e0f9c9]
to [a25ecdd170a601db798b63a60add7681609a34c4]
patch "src/netsync.cc"
from [19950fb58bfd69abe3783c3c5e4f0fdaa748b2dc]
to [55f9aef4302b12a06baef3ae0088fb07431e226f]
patch "src/network/connection_info.cc"
from [17039acb5aba37282fc972cb05f9cc49f156dc63]
to [91b8c343c905c4a0e47408d38ca1fbdcac5949ec]
patch "src/network/netsync_session.cc"
from [e19902086d1a8329e3ce6e36c940b08558ecee3e]
to [4beb680160507ed35cb14464f8fd054773d59836]
patch "src/network/session.cc"
from [bebede070e2de236a45cf064a4f6164ca973b970]
to [68b39e18698a07a5624965e75cf931c533b65db9]
patch "src/revision.cc"
from [c4c2ae8c94e1bbe97952f8601fe8edf4f36af18e]
to [9df150522a221e1d0d05eadba83e001497113f5a]
patch "src/win32/ssh_agent_platform.cc"
from [2d1a269c53214e43f95486216bee5c6fa21b3c1e]
to [868f66983c9e8d9ff7c48be9b1f97b405dd60329]
patch "src/work.cc"
from [fcb7b12aae82a60bf486001bc777912bdd377697]
to [36e5dcda8cf09c9054cb88e6165707112ba9ac03]
============================================================
--- src/database.cc 026dd04c077a6a6af2bf4cb774716388c1a8bdb1
+++ src/database.cc 874b78adc3c582abfb584493c4c8a843e7adcabf
@@ -614,19 +614,19 @@ database_impl::check_format()
// they need to either changesetify or rosterify. which?
if (table_has_data("revisions"))
E(false, origin::no_fault,
- F("database '%s' contains old-style revisions\n"
- "if you are a project leader or doing local testing:\n"
+ F("database '%s' contains old-style revisions.\n"
+ "If you are a project leader or doing local testing:\n"
" see the file UPGRADE for instructions on upgrading.\n"
- "if you are not a project leader:\n"
+ "If you are not a project leader:\n"
" wait for a leader to migrate project data, and then\n"
" pull into a fresh database.\n"
- "sorry about the inconvenience.")
+ "Sorry about the inconvenience.")
% filename);
else
E(false, origin::no_fault,
- F("database '%s' contains manifests but no revisions\n"
- "this is a very old database; it needs to be upgraded\n"
- "please see 'http://wiki.monotone.ca/upgradefromchangesets/'\n"
+ F("database '%s' contains manifests but no revisions.\n"
+ "This is a very old database; it needs to be upgraded.\n"
+ "Please see 'http://wiki.monotone.ca/upgradefromchangesets/'\n"
"for details")
% filename);
}
@@ -647,8 +647,8 @@ database_impl::check_caches()
}
E(caches_are_filled, origin::no_fault,
- F("database '%s' lacks some cached data\n"
- "run '%s db regenerate_caches' to restore use of this database")
+ F("database '%s' lacks some cached data.\n"
+ "Run '%s db regenerate_caches' to restore use of this database")
% filename % prog_name);
}
@@ -3798,7 +3798,7 @@ database::put_revision_cert(cert const &
if (branch_name.find_first_of("?,;*%%+{}[]!^") != string::npos ||
branch_name.find_first_of('-') == 0)
{
- W(F("The branch name\n"
+ W(F("the branch name\n"
" '%s'\n"
"contains meta characters (one or more of '?,;*%%+{}[]!^') or\n"
"starts with a dash, which might cause malfunctions when used\n"
@@ -4849,8 +4849,8 @@ database_impl::check_db_nonexistent()
system_path journal(filename.as_internal() + "-journal", origin::internal);
require_path_is_nonexistent(journal,
F("existing (possibly stale) journal file '%s' "
- "has same stem as new database '%s'\n"
- "cancelling database creation")
+ "has same stem as new database '%s'.\n"
+ "Cancelling database creation")
% journal % filename);
}
============================================================
--- src/keys.cc 052dffb8c31c5fb0f7b0d4593d9d7f6cfe1b21ec
+++ src/keys.cc 5e83c66959453e7454ea99b5a403c41ab4982461
@@ -85,7 +85,7 @@ namespace {
db.get_key(chosen_key, pub_key);
E(keys_match(name, pub_key, name, priv_key.pub),
origin::no_fault,
- F("The key %s stored in your database does\n"
+ F("the key %s stored in your database does\n"
"not match the version in your local key store!")
% chosen_key);
}
@@ -99,11 +99,11 @@ namespace {
vector<key_id> all_privkeys;
keys.get_key_ids(all_privkeys);
E(key_requiredness == key_optional || !all_privkeys.empty(), origin::user,
- F("you have no private key to make signatures with\n"
- "perhaps you need to 'genkey <your email>'"));
+ F("you have no private key to make signatures with.\n"
+ "Perhaps you need to 'genkey <your email>'"));
E(key_requiredness == key_optional || all_privkeys.size() < 2, origin::user,
- F("you have multiple private keys\n"
- "pick one to use for signatures by adding "
+ F("you have multiple private keys.\n"
+ "Pick one to use for signatures by adding "
"'-k<keyname>' to your command"));
if (all_privkeys.size() == 1)
============================================================
--- src/monotone.cc a2b9556443f70695532d0916c30c2f7379e0f9c9
+++ src/monotone.cc a25ecdd170a601db798b63a60add7681609a34c4
@@ -140,10 +140,10 @@ cpp_main(int argc, char ** argv)
#ifdef SUPPORT_SQLITE_BEFORE_3003014
E(sqlite3_libversion_number() >= 3003008, origin::system,
- F("This monotone binary requires at least SQLite 3.3.8 to run."));
+ F("this monotone binary requires at least SQLite 3.3.8 to run"));
#else
E(sqlite3_libversion_number() >= 3003014, origin::system,
- F("This monotone binary requires at least SQLite 3.3.14 to run."));
+ F("this monotone binary requires at least SQLite 3.3.14 to run"));
#endif
// check the botan library version we got linked against.
@@ -154,27 +154,27 @@ cpp_main(int argc, char ** argv)
// Botan 1.7.14 has an incompatible API change, which got reverted
// again in 1.7.15. Thus we do not care to support 1.7.14.
E(linked_botan_version != BOTAN_VERSION_CODE_FOR(1,7,14), origin::system,
- F("Monotone does not support Botan 1.7.14."));
+ F("monotone does not support Botan 1.7.14"));
#if BOTAN_VERSION_CODE <= BOTAN_VERSION_CODE_FOR(1,7,6)
E(linked_botan_version >= BOTAN_VERSION_CODE_FOR(1,6,3), origin::system,
- F("This monotone binary requires Botan 1.6.3 or newer."));
+ F("this monotone binary requires Botan 1.6.3 or newer"));
E(linked_botan_version <= BOTAN_VERSION_CODE_FOR(1,7,6), origin::system,
- F("This monotone binary does not work with Botan newer than 1.7.6."));
+ F("this monotone binary does not work with Botan newer than 1.7.6"));
#elif BOTAN_VERSION_CODE <= BOTAN_VERSION_CODE_FOR(1,7,22)
E(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,6), origin::system,
- F("This monotone binary requires Botan 1.7.7 or newer."));
+ F("this monotone binary requires Botan 1.7.7 or newer"));
// While compiling against 1.7.22 or newer is recommended, because
// it enables new features of Botan, the monotone binary compiled
// against Botan 1.7.21 and before should still work with newer Botan
// versions, including all of the stable branch 1.8.x.
E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
- F("This monotone binary does not work with Botan 1.9.x."));
+ F("this monotone binary does not work with Botan 1.9.x"));
#else
E(linked_botan_version > BOTAN_VERSION_CODE_FOR(1,7,22), origin::system,
- F("This monotone binary requires Botan 1.7.22 or newer."));
+ F("this monotone binary requires Botan 1.7.22 or newer"));
E(linked_botan_version < BOTAN_VERSION_CODE_FOR(1,9,0), origin::system,
- F("This monotone binary does not work with Botan 1.9.x."));
+ F("this monotone binary does not work with Botan 1.9.x"));
#endif
app_state app;
============================================================
--- src/work.cc fcb7b12aae82a60bf486001bc777912bdd377697
+++ src/work.cc 36e5dcda8cf09c9054cb88e6165707112ba9ac03
@@ -1171,7 +1171,7 @@ addition_builder::visit_dir(file_path co
}
if (warn)
- W(F("Non-recursive add: Files in the directory '%s' "
+ W(F("non-recursive add: Files in the directory '%s' "
"will not be added automatically.") % path);
}
@@ -1728,7 +1728,7 @@ workspace::update_current_roster_from_fi
}
E(missing_items == 0, origin::user,
- F("%d missing items; use '%s ls missing' to view\n"
+ F("%d missing items; use '%s ls missing' to view.\n"
"To restore consistency, on each missing item run either\n"
" '%s drop ITEM' to remove it permanently, or\n"
" '%s revert ITEM' to restore it.\n"
@@ -2204,7 +2204,7 @@ workspace::perform_content_update(roster
{
E(move_conflicting_paths, origin::user,
F("re-run this command with '--move-conflicting-paths' to move "
- "conflicting paths out of the way."));
+ "conflicting paths out of the way"));
move_conflicting_paths_into_bookkeeping(swt.get_conflicting_paths());
moved_conflicting = true;
}
============================================================
--- src/migrate_schema.cc 778717ded91866aaabea3752ebd5d44400ce8595
+++ src/migrate_schema.cc 6795de38c20c625b5f5d955cc4beb26b243dcf57
@@ -1168,7 +1168,7 @@ diagnose_unrecognized_schema(schema_mism
E(cat != SCHEMA_TOO_NEW, origin::user,
F("'%s' appears to be a monotone database, but this version of\n"
"monotone does not recognize its schema.\n"
- "you probably need a newer version of monotone.")
+ "You probably need a newer version of monotone.")
% filename);
}
@@ -1185,8 +1185,8 @@ check_sql_schema(sqlite3 * db, system_pa
diagnose_unrecognized_schema(cat, filename);
E(cat != SCHEMA_MIGRATION_NEEDED, origin::user,
- F("database '%s' is laid out according to an old schema\n"
- "try '%s db migrate' to upgrade\n"
+ F("database '%s' is laid out according to an old schema.\n"
+ "Try '%s db migrate' to upgrade\n"
"(this is irreversible; you may want to make a backup copy first)")
% filename % prog_name);
}
============================================================
--- src/netsync.cc 19950fb58bfd69abe3783c3c5e4f0fdaa748b2dc
+++ src/netsync.cc 55f9aef4302b12a06baef3ae0088fb07431e226f
@@ -243,7 +243,7 @@ session_from_server_sync_item(app_state
}
catch (Netxx::NetworkException & e)
{
- P(F("Network error: %s") % e.what());
+ P(F("network error: %s") % e.what());
return shared_ptr<session>();
}
}
============================================================
--- src/revision.cc c4c2ae8c94e1bbe97952f8601fe8edf4f36af18e
+++ src/revision.cc 9df150522a221e1d0d05eadba83e001497113f5a
@@ -25,7 +25,7 @@ void revision_t::check_sane() const
void revision_t::check_sane() const
{
- E(!null_id(new_manifest), made_from, F("Revision has no manifest id"));
+ E(!null_id(new_manifest), made_from, F("revision has no manifest id"));
if (edges.size() == 1)
{
@@ -36,11 +36,11 @@ void revision_t::check_sane() const
// merge nodes cannot have null revisions
for (edge_map::const_iterator i = edges.begin(); i != edges.end(); ++i)
E(!null_id(edge_old_revision(i)), made_from,
- F("Merge revision has a null parent"));
+ F("merge revision has a null parent"));
}
else
// revisions must always have either 1 or 2 edges
- E(false, made_from, F("Revision has %d edges, not 1 or 2") % edges.size());
+ E(false, made_from, F("revision has %d edges, not 1 or 2") % edges.size());
// we used to also check that if there were multiple edges that had patches
// for the same file, then the new hashes on each edge matched each other.
@@ -376,9 +376,9 @@ parse_revision(basic_io::parser & parser
parser.esym(syms::format_version);
parser.str(tmp);
E(tmp == "1", parser.tok.in.made_from,
- F("encountered a revision with unknown format, version %s\n"
- "I only know how to understand the version 1 format\n"
- "a newer version of monotone is required to complete this operation")
+ F("encountered a revision with unknown format, version %s.\n"
+ "I only know how to understand the version 1 format.\n"
+ "A newer version of monotone is required to complete this operation")
% tmp);
parser.esym(syms::new_manifest);
parser.hex(tmp);
============================================================
--- src/automate.cc 5c2e2de5f4ef001eb4920f367c83c6b6c2f344f4
+++ src/automate.cc 915b82a6054adec8837057ad378405c30a555a55
@@ -2242,7 +2242,7 @@ CMD_AUTOMATE(get_db_variables, N_("[DOMA
}
E(found_something, origin::user,
- F("No variables found or invalid domain specified"));
+ F("no variables found or invalid domain specified"));
// print the last stanza
pr.print_stanza(st);
============================================================
--- src/key_store.cc 979765328547c5b2596cf5b0a0b8f08614ec8444
+++ src/key_store.cc 954b32ff72e019e6423a704ab3f5c3cba8b0fefa
@@ -87,7 +87,7 @@ struct key_store_state
|| app.opts.conf_dir_given
|| !app.opts.no_default_confdir,
origin::user,
- F("No available keystore found"));
+ F("no available keystore found"));
}
// internal methods
@@ -131,22 +131,22 @@ namespace
keyreader(key_store_state & kss): kss(kss) {}
virtual void consume_file_data(file_id const & ident,
file_data const & dat)
- {E(false, origin::system, F("Extraneous data in key store."));}
+ {E(false, origin::system, F("extraneous data in key store"));}
virtual void consume_file_delta(file_id const & id_old,
file_id const & id_new,
file_delta const & del)
- {E(false, origin::system, F("Extraneous data in key store."));}
+ {E(false, origin::system, F("extraneous data in key store"));}
virtual void consume_revision_data(revision_id const & ident,
revision_data const & dat)
- {E(false, origin::system, F("Extraneous data in key store."));}
+ {E(false, origin::system, F("extraneous data in key store"));}
virtual void consume_revision_cert(cert const & t)
- {E(false, origin::system, F("Extraneous data in key store."));}
+ {E(false, origin::system, F("extraneous data in key store"));}
virtual void consume_public_key(key_name const & ident,
rsa_pub_key const & k)
- {E(false, origin::system, F("Extraneous data in key store."));}
+ {E(false, origin::system, F("extraneous data in key store"));}
virtual void consume_key_pair(key_name const & name,
keypair const & kp)
@@ -157,7 +157,7 @@ namespace
key_hash_code(name, kp.pub, ident);
E(kss.put_key_pair_memory(full_key_info(ident, key_info(name, kp))),
origin::system,
- F("Key store has multiple copies of the key with id %s.") % ident);
+ F("key store has multiple copies of the key with id %s") % ident);
L(FL("successfully read key pair %s from key store") % ident);
}
@@ -419,19 +419,19 @@ struct key_delete_validator : public pac
virtual ~key_delete_validator() {}
virtual void consume_file_data(file_id const & ident,
file_data const & dat)
- { E(false, origin::system, F("Invalid data in key file.")); }
+ { E(false, origin::system, F("invalid data in key file")); }
virtual void consume_file_delta(file_id const & id_old,
file_id const & id_new,
file_delta const & del)
- { E(false, origin::system, F("Invalid data in key file.")); }
+ { E(false, origin::system, F("invalid data in key file")); }
virtual void consume_revision_data(revision_id const & ident,
revision_data const & dat)
- { E(false, origin::system, F("Invalid data in key file.")); }
+ { E(false, origin::system, F("invalid data in key file")); }
virtual void consume_revision_cert(cert const & t)
- { E(false, origin::system, F("Invalid data in key file.")); }
+ { E(false, origin::system, F("invalid data in key file")); }
virtual void consume_public_key(key_name const & ident,
rsa_pub_key const & k)
- { E(false, origin::system, F("Invalid data in key file.")); }
+ { E(false, origin::system, F("invalid data in key file")); }
virtual void consume_key_pair(key_name const & name,
keypair const & kp)
{
@@ -848,7 +848,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"
+ F("you have chosen to sign only with ssh-agent but ssh-agent"
" does not seem to be running."));
if (s->ssh_sign_mode == "yes"
|| s->ssh_sign_mode == "check"
@@ -878,7 +878,7 @@ key_store::make_signature(database & db,
string ssh_sig = sig_string;
E(ssh_sig.length() > 0 || s->ssh_sign_mode != "only", origin::user,
- F("You don't seem to have your monotone key imported "));
+ F("you don't seem to have your monotone key imported "));
if (ssh_sig.length() <= 0
|| s->ssh_sign_mode == "check"
============================================================
--- src/merge_roster.cc 395bb5836bc21de80a7b3e6dafd48927faf24f16
+++ src/merge_roster.cc 98297d6264f77d540fc8e1578b1ebc5b2f36ec38
@@ -338,7 +338,7 @@ namespace
{
file_path fp;
parent_roster.get_name(n->self, fp);
- W(F("Content changes to the file '%s'\n"
+ W(F("content changes to the file '%s'\n"
"will be ignored during this merge as the file has been\n"
"removed on one side of the merge. Affected revisions include:") % fp);
}
============================================================
--- src/cmd_automate.cc 35afc0ad1040244533e24ad489a8ec139d0b163b
+++ src/cmd_automate.cc 9a39706690d6edbe1233e0cb613bc3ab8d0b3fe3
@@ -321,7 +321,7 @@ LUAEXT(mtn_automate, )
I(app_p != NULL);
I(app_p->lua.check_lua_state(LS));
E(app_p->mtn_automate_allowed, origin::user,
- F("It is illegal to call the mtn_automate() lua extension,\n"
+ F("it is illegal to call the mtn_automate() lua extension,\n"
"unless from a command function defined by register_command()."));
// don't allow recursive calls
@@ -330,7 +330,7 @@ LUAEXT(mtn_automate, )
int n = lua_gettop(LS);
E(n > 0, origin::user,
- F("Bad input to mtn_automate() lua extension: command name is missing"));
+ F("bad input to mtn_automate() lua extension: command name is missing"));
L(FL("Starting call to mtn_automate lua hook"));
============================================================
--- src/cmd_db.cc 419d06e8b256dbe4d0499e0da58725ad535d5570
+++ src/cmd_db.cc ad043207d9a5014f8137a23782b36a97dc9fc4c0
@@ -219,7 +219,7 @@ CMD(db_kill_rev_locally, "kill_revision"
continue;
E(!work.has_changes(db), origin::user,
- F("Cannot kill revision %s,\n"
+ F("cannot kill revision %s,\n"
"because it would leave the current workspace in an invalid\n"
"state, from which monotone cannot recover automatically since\n"
"the workspace contains uncommitted changes.\n"
============================================================
--- src/cmd_files.cc 88f831d8a59a91d45039fd91825b2d81c48349dd
+++ src/cmd_files.cc f15378efd25e597762776ad6e9c6f78c1a4ff191
@@ -241,7 +241,7 @@ CMD_AUTOMATE(identify, N_("PATH"),
utf8 path = idx(args, 0);
E(path() != "-", origin::user,
- F("Cannot read from stdin"));
+ F("cannot read from stdin"));
data dat;
read_data_for_command_line(path, dat);
============================================================
--- src/cmd_merging.cc dc8259075d9d3114590c0d574e5ea6c324b11112
+++ src/cmd_merging.cc 7f9ada8c00c393a6581f5d2045a40076b6f98bcf
@@ -225,9 +225,9 @@ update(app_state & app,
app.opts.branch,
app.opts.ignore_suspend_certs);
E(!candidates.empty(), origin::user,
- F("your request matches no descendents of the current revision\n"
- "in fact, it doesn't even match the current revision\n"
- "maybe you want something like '--revision=h:%s'")
+ F("your request matches no descendents of the current revision.\n"
+ "In fact, it doesn't even match the current revision.\n"
+ "Maybe you want something like '--revision=h:%s'")
% app.opts.branch);
if (candidates.size() != 1)
{
============================================================
--- src/cmd_ws_commit.cc 78622bdfa00dbeac44492a318e3f01ad321a0bbc
+++ src/cmd_ws_commit.cc f6649899be34a722109d31d12bb407cb3ff8f0a1
@@ -176,7 +176,7 @@ get_log_message_interactively(lua_hooks
work.load_commit_text(backup);
E(backup().empty(), origin::user,
- F("A backup from a previously failed commit exists in '_MTN/commit'.\n"
+ F("a backup from a previously failed commit exists in '_MTN/commit'.\n"
"This file must be removed before commit will proceed.\n"
"You may recover the previous message from this file if necessary."));
@@ -286,7 +286,7 @@ get_log_message_interactively(lua_hooks
if (changelog_end != string::npos)
work.write_user_log(utf8(trim_right(full_message().substr(0, changelog_end)) + '\n', origin::user));
- E(false, origin::user, F("Commit cancelled."));
+ E(false, origin::user, F("commit cancelled."));
}
// save the message in _MTN/commit so it's not lost if something fails
@@ -304,39 +304,39 @@ get_log_message_interactively(lua_hooks
message.read(cancel());
E(message.read(instructions()), origin::user,
- F("Commit failed. Instructions not found."));
+ F("commit failed. Instructions not found."));
// Branch:
E(message.read(trim_right(BRANCH())), origin::user,
- F("Commit failed. Branch header not found."));
+ F("commit failed. Branch header not found."));
string b = message.readline();
E(!b.empty(), origin::user,
- F("Commit failed. Branch value empty."));
+ F("commit failed. Branch value empty."));
branch = branch_name(b, origin::user);
// Author:
E(message.read(trim_right(AUTHOR())), origin::user,
- F("Commit failed. Author header not found."));
+ F("commit failed. Author header not found."));
author = message.readline();
E(!author.empty(), origin::user,
- F("Commit failed. Author value empty."));
+ F("commit failed. Author value empty."));
// Date:
E(message.read(trim_right(DATE())), origin::user,
- F("Commit failed. Date header not found."));
+ F("commit failed. Date header not found."));
string d = message.readline();
E(!d.empty(), origin::user,
- F("Commit failed. Date value empty."));
+ F("commit failed. Date value empty."));
if (!is_date_fmt_valid || date_fmt.empty())
date = date_t(d);
@@ -859,7 +859,7 @@ CMD(rename, "rename", "mv", CMD_REF(work
if (src_paths.size() == 1 && dstr()[dstr().size() -1] == '/')
if (get_path_status(*src_paths.begin()) != path::directory)
E(get_path_status(dst_path) == path::directory, origin::user,
- F(_("The specified target directory '%s/' doesn't exist.")) % dst_path);
+ F(_("the specified target directory '%s/' doesn't exist.")) % dst_path);
work.perform_rename(db, src_paths, dst_path, app.opts.bookkeep_only);
}
@@ -1160,7 +1160,7 @@ drop_attr(app_state & app, args_vector c
file_path path = file_path_external(idx(args, 0));
E(old_roster.has_node(path), origin::user,
- F("Unknown path '%s'") % path);
+ F("unknown path '%s'") % path);
roster_t new_roster = old_roster;
node_t node = new_roster.get_node_for_update(path);
@@ -1177,7 +1177,7 @@ drop_attr(app_state & app, args_vector c
I(args.size() == 2);
attr_key a_key = typecast_vocab<attr_key>(idx(args, 1));
E(node->attrs.find(a_key) != node->attrs.end(), origin::user,
- F("Path '%s' does not have attribute '%s'")
+ F("path '%s' does not have attribute '%s'")
% path % a_key);
node->attrs[a_key] = make_pair(false, "");
}
@@ -1228,7 +1228,7 @@ CMD(attr_get, "get", "", CMD_REF(attr),
file_path path = file_path_external(idx(args, 0));
- E(new_roster.has_node(path), origin::user, F("Unknown path '%s'") % path);
+ E(new_roster.has_node(path), origin::user, F("unknown path '%s'") % path);
const_node_t node = new_roster.get_node(path);
if (args.size() == 1)
@@ -1244,7 +1244,7 @@ CMD(attr_get, "get", "", CMD_REF(attr),
has_any_live_attrs = true;
}
if (!has_any_live_attrs)
- cout << F("No attributes for '%s'") % path << '\n';
+ cout << F("no attributes for '%s'") % path << '\n';
}
else
{
@@ -1256,7 +1256,7 @@ CMD(attr_get, "get", "", CMD_REF(attr),
<< i->first << '='
<< i->second.second << '\n';
else
- cout << (F("No attribute '%s' on path '%s'")
+ cout << (F("no attribute '%s' on path '%s'")
% a_key % path) << '\n';
}
}
@@ -1278,7 +1278,7 @@ set_attr(app_state & app, args_vector co
file_path path = file_path_external(idx(args, 0));
E(old_roster.has_node(path), origin::user,
- F("Unknown path '%s'") % path);
+ F("unknown path '%s'") % path);
roster_t new_roster = old_roster;
node_t node = new_roster.get_node_for_update(path);
@@ -1359,7 +1359,7 @@ CMD_AUTOMATE(get_attributes, N_("PATH"),
base = parent_roster(parents.begin());
E(current.has_node(path), origin::user,
- F("Unknown path '%s'") % path);
+ F("unknown path '%s'") % path);
// create the printer
basic_io::printer pr;
@@ -1533,7 +1533,7 @@ void perform_commit(app_state & app,
E(branchname() == "" || branchname == bn_candidate, origin::user,
F("parent revisions of this commit are in different branches:\n"
"'%s' and '%s'.\n"
- "please specify a branch name for the commit, with '--branch'.")
+ "Please specify a branch name for the commit, with '--branch'.")
% branchname % bn_candidate);
branchname = bn_candidate;
}
@@ -1703,7 +1703,7 @@ void perform_commit(app_state & app,
else
// If we don't err out here, the database will later.
E(false, origin::no_fault,
- F("Your database is missing version %s of file '%s'")
+ F("your database is missing version %s of file '%s'")
% old_content % path);
}
============================================================
--- src/migrate_work.cc e154bf66a9477bc8ad6f7dbb17a38803c54398cc
+++ src/migrate_work.cc c8352aa8e2c0ac586bfc10258a4a53bf45c6e523
@@ -122,19 +122,19 @@ workspace::check_format()
// Don't give user false expectations about format 0.
E(format > 0, origin::system,
- F("this workspace's metadata is in format 0. to use this workspace\n"
+ F("this workspace's metadata is in format 0. To use this workspace\n"
"with this version of monotone, you must delete it and check it\n"
"out again (migration from format 0 is not possible).\n"
- "once you have done this, you will not be able to use the workspace\n"
+ "Once you have done this, you will not be able to use the workspace\n"
"with versions of monotone older than %s.\n"
- "we apologize for the inconvenience.")
+ "We apologize for the inconvenience.")
% first_version_supporting_current_format);
E(format >= current_workspace_format, origin::system,
F("to use this workspace with this version of monotone, its metadata\n"
"must be migrated from format %d to format %d, using the command\n"
"'%s migrate_workspace'.\n"
- "once you have done this, you will not be able to use the workspace\n"
+ "Once you have done this, you will not be able to use the workspace\n"
"with versions of monotone older than %s.")
% format % current_workspace_format % prog_name
% first_version_supporting_current_format);
@@ -142,8 +142,8 @@ workspace::check_format()
// keep this message in sync with the copy in migrate_format
E(format <= current_workspace_format, origin::system,
F("this version of monotone only understands workspace metadata\n"
- "in formats 0 through %d. your workspace is in format %d.\n"
- "you need a newer version of monotone to use this workspace.")
+ "in formats 0 through %d. Your workspace is in format %d.\n"
+ "You need a newer version of monotone to use this workspace.")
% current_workspace_format % format);
}
@@ -171,8 +171,8 @@ migrate_0_to_1()
E(false, origin::system,
F("it is not possible to migrate from workspace format 0 to any\n"
- "later format. you must delete this workspace and check it out\n"
- "again. we apologize for the inconvenience."));
+ "later format. You must delete this workspace and check it out\n"
+ "again. We apologize for the inconvenience."));
}
static void
@@ -264,7 +264,7 @@ workspace::migrate_format()
case current_workspace_format:
P(F("this workspace is in the current format, "
- "no migration is necessary."));
+ "no migration is necessary"));
break;
default:
@@ -272,8 +272,8 @@ workspace::migrate_format()
// keep this message in sync with the copy in check_format
E(false, origin::system,
F("this version of monotone only understands workspace metadata\n"
- "in formats 0 through %d. your workspace is in format %d.\n"
- "you need a newer version of monotone to use this workspace.")
+ "in formats 0 through %d. Your workspace is in format %d.\n"
+ "You need a newer version of monotone to use this workspace.")
% current_workspace_format % format);
}
}
============================================================
--- src/win32/ssh_agent_platform.cc 2d1a269c53214e43f95486216bee5c6fa21b3c1e
+++ src/win32/ssh_agent_platform.cc 868f66983c9e8d9ff7c48be9b1f97b405dd60329
@@ -79,7 +79,7 @@ ssh_agent_platform::write_data(string co
% data.length() % mapname);
E(data.length() < AGENT_MAX_MSGLEN, origin::system,
- F("Asked to write more than %u to pageant.") % AGENT_MAX_MSGLEN);
+ F("asked to write more than %u to pageant") % AGENT_MAX_MSGLEN);
memcpy(filemap_view, data.c_str(), data.length());
cds.dwData = AGENT_COPYDATA_ID;
@@ -88,7 +88,7 @@ ssh_agent_platform::write_data(string co
id = SendMessage(hwnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) &cds);
- E(id > 0, origin::system, F("Error sending message to pageant (%d).") % id);
+ E(id > 0, origin::system, F("error sending message to pageant (%d)") % id);
//Start our read counter again
read_len = 0;
@@ -102,7 +102,7 @@ ssh_agent_platform::read_data(u32 const
L(FL("ssh_agent: read_data: asked to read %u bytes") % len);
E((read_len + len) < AGENT_MAX_MSGLEN, origin::system,
- F("Asked to read more than %u from pageant.") % AGENT_MAX_MSGLEN);
+ F("asked to read more than %u from pageant") % AGENT_MAX_MSGLEN);
out.append(filemap_view + read_len, len);
============================================================
--- src/migrate_ancestry.cc 68b3c5e54c47a50bfcaf49e05a94fd7ec21ec265
+++ src/migrate_ancestry.cc e193114e2881198a24c5d7ed9a7ad8742aa0f191
@@ -486,7 +486,7 @@ insert_parents_into_roster(roster_t & ch
if (child_roster.has_node(pth))
{
E(is_dir_t(child_roster.get_node(pth)), origin::internal,
- F("Directory '%s' for path '%s' cannot be added, "
+ F("directory '%s' for path '%s' cannot be added, "
"as there is a file in the way") % pth % full);
return;
}
@@ -507,10 +507,10 @@ insert_into_roster(roster_t & child_rost
{
const_node_t n = child_roster.get_node(pth);
E(is_file_t(n), origin::internal,
- F("Path '%s' cannot be added, as there is a directory in the way") % pth);
+ F("path '%s' cannot be added, as there is a directory in the way") % pth);
const_file_t f = downcast_to_file_t(n);
E(f->content == fid, origin::internal,
- F("Path '%s' added twice with differing content") % pth);
+ F("path '%s' added twice with differing content") % pth);
return;
}
@@ -797,8 +797,8 @@ anc_graph::construct_revisions_from_ance
origin::internal));
else
E(false, origin::no_fault,
- F("unknown attribute '%s' on path '%s'\n"
- "please contact %s so we can work out the right way to migrate this\n"
+ F("unknown attribute '%s' on path '%s'.\n"
+ "Please contact %s so we can work out the right way to migrate this\n"
"(if you just want it to go away, see the switch '--drop-attr', but\n"
"seriously, if you'd like to keep it, we're happy to figure out how)")
% key % j->first % PACKAGE_BUGREPORT);
============================================================
--- src/network/netsync_session.cc e19902086d1a8329e3ce6e36c940b08558ecee3e
+++ src/network/netsync_session.cc 4beb680160507ed35cb14464f8fd054773d59836
@@ -753,7 +753,7 @@ netsync_session::process_refine_cmd(refi
switch (node.type)
{
case file_item:
- W(F("Unexpected 'refine' command on non-refined item type"));
+ W(F("unexpected 'refine' command on non-refined item type"));
break;
case key_item:
@@ -785,7 +785,7 @@ netsync_session::process_done_cmd(netcmd
switch (type)
{
case file_item:
- W(F("Unexpected 'done' command on non-refined item type"));
+ W(F("unexpected 'done' command on non-refined item type"));
break;
case key_item:
@@ -975,7 +975,7 @@ netsync_session::process_data_cmd(netcmd
encode_hexenc(epoch.inner(), their_epoch);
bool am_server = (get_voice() == server_voice);
error(error_codes::mixing_versions,
- (F("Mismatched epoch on branch %s."
+ (F("mismatched epoch on branch %s."
" Server has '%s', client has '%s'.")
% branch
% (am_server ? my_epoch : their_epoch)()
@@ -1003,7 +1003,7 @@ netsync_session::process_data_cmd(netcmd
counts->keys_in.add_item(key_id(item));
else
error(error_codes::partial_transfer,
- (F("Received duplicate key %s") % keyid).str());
+ (F("received duplicate key %s") % keyid).str());
}
break;
@@ -1017,7 +1017,7 @@ netsync_session::process_data_cmd(netcmd
matched = cert::read_cert(project.db, dat, c, keyname);
if (!matched)
{
- W(F("Dropping incoming cert which claims to be signed by key\n"
+ W(F("dropping incoming cert which claims to be signed by key\n"
"'%s' (name '%s'), but has a bad signature")
% c.key % keyname);
}
@@ -1027,9 +1027,9 @@ netsync_session::process_data_cmd(netcmd
matched = cert::read_cert_v6(project.db, dat, c, keyname);
if (!matched)
{
- W(F("dropping incoming cert which was signed by a key we don't have\n"
- "you probably need to obtain this key from a more recent netsync peer\n"
- "the name of the key involved is '%s', but note that there are multiple\n"
+ W(F("dropping incoming cert which was signed by a key we don't have.\n"
+ "You probably need to obtain this key from a more recent netsync peer.\n"
+ "The name of the key involved is '%s', but note that there are multiple\n"
"keys with this name and we don't know which one it is") % keyname);
}
}
============================================================
--- src/network/session.cc bebede070e2de236a45cf064a4f6164ca973b970
+++ src/network/session.cc 68b39e18698a07a5624965e75cf931c533b65db9
@@ -196,15 +196,15 @@ bool session::do_work(transaction_guard
if (msg().size())
{
if (msg()[0] == '!')
- P(F("Received warning from usher: %s") % msg().substr(1));
+ P(F("received warning from usher: %s") % msg().substr(1));
else
- L(FL("Received greeting from usher: %s") % msg().substr(1));
+ L(FL("received greeting from usher: %s") % msg().substr(1));
}
netcmd cmdout(version);
cmdout.write_usher_reply_cmd(utf8(peer_id, origin::internal),
wrapped->usher_reply_data());
write_netcmd(cmdout);
- L(FL("Sent reply."));
+ L(FL("sent reply."));
return true;
}
case usher_reply_cmd:
@@ -280,8 +280,8 @@ bool session::do_work(transaction_guard
"@ WARNING: SERVER IDENTIFICATION HAS CHANGED @\n"
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
"IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY\n"
- "it is also possible that the server key has just been changed\n"
- "remote host sent key %s\n"
+ "It is also possible that the server key has just been changed.\n"
+ "Remote host sent key %s,\n"
"I expected %s\n"
"'%s unset %s %s' overrides this check")
% printable_key_hash
@@ -292,7 +292,7 @@ bool session::do_work(transaction_guard
}
else
{
- P(F("first time connecting to server %s\n"
+ P(F("first time connecting to server %s.\n"
"I'll assume it's really them, but you might want to double-check\n"
"their key's fingerprint: %s")
% get_peer()
============================================================
--- src/network/connection_info.cc 17039acb5aba37282fc972cb05f9cc49f156dc63
+++ src/network/connection_info.cc 91b8c343c905c4a0e47408d38ca1fbdcac5949ec
@@ -426,7 +426,7 @@ netsync_connection_info::setup_from_sync
E(!(include_exclude_given && query_exists), origin::user,
F("include / exclude pattern was given both as part of the URI "
- "and as a separate argument."));
+ "and as a separate argument"));
vector<arg_type> includes, excludes;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.string-sanitization: f48c742334d32bc23a9eb70ad6fbafb8bdc8cff3,
code <=