monotone

monotone Commit Details

Date:2007-03-12 05:31:08 (12 years 3 months ago)
Author:Derek Scherger
Branch:net.venge.monotone.experiment.commands-with-dashes
Commit:8d0f0258404020d0f464d2888dcf7ab66dcd9d09
Parents: e7a6d11dcdd4fa4845f9e4d7fb7d2a84ca0f05a6
Message: * replace underscores with dashes in various embedded

command names and messages
Changes:
Mcmd_merging.cc (1 diff)
Mcmd_othervcs.cc (1 diff)
Mdatabase.cc (2 diffs)
Mdatabase.hh (2 diffs)
Mdatabase_check.cc (1 diff)
Mrcs_import.cc (2 diffs)
Mrevision.cc (1 diff)
Mschema_migration.cc (1 diff)
Mwork_migration.cc (1 diff)

File differences

cmd_merging.cc
437437
438438
439439
440
440
441441
442442
443443
throw usage(name);
vector<utf8> a = args;
a.push_back(utf8());
process(app, "merge_into_dir", a);
process(app, "merge-into-dir", a);
}
CMD(merge_into_dir, N_("tree"), N_("SOURCE-BRANCH DEST-BRANCH DIR"),
cmd_othervcs.cc
1515
1616
1717
18
18
1919
2020
2121
CMD(rcs_import, N_("debug"), N_("RCSFILE..."),
N_("parse versions in RCS files\n"
"this command doesn't reconstruct or import revisions."
"you probably want cvs_import"),
"you probably want cvs-import"),
options::opts::branch)
{
if (args.size() < 1)
database.cc
175175
176176
177177
178
178
179179
180180
181181
......
21012101
21022102
21032103
2104
2104
21052105
21062106
21072107
// Do we need to regenerate cached data?
E(!have_revisions || (have_rosters && have_heights),
F("database %s lacks some cached data\n"
"run '%s db regenerate_caches' to restore use of this database")
"run '%s db regenerate-caches' to restore use of this database")
% filename % ui.prog_name);
}
else
}
/// Deletes one revision from the local database.
/// @see kill_rev_locally
/// @see kill-rev-locally
void
database::delete_existing_rev_and_certs(revision_id const & rid)
{
database.hh
539539
540540
541541
542
542
543543
544
544
545545
546
546
547547
548548
549549
......
583583
584584
585585
586
586
587587
588588
589589
void version(std::ostream &);
void migrate();
void test_migration_step(std::string const &);
// for kill_rev_locally:
// for kill-rev-locally:
void delete_existing_rev_and_certs(revision_id const & rid);
// for kill_branch_certs_locally:
// for kill-branch-certs-locally:
void delete_branch_named(cert_value const & branch);
// for kill_tag_locally:
// for kill-tag-locally:
void delete_tag_named(cert_value const & tag);
// misc
void put_height_for_revision(revision_id const & new_id,
revision_t const & rev);
// for regenerate_rosters
// for regenerate-caches
void delete_existing_rosters();
void put_roster_for_revision(revision_id const & new_id,
revision_t const & rev);
database_check.cc
248248
249249
250250
251
251
252252
253253
254254
continue;
// skip marking check on unreferenced rosters -- they're left by
// kill_rev_locally, and not expected to have everything they
// kill-rev-locally, and not expected to have everything they
// reference existing
if (!i->second.revision_refs)
continue;
rcs_import.cc
12071207
12081208
12091209
1210
1210
12111211
12121212
12131213
......
12981298
12991299
13001300
1301
1301
13021302
13031303
13041304
{
N(!directory_exists(cvsroot / "CVSROOT"),
F("%s appears to be a CVS repository root directory\n"
"try importing a module instead, with 'cvs_import %s/<module_name>")
"try importing a module instead, with 'cvs-import %s/<module_name>")
% cvsroot % cvsroot);
{
if (!branch.live_at_beginning.empty())
{
cvs_author synthetic_author =
cvs.author_interner.intern("cvs_import");
cvs.author_interner.intern("cvs-import");
cvs_changelog synthetic_cl =
cvs.changelog_interner.intern("beginning of branch "
revision.cc
17361736
17371737
17381738
1739
1739
17401740
17411741
17421742
}
// This is a special function solely for the use of regenerate_caches -- it
// This is a special function solely for the use of regenerate-caches -- it
// must work even when caches (especially, the height cache!) do not exist.
// For all other purposes, use toposort above.
static void
schema_migration.cc
999999
10001000
10011001
1002
1002
10031003
10041004
10051005
break;
case upgrade_regen_caches:
P(F("NOTE: this upgrade cleared monotone's caches\n"
"you should now run '%s db regenerate_caches'")
"you should now run '%s db regenerate-caches'")
% ui.prog_name);
break;
case upgrade_none:
work_migration.cc
124124
125125
126126
127
127
128128
129129
130130
E(format >= current_workspace_format,
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"
"'%s migrate-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 % ui.prog_name

Archive Download the corresponding diff file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status