# # # patch "automate.cc" # from [6332b775a3ffcf6161e5e991539fb1d02675299e] # to [f5c973a73801431eadab87b4dda89088a3e183c0] # # patch "cmd_db.cc" # from [b67e68899c1806c94e0b04b7a81ba70b3b3d1f50] # to [0dd4d27b91633faabd93439e5f8625d1a5836c74] # # patch "cmd_diff_log.cc" # from [34f7387970c52d236c10a624d55f951dbaea5a16] # to [8c086adea801af8ce405820e7cc6f4ce0a5ee1ad] # # patch "cmd_files.cc" # from [ef7694dc67de6546d6de36d3836de1ec1486e6fa] # to [c78ce4cc4d055ede49ec9888d075412a6d690a71] # # patch "cmd_list.cc" # from [ed559ca16f4350b0e8a3fde62db6ca5dec2d67f5] # to [7359403bc6f21ef9d4f3168793f4dc3dcb14ed46] # # patch "cmd_merging.cc" # from [260a66f036397e43af27f23c28320fb2a27465ab] # to [a18acbfbc5052f33d0745ae21b199c9169359cae] # # patch "cmd_netsync.cc" # from [83237c7973165292c7a530899e2f8d3e8970593b] # to [1cf95f921a2a961388758d636f294e0a66762bd7] # # patch "cmd_ws_commit.cc" # from [2a2e01c1eb48728431beb9957fcfd77648bb2766] # to [69be59629f85dd02fd83e30102eb9b47d16e3e3e] # ============================================================ --- automate.cc 6332b775a3ffcf6161e5e991539fb1d02675299e +++ automate.cc f5c973a73801431eadab87b4dda89088a3e183c0 @@ -116,7 +116,7 @@ CMD_AUTOMATE(ancestors, N_("REV1 [REV2 [ for (args_vector::const_iterator i = args.begin(); i != args.end(); ++i) { revision_id rid((*i)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); frontier.push_back(rid); } while (!frontier.empty()) @@ -168,7 +168,7 @@ CMD_AUTOMATE(descendents, N_("REV1 [REV2 for (args_vector::const_iterator i = args.begin(); i != args.end(); ++i) { revision_id rid((*i)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); frontier.push_back(rid); } while (!frontier.empty()) @@ -217,7 +217,7 @@ CMD_AUTOMATE(erase_ancestors, N_("[REV1 for (args_vector::const_iterator i = args.begin(); i != args.end(); ++i) { revision_id rid((*i)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); revs.insert(rid); } erase_ancestors(revs, db); @@ -246,7 +246,7 @@ CMD_AUTOMATE(toposort, N_("[REV1 [REV2 [ for (args_vector::const_iterator i = args.begin(); i != args.end(); ++i) { revision_id rid((*i)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); revs.insert(rid); } vector sorted; @@ -287,11 +287,11 @@ CMD_AUTOMATE(ancestry_difference, N_("NE set bs; args_vector::const_iterator i = args.begin(); a = revision_id((*i)()); - N(db.revision_exists(a), F("No such revision %s") % a); + N(db.revision_exists(a), F("no such revision '%s'") % a); for (++i; i != args.end(); ++i) { revision_id b((*i)()); - N(db.revision_exists(b), F("No such revision %s") % b); + N(db.revision_exists(b), F("no such revision '%s'") % b); bs.insert(b); } set ancestors; @@ -384,7 +384,7 @@ CMD_AUTOMATE(parents, N_("REV"), CMD_REQUIRES_DATABASE(app); revision_id rid(idx(args, 0)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); set parents; db.get_revision_parents(rid, parents); for (set::const_iterator i = parents.begin(); @@ -414,7 +414,7 @@ CMD_AUTOMATE(children, N_("REV"), CMD_REQUIRES_DATABASE(app); revision_id rid(idx(args, 0)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); set children; db.get_revision_children(rid, children); for (set::const_iterator i = children.begin(); @@ -1397,7 +1397,7 @@ CMD_AUTOMATE(common_ancestors, N_("REV1 for (args_vector::const_iterator i = args.begin(); i != args.end(); ++i) { revision_id rid((*i)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); ancestors.clear(); ancestors.insert(rid); frontier.push_back(rid); ============================================================ --- cmd_db.cc b67e68899c1806c94e0b04b7a81ba70b3b3d1f50 +++ cmd_db.cc 0dd4d27b91633faabd93439e5f8625d1a5836c74 @@ -123,8 +123,6 @@ CMD(db_kill_rev_locally, "kill_rev_local revision_id revid; complete(app, idx(args, 0)(), revid); - N(app.db.revision_exists(revid), - F("no such revision '%s'") % revid); // Check that the revision does not have any children std::set children; @@ -398,7 +396,7 @@ CMD_HIDDEN(rev_height, "rev_height", "", if (args.size() != 1) throw usage(execid); revision_id rid(idx(args, 0)()); - N(app.db.revision_exists(rid), F("No such revision %s") % rid); + N(app.db.revision_exists(rid), F("no such revision '%s'") % rid); rev_height height; app.db.get_rev_height(rid, height); P(F("cached height: %s") % height); ============================================================ --- cmd_diff_log.cc 34f7387970c52d236c10a624d55f951dbaea5a16 +++ cmd_diff_log.cc 8c086adea801af8ce405820e7cc6f4ce0a5ee1ad @@ -397,8 +397,6 @@ prepare_diff(cset & included, revision_id r_old_id; complete(app, idx(app.opts.revision_selectors, 0)(), r_old_id); - N(app.db.revision_exists(r_old_id), - F("no such revision '%s'") % r_old_id); app.db.get_roster(r_old_id, old_roster); app.work.get_current_roster_shape(new_roster, nis); @@ -427,11 +425,6 @@ prepare_diff(cset & included, complete(app, idx(app.opts.revision_selectors, 0)(), r_old_id); complete(app, idx(app.opts.revision_selectors, 1)(), r_new_id); - N(app.db.revision_exists(r_old_id), - F("no such revision '%s'") % r_old_id); - N(app.db.revision_exists(r_new_id), - F("no such revision '%s'") % r_new_id); - app.db.get_roster(r_old_id, old_roster); app.db.get_roster(r_new_id, new_roster); ============================================================ --- cmd_files.cc ef7694dc67de6546d6de36d3836de1ec1486e6fa +++ cmd_files.cc c78ce4cc4d055ede49ec9888d075412a6d690a71 @@ -169,11 +169,6 @@ CMD(annotate, "annotate", "", CMD_REF(in else { complete(app, idx(app.opts.revision_selectors, 0)(), rid); - N(!null_id(rid), - F("no revision for file '%s' in database") % file); - N(app.db.revision_exists(rid), - F("no such revision '%s'") % rid); - app.db.get_roster(rid, roster); } ============================================================ --- cmd_list.cc ed559ca16f4350b0e8a3fde62db6ca5dec2d67f5 +++ cmd_list.cc 7359403bc6f21ef9d4f3168793f4dc3dcb14ed46 @@ -676,7 +676,7 @@ CMD_AUTOMATE(certs, N_("REV"), transaction_guard guard(db, false); revision_id rid(idx(args, 0)()); - N(db.revision_exists(rid), F("No such revision %s") % rid); + N(db.revision_exists(rid), F("no such revision '%s'") % rid); hexenc ident(rid.inner()); vector< revision > ts; ============================================================ --- cmd_merging.cc 260a66f036397e43af27f23c28320fb2a27465ab +++ cmd_merging.cc a18acbfbc5052f33d0745ae21b199c9169359cae @@ -191,8 +191,6 @@ CMD(update, "update", "", CMD_REF(worksp else { complete(app, app.opts.revision_selectors[0](), chosen_rid); - N(app.db.revision_exists(chosen_rid), - F("no such revision '%s'") % chosen_rid); } I(!null_id(chosen_rid)); @@ -857,8 +855,6 @@ CMD(pluck, "pluck", "", CMD_REF(workspac if (app.opts.revision_selectors.size() == 1) { complete(app, idx(app.opts.revision_selectors, 0)(), to_rid); - N(app.db.revision_exists(to_rid), - F("no such revision '%s'") % to_rid); std::set parents; app.db.get_revision_parents(to_rid, parents); N(parents.size() == 1, @@ -872,11 +868,7 @@ CMD(pluck, "pluck", "", CMD_REF(workspac else if (app.opts.revision_selectors.size() == 2) { complete(app, idx(app.opts.revision_selectors, 0)(), from_rid); - N(app.db.revision_exists(from_rid), - F("no such revision '%s'") % from_rid); complete(app, idx(app.opts.revision_selectors, 1)(), to_rid); - N(app.db.revision_exists(to_rid), - F("no such revision '%s'") % to_rid); } else throw usage(execid); ============================================================ --- cmd_netsync.cc 83237c7973165292c7a530899e2f8d3e8970593b +++ cmd_netsync.cc 1cf95f921a2a961388758d636f294e0a66762bd7 @@ -360,11 +360,8 @@ CMD(clone, "clone", "", CMD_REF(network) { // use specified revision complete(app, idx(app.opts.revision_selectors, 0)(), ident); - N(app.db.revision_exists(ident), - F("no such revision '%s'") % ident); guess_branch(ident, app.db, app.get_project()); - I(!app.opts.branchname().empty()); N(app.get_project().revision_is_in_branch(ident, app.opts.branchname), ============================================================ --- cmd_ws_commit.cc 2a2e01c1eb48728431beb9957fcfd77648bb2766 +++ cmd_ws_commit.cc 69be59629f85dd02fd83e30102eb9b47d16e3e3e @@ -606,10 +606,7 @@ CMD(checkout, "checkout", "co", CMD_REF( else if (app.opts.revision_selectors.size() == 1) { // use specified revision - complete(app, - idx(app.opts.revision_selectors, 0)(), revid); - N(app.db.revision_exists(revid), - F("no such revision '%s'") % revid); + complete(app, idx(app.opts.revision_selectors, 0)(), revid); guess_branch(revid, app.db, app.get_project()); @@ -1327,8 +1324,6 @@ CMD_NO_WORKSPACE(import, "import", "", C { // use specified revision complete(app, idx(app.opts.revision_selectors, 0)(), ident); - N(app.db.revision_exists(ident), - F("no such revision '%s'") % ident); guess_branch(ident, app.db, app.get_project());