[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.string-sanitization: 4e5e9c
|
From: |
code |
|
Subject: |
[Monotone-commits-diffs] net.venge.monotone.string-sanitization: 4e5e9cc671359dea149cbf8e5b3dc7434f0f17eb |
|
Date: |
Tue, 8 Mar 2011 01:35:37 +0100 (CET) |
revision: 4e5e9cc671359dea149cbf8e5b3dc7434f0f17eb
date: 2011-03-07T23:48:38
author: address@hidden
branch: net.venge.monotone.string-sanitization
changelog:
* src/*.cc: quote constant path names and option names as well;
fix punctation / wording here and there
manifest:
format_version "1"
new_manifest [7f2fc42ff3fca83136ff5228b54be323e97682e8]
old_revision [f4059ba00ed84b05a3bafd8ebbc4606b0ea7c9d7]
patch "src/cmd.cc"
from [8e757d3b01172b53644e669d4fb7f0ec097555d1]
to [077158d4777347710668422f6935bca67125b860]
patch "src/cmd_diff_log.cc"
from [6afaa63057f6ed5995113cf312ff99eccc189700]
to [b24dffb0470d057fa1e91ccc5a81627b40252e78]
patch "src/cmd_key_cert.cc"
from [cf519d7c14bbf3bc69dff0a333a7be638c3e047d]
to [a48989eb8c9721a45469b0b1f44b36b1771a2eeb]
patch "src/cmd_merging.cc"
from [31b3be7d444652ec5ac6d937a987c6a65157c313]
to [dc8259075d9d3114590c0d574e5ea6c324b11112]
patch "src/cmd_netsync.cc"
from [3d113ad0ef6d4511f12e75df1e4a597698d06258]
to [9dd8803cef465c834268105a42cc37dc282af520]
patch "src/cmd_othervcs.cc"
from [631506764856b783b32348dc411abc5b174037f5]
to [1b4be44b0e712375f9883e710a833dfac840c9d8]
patch "src/cmd_ws_commit.cc"
from [b701f509d9afc92c35619f8b5eae31c13366e62d]
to [8d8674622bda303746d30bc337c9de4c87ba6fd1]
patch "src/keys.cc"
from [50a2cbba3c93da0f181c2d947089e811974b44aa]
to [052dffb8c31c5fb0f7b0d4593d9d7f6cfe1b21ec]
patch "src/merge_conflict.cc"
from [49713287fe6913386578c2956917569165ebdd84]
to [1c09dc4a20532ce040c429d7fb5ed2a25a199856]
patch "src/migrate_ancestry.cc"
from [7cee409c3b099ef96551cd53a1d16684108fefdb]
to [68b3c5e54c47a50bfcaf49e05a94fd7ec21ec265]
patch "src/migrate_work.cc"
from [656cfec56129df09e8f9f5b3f75ea71bfef0c6e8]
to [e154bf66a9477bc8ad6f7dbb17a38803c54398cc]
patch "src/network/connection_info.cc"
from [2370ac29e52f3bb36eaa8ba6c9339594129d0a42]
to [17039acb5aba37282fc972cb05f9cc49f156dc63]
patch "src/option.cc"
from [fb39681109f980612386ffa8d09300a142deb672]
to [114fe5c490e33f31d186f9ee5ba89b3f6e541fe4]
patch "src/options_list.hh"
from [3b758ede56a0a9fbd435f5eb5d5c1d9dd4418ca0]
to [ae42a6656ba42780c0550abb534e53362c315d23]
patch "src/work.cc"
from [fdfc68740e9492e7fa0c4651e0759de7a231c1c9]
to [fcb7b12aae82a60bf486001bc777912bdd377697]
============================================================
--- src/keys.cc 50a2cbba3c93da0f181c2d947089e811974b44aa
+++ src/keys.cc 052dffb8c31c5fb0f7b0d4593d9d7f6cfe1b21ec
@@ -141,7 +141,7 @@ get_user_key(options const & opts, lua_h
else
{
E(false, origin::user,
- F("a key is required for this operation, but the --key option "
+ F("a key is required for this operation, but the '--key' option "
"was given with an empty argument"));
}
}
============================================================
--- src/work.cc fdfc68740e9492e7fa0c4651e0759de7a231c1c9
+++ src/work.cc fcb7b12aae82a60bf486001bc777912bdd377697
@@ -2203,7 +2203,7 @@ workspace::perform_content_update(roster
if (swt.has_conflicting_paths())
{
E(move_conflicting_paths, origin::user,
- F("re-run this command with --move-conflicting-paths to move "
+ F("re-run this command with '--move-conflicting-paths' to move "
"conflicting paths out of the way."));
move_conflicting_paths_into_bookkeeping(swt.get_conflicting_paths());
moved_conflicting = true;
============================================================
--- src/cmd_diff_log.cc 6afaa63057f6ed5995113cf312ff99eccc189700
+++ src/cmd_diff_log.cc b24dffb0470d057fa1e91ccc5a81627b40252e78
@@ -247,7 +247,7 @@ prepare_diff(app_state & app,
F("more than two revisions given"));
E(!app.opts.reverse || app.opts.revision.size() == 1, origin::user,
- F("--reverse only allowed with exactly one revision"));
+ F("'--reverse' only allowed with exactly one revision"));
if (app.opts.revision.empty())
{
@@ -261,7 +261,7 @@ prepare_diff(app_state & app,
// With no arguments, which parent should we diff against?
E(parents.size() == 1, origin::user,
F("this workspace has more than one parent\n"
- "(specify a revision to diff against with --revision)"));
+ "(specify a revision to diff against with '--revision')"));
old_rid = parent_id(parents.begin());
left_roster = parent_roster(parents.begin());
@@ -426,8 +426,7 @@ CMD(diff, "diff", "di", CMD_REF(informat
{
if (app.opts.external_diff_args_given)
E(app.opts.diff_format == external_diff, origin::user,
- F("--diff-args requires --external\n"
- "try adding --external or removing --diff-args?"));
+ F("'--diff-args' requires '--external'; try adding '--external' or remove '--diff-args'"));
roster_t old_roster, new_roster;
std::string revs;
@@ -641,7 +640,7 @@ log_common (app_state & app,
log_direction direction = log_reverse;
E(last == -1 || next == -1, origin::user,
- F("only one of --last/--next allowed"));
+ F("only one of '--last'/'--next' allowed"));
if (next >= 0)
direction = log_forward;
@@ -658,7 +657,7 @@ log_common (app_state & app,
if (app.opts.from.empty() && app.opts.revision.empty())
{
// only set default --from revs if no --revision selectors were specified
- workspace work(app, F("try passing a --from revision to start at"));
+ workspace work(app, F("try passing a '--from' revision to start at"));
revision_t rev;
work.get_work_rev(rev);
============================================================
--- src/cmd_key_cert.cc cf519d7c14bbf3bc69dff0a333a7be638c3e047d
+++ src/cmd_key_cert.cc a48989eb8c9721a45469b0b1f44b36b1771a2eeb
@@ -411,7 +411,7 @@ CMD(approve, "approve", "", CMD_REF(revi
complete(app.opts, app.lua, project, idx(args, 0)(), r);
guess_branch(app.opts, project, r);
E(!app.opts.branch().empty(), origin::user,
- F("need --branch argument for approval"));
+ F("need '--branch' argument for approval"));
cache_user_key(app.opts, project, keys, app.lua);
project.put_revision_in_branch(keys, r, app.opts.branch);
@@ -437,7 +437,7 @@ CMD(suspend, "suspend", "", CMD_REF(revi
complete(app.opts, app.lua, project, idx(args, 0)(), r);
guess_branch(app.opts, project, r);
E(!app.opts.branch().empty(), origin::user,
- F("need --branch argument to suspend"));
+ F("need '--branch' argument to suspend"));
cache_user_key(app.opts, project, keys, app.lua);
project.suspend_revision_in_branch(keys, r, app.opts.branch);
============================================================
--- src/cmd_merging.cc 31b3be7d444652ec5ac6d937a987c6a65157c313
+++ src/cmd_merging.cc dc8259075d9d3114590c0d574e5ea6c324b11112
@@ -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)
{
@@ -185,7 +185,7 @@ pick_branch_for_update(options & opts, d
else
{
W(F("target revision not in any branch\n"
- "next commit will use branch %s")
+ "next commit will use branch '%s'")
% opts.branch);
}
}
@@ -227,7 +227,7 @@ update(app_state & app,
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")
+ "maybe you want something like '--revision=h:%s'")
% app.opts.branch);
if (candidates.size() != 1)
{
@@ -525,7 +525,7 @@ CMD(merge, "merge", "", CMD_REF(tree), "
throw usage(execid);
E(!app.opts.branch().empty(), origin::user,
- F("please specify a branch, with --branch=BRANCH"));
+ F("please specify a branch, with '--branch=BRANCH'"));
set<revision_id> heads;
project.get_branch_heads(app.opts.branch, heads,
@@ -1118,7 +1118,7 @@ static void get_conflicts_rids(args_vect
{
// get ids from heads
E(!app.opts.branch().empty(), origin::user,
- F("please specify a branch, with --branch=BRANCH"));
+ F("please specify a branch, with '--branch=BRANCH'"));
set<revision_id> heads;
project.get_branch_heads(app.opts.branch, heads,
@@ -1180,14 +1180,14 @@ CMD(store, "store", "", CMD_REF(conflict
N_("Store the conflicts from merging two revisions"),
(F("If no arguments are given, LEFT_REVID and RIGHT_REVID default to the "
"first two heads that would be chosen by the 'merge' command. If "
- "--conflicts-file is not given, '%s' is used.") % bookkeeping_conflicts_file).str(),
+ "'--conflicts-file' is not given, '%s' is used.") % bookkeeping_conflicts_file).str(),
options::opts::branch | options::opts::conflicts_opts)
{
database db(app);
project_t project(db);
revision_id left_id, right_id;
- workspace::require_workspace(F("conflicts file must be under _MTN"));
+ workspace::require_workspace(F("conflicts file must be under '_MTN'"));
get_conflicts_rids(args, db, project, app, left_id, right_id);
@@ -1288,7 +1288,7 @@ CMD(pluck, "pluck", "", CMD_REF(workspac
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")
+ " '%s pluck -r PARENT -r %s'")
% to_rid
% prog_name
% to_rid);
@@ -1459,7 +1459,7 @@ CMD(heads, "heads", "", CMD_REF(tree), "
throw usage(execid);
E(!app.opts.branch().empty(), origin::user,
- F("please specify a branch, with --branch=BRANCH"));
+ F("please specify a branch, with '--branch=BRANCH'"));
database db(app);
project_t project(db);
============================================================
--- src/cmd_netsync.cc 3d113ad0ef6d4511f12e75df1e4a597698d06258
+++ src/cmd_netsync.cc 9dd8803cef465c834268105a42cc37dc282af520
@@ -65,7 +65,7 @@ extract_client_connection_info(options &
if (args.size() == 1)
{
E(!opts.exclude_given, origin::user,
- F("cannot use --exclude in URI mode"));
+ F("cannot use '--exclude' in URI mode"));
netsync_connection_info::setup_from_uri(opts, project.db, lua, type,
idx(args, 0), info);
@@ -741,7 +741,7 @@ CMD_NO_WORKSPACE(clone, "clone", "", CMD
throw usage(execid);
E(url_arg || (host_branch_arg && !app.opts.branch_given), origin::user,
- F("the --branch option is only valid with an URI to clone"));
+ F("the '--branch' option is only valid with an URI to clone"));
// we create the database before anything else, but we
// do not clean newly created databases up if the clone fails
@@ -765,7 +765,7 @@ CMD_NO_WORKSPACE(clone, "clone", "", CMD
if (url_arg)
{
E(!app.opts.exclude_given, origin::user,
- F("cannot use --exclude in URI mode"));
+ F("cannot use '--exclude' in URI mode"));
netsync_connection_info::setup_from_uri(app.opts, project.db, app.lua,
netsync_connection, server, info);
============================================================
--- src/cmd_othervcs.cc 631506764856b783b32348dc411abc5b174037f5
+++ src/cmd_othervcs.cc 1b4be44b0e712375f9883e710a833dfac840c9d8
@@ -53,7 +53,7 @@ CMD(cvs_import, "cvs_import", "", CMD_RE
throw usage(execid);
E(!app.opts.branch().empty(), origin::user,
- F("need base --branch argument for importing"));
+ F("need base '--branch' argument for importing"));
system_path cvsroot(idx(args, 0)(), origin::user);
require_path_is_directory(cvsroot,
============================================================
--- src/cmd_ws_commit.cc b701f509d9afc92c35619f8b5eae31c13366e62d
+++ src/cmd_ws_commit.cc 8d8674622bda303746d30bc337c9de4c87ba6fd1
@@ -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."));
@@ -612,7 +612,7 @@ CMD(disapprove, "disapprove", "", CMD_RE
guess_branch(app.opts, project, child_rev);
E(!app.opts.branch().empty(), origin::user,
- F("need --branch argument for disapproval"));
+ F("need '--branch' argument for disapproval"));
process_commit_message_args(app.opts, log_message_given, log_message,
utf8((FL("disapproval of revision '%s'")
@@ -652,7 +652,7 @@ CMD(disapprove, "disapprove", "", CMD_RE
guess_branch(app.opts, project, child_rev);
E(!app.opts.branch().empty(), origin::user,
- F("need --branch argument for disapproval"));
+ F("need '--branch' argument for disapproval"));
process_commit_message_args(app.opts, log_message_given, log_message,
utf8((FL("disapproval of revisions "
@@ -872,7 +872,7 @@ CMD(pivot_root, "pivot_root", "", CMD_RE
"will be the root directory, and the directory "
"that is currently the root "
"directory will have name PUT_OLD.\n"
- "Use of --bookkeep-only is NOT recommended."),
+ "Use of '--bookkeep-only' is NOT recommended."),
options::opts::bookkeep_only | options::opts::move_conflicting_paths)
{
if (args.size() != 2)
@@ -1021,7 +1021,7 @@ checkout_common(app_state & app,
{
// use branch head revision
E(!app.opts.branch().empty(), origin::user,
- F("use --revision or --branch to specify what to checkout"));
+ F("use '--revision' or '--branch' to specify what to checkout"));
set<revision_id> heads;
project.get_branch_heads(app.opts.branch, heads,
@@ -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;
}
@@ -1567,10 +1567,10 @@ 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 "
+ F("'_MTN/log' is non-empty and log message "
"was specified on command line\n"
- "perhaps move or delete _MTN/log,\n"
- "or remove --message/--message-file from the command line?"));
+ "perhaps move or delete '_MTN/log',\n"
+ "or remove '--message'/'--message-file' from the command line?"));
date_t date;
date_t now = date_t::now();
@@ -1827,7 +1827,7 @@ CMD_NO_WORKSPACE(setup, "setup", "", CMD
throw usage(execid);
E(!app.opts.branch().empty(), origin::user,
- F("need --branch argument for setup"));
+ F("need '--branch' argument for setup"));
string dir;
if (args.size() == 1)
@@ -1900,7 +1900,7 @@ CMD_NO_WORKSPACE(import, "import", "", C
{
// use branch head revision
E(!app.opts.branch().empty(), origin::user,
- F("use --revision or --branch to specify the parent revision for the import"));
+ F("use '--revision' or '--branch' to specify the parent revision for the import"));
set<revision_id> heads;
project.get_branch_heads(app.opts.branch, heads,
============================================================
--- src/migrate_work.cc 656cfec56129df09e8f9f5b3f75ea71bfef0c6e8
+++ src/migrate_work.cc e154bf66a9477bc8ad6f7dbb17a38803c54398cc
@@ -81,7 +81,7 @@ get_workspace_format()
}
if (format == 1)
{
- W(F("_MTN/format should not exist in a format 1 workspace; corrected"));
+ W(F("'_MTN/format' should not exist in a format 1 workspace; corrected"));
delete_file(f_path);
}
}
============================================================
--- src/option.cc fb39681109f980612386ffa8d09300a142deb672
+++ src/option.cc 114fe5c490e33f31d186f9ee5ba89b3f6e541fe4
@@ -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;
}
@@ -342,11 +342,11 @@ getopt(map<string, concrete_option> cons
continue;
if (*j == i->second.shortname)
- err += "\n-" + *j + " (" + i->second.description + ")";
+ err += "\n'-" + *j + "' (" + i->second.description + ")";
else if (*j == i->second.cancelname)
- err += "\n--" + *j + " (" + (F("negation of --%s") % i->second.longname).str() + ")";
+ err += "\n'--" + *j + "' (" + (F("negation of '--%s'") % i->second.longname).str() + ")";
else
- err += "\n--" + *j + " (" + i->second.description + ")";
+ err += "\n'--" + *j + "' (" + i->second.description + ")";
}
E(false, origin::user, i18n_format(err));
============================================================
--- src/options_list.hh 3b758ede56a0a9fbd435f5eb5d5c1d9dd4418ca0
+++ src/options_list.hh ae42a6656ba42780c0550abb534e53362c315d23
@@ -455,11 +455,11 @@ SIMPLE_OPTION(no_merges, "no-merges/merg
gettext_noop("exclude merges when printing logs"))
#ifdef WIN32
-# define NORC_TEXT gettext_noop("do not load %APPDATA%\\monotone\\monotonerc or " \
- "_MTN\\monotonerc lua files")
+# define NORC_TEXT gettext_noop("do not load '%APPDATA%\\monotone\\monotonerc' or " \
+ "'_MTN\\monotonerc' lua files")
#else
-# define NORC_TEXT gettext_noop("do not load ~/.monotone/monotonerc or " \
- "_MTN/monotonerc lua files")
+# define NORC_TEXT gettext_noop("do not load '~/.monotone/monotonerc' or " \
+ "'_MTN/monotonerc' lua files")
#endif
GROUPED_SIMPLE_OPTION(globals, norc, "no-standard-rcfiles/standard-rcfiles", bool, NORC_TEXT)
#undef NORC_TEXT
@@ -467,15 +467,15 @@ GROUPED_SIMPLE_OPTION(globals, nostd, "n
GROUPED_SIMPLE_OPTION(globals, nostd, "no-builtin-rcfile/builtin-rcfile", bool,
gettext_noop("do not load the built-in lua file with the default hooks"))
-DEPRECATE(old_norc, gettext_noop("please use --no-standard-rcfiles instead"), 1.0, 2.0)
+DEPRECATE(old_norc, gettext_noop("please use '--no-standard-rcfiles' instead"), 1.0, 2.0)
OPTION(globals, old_norc, false, "norc",
- gettext_noop("old version of --no-standard-rcfiles"))
+ gettext_noop("old version of '--no-standard-rcfiles'"))
#ifdef option_bodies
{ norc = true; }
#endif
-DEPRECATE(old_nostd, gettext_noop("please use --no-builtin-rcfile instead"), 1.0, 2.0)
+DEPRECATE(old_nostd, gettext_noop("please use '--no-builtin-rcfile' instead"), 1.0, 2.0)
OPTION(globals, old_nostd, false, "nostd",
- gettext_noop("old version of --no-builtin-rcfile"))
+ gettext_noop("old version of '--no-builtin-rcfile'"))
#ifdef option_bodies
{ nostd = true; }
#endif
@@ -491,7 +491,7 @@ OPTION(verbosity, quiet, false, "quiet,q
OPTVAR(verbosity, int, verbosity, 0)
OPTION(verbosity, quiet, false, "quiet,q",
- gettext_noop("decrease verbosity (undo previous -v, then disable informational output, then disable warnings)"))
+ gettext_noop("decrease verbosity (undo previous '-v', then disable informational output, then disable warnings)"))
#ifdef option_bodies
{
--verbosity;
@@ -500,7 +500,7 @@ OPTION(verbosity, verbose, false, "verbo
}
#endif
OPTION(verbosity, verbose, false, "verbose,v",
- gettext_noop("increase verbosity (undo previous -q, and then enable debug output)"))
+ gettext_noop("increase verbosity (undo previous '-q', and then enable debug output)"))
#ifdef option_bodies
{
++verbosity;
@@ -510,7 +510,7 @@ DEPRECATE(debug,
#endif
DEPRECATE(debug,
- gettext_noop("please us -v (or -v -v -v if there are previous -q options)"),
+ gettext_noop("please us '-v' (or '-v -v -v' if there are previous '-q' options)"),
1.0, 2.0)
OPTION(globals, debug, false, "debug",
gettext_noop("print debug log to stderr while running"))
@@ -520,7 +520,7 @@ OPTION(globals, debug, false, "debug",
}
#endif
-DEPRECATE(reallyquiet, gettext_noop("please use -q -q"), 1.0, 2.0)
+DEPRECATE(reallyquiet, gettext_noop("please use '-q -q'"), 1.0, 2.0)
OPTION(verbosity, reallyquiet, false, "reallyquiet",
gettext_noop("suppress warning, verbose, informational and progress messages"))
#ifdef option_bodies
@@ -600,7 +600,7 @@ OPTION(resolve_conflicts_opts, resolve_c
// here, because we haven't found the workspace yet.
E(bookkeeping_path::internal_string_is_bookkeeping_path(utf8(arg, origin::user)),
origin::user,
- F("conflicts file must be under _MTN"));
+ F("conflicts file must be under '_MTN'"));
resolve_conflicts_file = bookkeeping_path(arg, origin::user);
resolve_conflicts = true;
}
@@ -621,7 +621,7 @@ OPTION(conflicts_opts, conflicts_file, t
// here, because we haven't found the workspace yet.
E(bookkeeping_path::internal_string_is_bookkeeping_path(utf8(arg, origin::user)),
origin::user,
- F("conflicts file must be under _MTN"));
+ F("conflicts file must be under '_MTN'"));
conflicts_file = bookkeeping_path(arg, origin::user);
}
#endif
============================================================
--- src/cmd.cc 8e757d3b01172b53644e669d4fb7f0ec097555d1
+++ src/cmd.cc 077158d4777347710668422f6935bca67125b860
@@ -988,7 +988,7 @@ process_commit_message_args(options cons
{
// can't have both a --message and a --message-file ...
E(!opts.message_given || !opts.msgfile_given, origin::user,
- F("--message and --message-file are mutually exclusive"));
+ F("'--message' and '--message-file' are mutually exclusive"));
if (opts.message_given)
{
============================================================
--- src/migrate_ancestry.cc 7cee409c3b099ef96551cd53a1d16684108fefdb
+++ src/migrate_ancestry.cc 68b3c5e54c47a50bfcaf49e05a94fd7ec21ec265
@@ -799,7 +799,7 @@ anc_graph::construct_revisions_from_ance
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"
- "(if you just want it to go away, see the switch --drop-attr, but\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/merge_conflict.cc 49713287fe6913386578c2956917569165ebdd84
+++ src/merge_conflict.cc 1c09dc4a20532ce040c429d7fb5ed2a25a199856
@@ -699,7 +699,7 @@ roster_merge_result::report_invalid_name
if (basic_io)
st.push_str_pair(syms::conflict, syms::invalid_name);
else
- P(F("conflict: invalid name _MTN in root directory"));
+ P(F("conflict: invalid name '_MTN' in root directory"));
if (left_roster.root()->self == conflict.parent_name.first)
{
============================================================
--- src/network/connection_info.cc 2370ac29e52f3bb36eaa8ba6c9339594129d0a42
+++ src/network/connection_info.cc 17039acb5aba37282fc972cb05f9cc49f156dc63
@@ -530,8 +530,8 @@ 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 "
- "in combination with --stdio"));
+ W(F("The '--no-transport-auth' option is usually only used "
+ "in combination with '--stdio'"));
}
// Local Variables:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.string-sanitization: 4e5e9cc671359dea149cbf8e5b3dc7434f0f17eb,
code <=