[Monotone-commits-diffs] Revision 30f4ce255c3f9fcc4a3a8a74a8669736be630c69

[monotone]

-----------------------------------------------------------------
Revision: 30f4ce255c3f9fcc4a3a8a74a8669736be630c69
Ancestor: 9c8640a620773ca560c6e39f53cb996f12d84cf0
Author: address@hidden
Date: 2008-02-08T21:07:24
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        app_state.cc app_state.hh asciik.cc automate.cc cmd.hh
        cmd_automate.cc cmd_db.cc cmd_diff_log.cc cmd_files.cc
        cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.cc cmd_packet.cc cmd_ws_commit.cc database.cc
        database.hh key_store.hh monotone.cc

ChangeLog: 

* app_state.hh: Don't include database.hh.
  (app_state): Remove database member.  Reorder member functions a little.
* app_state.cc (app_state constructor): Update.
  (app_state::process_options):  Copy database_option to opts.dbname.
  (app_state::write_options): Get database_option from opts.dbname.
  (app_state::set_database): Delete.
* cmd.hh (CMD_REQUIRES_DATABASE): Delete.
* database.cc: Include app_state.hh again.
  (database_impl): Filename is const, constructor is explicit, and constructor
  takes a system_path, used to initialize filename.
  (database): Constructor takes an app_state argument, not a lua_hooks
  argument, and passes app.opts.dbname to database_impl constructor.
  (database::set_filename): Delete.
* database.hh: Make database constructor explicit.  Update for above.
* key_store.hh: Make key_store constructor explicit.
* monotone.cc (cpp_main): Do not call app.db.set_filename.

* asciik.cc, automate.cc, cmd_automate.cc, cmd_db.cc, cmd_diff_log.cc
* cmd_files.cc, cmd_key_cert.cc, cmd_list.cc, cmd_merging.cc, cmd_netsync.cc
* cmd_othervcs.cc, cmd_packet.cc, cmd_ws_commit.cc: Explicitly declare a
  database object as needed.  Do not refer to app.db.
* cmd_netsync.cc (clone): Restructure for removal of set_database.

txtVjsAL0jaYU.txt
Description: Diff [9c8640a620773ca560c6e39f53cb996f12d84cf0] -> [30f4ce255c3f9fcc4a3a8a74a8669736be630c69]