[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.issue-130: c50afc0590bdcef1
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone.issue-130: c50afc0590bdcef1d94c795b5a8bd9b561b51280 |
Date: |
Tue, 18 Jan 2011 07:44:49 GMT |
revision: c50afc0590bdcef1d94c795b5a8bd9b561b51280
date: 2011-01-18T07:12:14
author: Richard Levitte <address@hidden>
branch: net.venge.monotone.issue-130
changelog:
Move dboptions inside class database
manifest:
format_version "1"
new_manifest [139b86b0f69fa755e9cc0312e190a092ffc01668]
old_revision [6c492103b13a3101819657fc2186916147ab7402]
patch "cmd_key_cert.cc"
from [b42d0dc4539e6546b11db50beff0f47c05110ba0]
to [071b47b387bf2b8bc33839765e8056f378bc3d81]
patch "cmd_list.cc"
from [ddb43128ad3db1aae37571885e28223d76274bd5]
to [d5f1d76cb76151d303cda19a974fe5c86f806d70]
patch "cmd_packet.cc"
from [d0ade7e96bb5ab2c5f1805fa0c3b658229fe15b5]
to [672156d0fefaa0b7ec02795871573a0e4057b89b]
patch "database.cc"
from [d0af7d0ee418f25dbd461dd55b0fd1e7ef13e352]
to [194048deac195b53eff970e1c84768c1b4007dec]
patch "database.hh"
from [9a9eabf2983afcf7b3ac07c7cbdff0998dd45f3b]
to [66798497f77bc1010b7e5850d2c406eaf1010b2e]
============================================================
--- database.cc d0af7d0ee418f25dbd461dd55b0fd1e7ef13e352
+++ database.cc 194048deac195b53eff970e1c84768c1b4007dec
@@ -509,13 +509,13 @@ database_cache database::dbcache;
database_cache database::dbcache;
-database::database(app_state & app, dboptions d)
+database::database(app_state & app, database::dboptions d)
: opts(app.opts), lua(app.lua), dbopts(d)
{
init();
}
-database::database(options const & o, lua_hooks & l, dboptions d)
+database::database(options const & o, lua_hooks & l, database::dboptions d)
: opts(o), lua(l), dbopts(d)
{
init();
@@ -4925,14 +4925,14 @@ database_path_helper::get_database_path(
void
database_path_helper::get_database_path(options const & opts,
system_path & path,
- dboptions dbopts)
+ database::dboptions dbopts)
{
if (!opts.dbname_given ||
(opts.dbname.as_internal().empty() &&
opts.dbname_alias.empty() &&
opts.dbname_type != memory_db))
{
- if (dbopts == maybe_unspecified)
+ if (dbopts == database::maybe_unspecified)
{
L(FL("no database option given or options empty"));
return;
============================================================
--- database.hh 9a9eabf2983afcf7b3ac07c7cbdff0998dd45f3b
+++ database.hh 66798497f77bc1010b7e5850d2c406eaf1010b2e
@@ -81,16 +81,15 @@ typedef std::map<system_path, boost::sha
typedef std::map<system_path, boost::shared_ptr<database_impl> > database_cache;
-// database options
-typedef enum { none, maybe_unspecified } dboptions;
-
class database
{
//
// --== Opening the database and schema checking ==--
//
public:
-public:
+ // database options
+ typedef enum { none, maybe_unspecified } dboptions;
+
explicit database(app_state & app, dboptions dbopts = none);
database(options const & o, lua_hooks & l, dboptions dbopts = none);
~database();
@@ -613,7 +612,7 @@ public:
database_path_helper(lua_hooks & l) : lua(l) {}
void get_database_path(options const & opts, system_path & path,
- dboptions dbopts = none);
+ database::dboptions dbopts = database::none);
void maybe_set_default_alias(options & opts);
============================================================
--- cmd_key_cert.cc b42d0dc4539e6546b11db50beff0f47c05110ba0
+++ cmd_key_cert.cc 071b47b387bf2b8bc33839765e8056f378bc3d81
@@ -47,7 +47,7 @@ CMD(genkey, "genkey", "", CMD_REF(key_an
"",
options::opts::force_duplicate_key)
{
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
if (args.size() != 1)
@@ -80,7 +80,7 @@ CMD_AUTOMATE(generate_key, N_("KEY_NAME
E(args.size() == 2, origin::user,
F("wrong argument count"));
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
key_name name = typecast_vocab<key_name>(idx(args, 0));
@@ -124,7 +124,7 @@ dropkey_common(app_state & app,
args_vector args,
bool drop_private)
{
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
bool key_deleted = false;
bool checked_db = false;
@@ -198,7 +198,7 @@ CMD(passphrase, "passphrase", "", CMD_RE
throw usage(execid);
key_store keys(app);
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
project_t project(db);
key_identity_info identity;
@@ -216,7 +216,7 @@ CMD(ssh_agent_export, "ssh_agent_export"
"",
options::opts::none)
{
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
project_t project(db);
@@ -244,7 +244,7 @@ CMD(ssh_agent_add, "ssh_agent_add", "",
"",
options::opts::none)
{
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
project_t project(db);
============================================================
--- cmd_list.cc ddb43128ad3db1aae37571885e28223d76274bd5
+++ cmd_list.cc d5f1d76cb76151d303cda19a974fe5c86f806d70
@@ -359,7 +359,7 @@ CMD(keys, "keys", "", CMD_REF(list), "[P
if (args.size() > 1)
throw usage(execid);
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
project_t project(db);
@@ -961,7 +961,7 @@ CMD_AUTOMATE(keys, "",
E(args.empty(), origin::user,
F("no arguments needed"));
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
project_t project(db);
============================================================
--- cmd_packet.cc d0ade7e96bb5ab2c5f1805fa0c3b658229fe15b5
+++ cmd_packet.cc 672156d0fefaa0b7ec02795871573a0e4057b89b
@@ -85,7 +85,7 @@ pubkey_common(app_state & app,
args_vector args,
std::ostream & output)
{
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
project_t project(db);
@@ -141,7 +141,7 @@ CMD(privkey, "privkey", "", CMD_REF(pack
"",
options::opts::none)
{
- database db(app, maybe_unspecified);
+ database db(app, database::maybe_unspecified);
key_store keys(app);
project_t project(db);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.issue-130: c50afc0590bdcef1d94c795b5a8bd9b561b51280,
code <=