# # # patch "cmd_db.cc" # from [22ac874fd038665a578f75ce860712bfc4a95114] # to [d000c1a9e64fec3d3cef0906b213fb79c7ec228b] # # patch "cmd_diff_log.cc" # from [fbcf1046e6789577e9d8f954236a8fdf657342f4] # to [e271eade742d90477ce1659b6f1b529d3344a154] # # patch "cmd_key_cert.cc" # from [a38632db6e62dc38a7b7eb5daa84912260ebf81e] # to [1d33aed472b1d837b1dd26be4c37bf05a049789c] # # patch "cmd_list.cc" # from [c0e7a014a3a139f198b2b16a05a63c5ae0a6ec1d] # to [0ffb32b2c7d7d227341da5dc786ced87a80aa84c] # # patch "cmd_merging.cc" # from [92b9d75fbebbdd0ec4b1ef0f53d83ec6273f021e] # to [754eaa4227908dcdafc4465ae67ae8500a070ff9] # # patch "cmd_netsync.cc" # from [44da67e276c89c807db24610ed3a0b2c3558d471] # to [d47b6326a29bcaba6e63ce2769649e92faa032b0] # # patch "cmd_othervcs.cc" # from [ac8739443a005bac29fa25135c49dcee8f5a3b08] # to [530af842d8bd686986b3b8b5f44c4163c81a1688] # # patch "cmd_ws_commit.cc" # from [e4c0dc4781e352c7fee257a0e15ca57214c8697d] # to [0cad2978898b45193f1985b4286f59f2e1542452] # # patch "commands.cc" # from [7c1d8a3d567bb3f9ffd826800e73f8c851a98e92] # to [096e7d94296b4fbd9b320bfd4922a58b843748b0] # ============================================================ --- cmd_db.cc 22ac874fd038665a578f75ce860712bfc4a95114 +++ cmd_db.cc d000c1a9e64fec3d3cef0906b213fb79c7ec228b @@ -208,7 +208,7 @@ CMD(test_migration_step, hidden_group(), CMD(test_migration_step, hidden_group(), "SCHEMA", "Runs one step of migration on the specified database", - "run one step of migration - from SCHEMA to its successor -\n" + "run one step of migration - from SCHEMA to its successor - " "on the specified database", options::opts::none) { if (args.size() != 1) ============================================================ --- cmd_diff_log.cc fbcf1046e6789577e9d8f954236a8fdf657342f4 +++ cmd_diff_log.cc e271eade742d90477ce1659b6f1b529d3344a154 @@ -471,8 +471,8 @@ CMD(diff, N_("informative"), N_("[PATH]. CMD(diff, N_("informative"), N_("[PATH]..."), N_("Shows current differences"), N_("show current diffs on stdout.\n" - "If one revision is given, the diff between the workspace and\n" - "that revision is shown. If two revisions are given, the diff between\n" + "If one revision is given, the diff between the workspace and " + "that revision is shown. If two revisions are given, the diff between " "them is given. If no format is specified, unified is used by default."), options::opts::revision | options::opts::depth | options::opts::exclude | options::opts::diff_options) @@ -600,7 +600,7 @@ CMD(log, N_("informative"), N_("[FILE] . CMD(log, N_("informative"), N_("[FILE] ..."), N_("Prints history in reverse order"), - N_("print history in reverse order (filtering by 'FILE'). If one or more\n" + N_("print history in reverse order (filtering by 'FILE'). If one or more " "revisions are given, use them as a starting point."), options::opts::last | options::opts::next | options::opts::from | options::opts::to ============================================================ --- cmd_key_cert.cc a38632db6e62dc38a7b7eb5daa84912260ebf81e +++ cmd_key_cert.cc 1d33aed472b1d837b1dd26be4c37bf05a049789c @@ -214,7 +214,7 @@ CMD(trusted, N_("key and cert"), CMD(trusted, N_("key and cert"), N_("REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]"), N_("Tests whether a hypothetical certificate would be trusted"), - N_("test whether a hypothetical cert would be trusted\n" + N_("test whether a hypothetical cert would be trusted " "by current settings"), options::opts::none) { ============================================================ --- cmd_list.cc c0e7a014a3a139f198b2b16a05a63c5ae0a6ec1d +++ cmd_list.cc 0ffb32b2c7d7d227341da5dc786ced87a80aa84c @@ -490,8 +490,8 @@ CMD(list, N_("informative"), "missing\n" "changed"), N_("Shows database objects"), - N_("show database objects, or the current workspace manifest, \n" - "or known, unknown, intentionally ignored, missing, or \n" + N_("show database objects, or the current workspace manifest, " + "or known, unknown, intentionally ignored, missing, or " "changed-state files"), options::opts::depth | options::opts::exclude) { ============================================================ --- cmd_merging.cc 92b9d75fbebbdd0ec4b1ef0f53d83ec6273f021e +++ cmd_merging.cc 754eaa4227908dcdafc4465ae67ae8500a070ff9 @@ -129,9 +129,9 @@ CMD(update, N_("workspace"), "", CMD(update, N_("workspace"), "", N_("Updates the workspace"), N_("update workspace.\n" - "This command modifies your workspace to be based off of a\n" - "different revision, preserving uncommitted changes as it does so.\n" - "If a revision is given, update the workspace to that revision.\n" + "This command modifies your workspace to be based off of a " + "different revision, preserving uncommitted changes as it does so. " + "If a revision is given, update the workspace to that revision. " "If not, update the workspace to the head of the branch."), options::opts::branch | options::opts::revision) { @@ -765,17 +765,15 @@ CMD(pluck, N_("workspace"), N_("[-r FROM CMD(pluck, N_("workspace"), N_("[-r FROM] -r TO [PATH...]"), N_("Applies changes made at arbitrary places in history"), - N_("Apply changes made at arbitrary places in history to current workspace.\n" - "This command takes changes made at any point in history, and\n" - "edits your current workspace to include those changes. The end result\n" - "is identical to 'mtn diff -r FROM -r TO | patch -p0', except that\n" - "this command uses monotone's merger, and thus intelligently handles\n" + N_("Apply changes made at arbitrary places in history to current workspace. " + "This command takes changes made at any point in history, and " + "edits your current workspace to include those changes. The end result " + "is identical to 'mtn diff -r FROM -r TO | patch -p0', except that " + "this command uses monotone's merger, and thus intelligently handles " "renames, conflicts, and so on.\n" - "\n" - "If one revision is given, applies the changes made in that revision\n" + "If one revision is given, applies the changes made in that revision " "compared to its parent.\n" - "\n" - "If two revisions are given, applies the changes made to get from the\n" + "If two revisions are given, applies the changes made to get from the " "first revision to the second."), options::opts::revision | options::opts::depth | options::opts::exclude) { ============================================================ --- cmd_netsync.cc 44da67e276c89c807db24610ed3a0b2c3558d471 +++ cmd_netsync.cc d47b6326a29bcaba6e63ce2769649e92faa032b0 @@ -200,8 +200,8 @@ CMD(clone, N_("network"), N_("ADDRESS[:P CMD(clone, N_("network"), N_("ADDRESS[:PORTNUMBER] [DIRECTORY]"), N_("Checks out a revision from remote a database into a directory"), N_("check out a revision from remote database into directory.\n" - "If a revision is given, that's the one that will be checked out.\n" - "Otherwise, it will be the head of the branch supplied.\n" + "If a revision is given, that's the one that will be checked out. " + "Otherwise, it will be the head of the branch supplied. " "If no directory is given, the branch name will be used as directory"), options::opts::exclude | options::opts::branch | options::opts::revision) { ============================================================ --- cmd_othervcs.cc ac8739443a005bac29fa25135c49dcee8f5a3b08 +++ cmd_othervcs.cc 530af842d8bd686986b3b8b5f44c4163c81a1688 @@ -16,7 +16,7 @@ CMD(rcs_import, N_("debug"), N_("RCSFILE CMD(rcs_import, N_("debug"), N_("RCSFILE..."), N_("Parses versions in RCS files"), N_("parse versions in RCS files\n" - "this command doesn't reconstruct or import revisions." + "this command doesn't reconstruct or import revisions. " "you probably want cvs_import"), options::opts::branch) { ============================================================ --- cmd_ws_commit.cc e4c0dc4781e352c7fee257a0e15ca57214c8697d +++ cmd_ws_commit.cc 0cad2978898b45193f1985b4286f59f2e1542452 @@ -403,9 +403,9 @@ CMD(pivot_root, N_("workspace"), N_("NEW N_("Renames the root directory"), N_("rename the root directory\n" "after this command, the directory that currently " - "has the name NEW_ROOT\n" + "has the name NEW_ROOT " "will be the root directory, and the directory " - "that is currently the root\n" + "that is currently the root " "directory will have name PUT_OLD.\n" "Use of --bookkeep-only is NOT recommended."), options::opts::bookkeep_only) @@ -496,8 +496,8 @@ CMD(checkout, N_("tree"), N_("[DIRECTORY CMD(checkout, N_("tree"), N_("[DIRECTORY]"), N_("Checks out a revision from the database into a directory"), N_("check out a revision from database into directory.\n" - "If a revision is given, that's the one that will be checked out.\n" - "Otherwise, it will be the head of the branch (given or implicit).\n" + "If a revision is given, that's the one that will be checked out. " + "Otherwise, it will be the head of the branch (given or implicit). " "If no directory is given, the branch name will be used as directory"), options::opts::branch | options::opts::revision) { ============================================================ --- commands.cc 7c1d8a3d567bb3f9ffd826800e73f8c851a98e92 +++ commands.cc 096e7d94296b4fbd9b320bfd4922a58b843748b0 @@ -352,7 +352,10 @@ namespace commands split_into_lines(i->second->desc(), lines); for (vector::const_iterator j = lines.begin(); j != lines.end(); ++j) - out << " " << *j << std::endl; + { + describe("", *j, 4, out); + out << std::endl; + } } void explain_usage(string const & cmd, ostream & out) @@ -373,6 +376,7 @@ namespace commands out << std::endl; out << "For information on a specific command, type " "'mtn help '." << std::endl; + out << std::endl; } else { @@ -384,9 +388,8 @@ namespace commands "'mtn help '." << std::endl; out << "For information on a specific command, type " "'mtn help '." << std::endl; + out << std::endl; } - - out << std::endl; } int process(app_state & app, string const & cmd, vector const & args)