[Monotone-commits-diffs] Revision 1cdfc523087a9900454e9f0c5d102dd16a81e121

[monotone]

-----------------------------------------------------------------
Revision: 1cdfc523087a9900454e9f0c5d102dd16a81e121
Ancestor: f297a9bf05bbbfe19ddedbe5ee45d6719f5fac4c
Author: address@hidden
Date: 2008-02-07T16:32:55
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        app_state.cc app_state.hh automate.cc cmd_db.cc
        cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.cc cmd_packet.cc cmd_ws_commit.cc key_store.cc
        key_store.hh monotone.cc

ChangeLog: 

* app_state.hh: Don't include key_store.hh.
  (app_state): Remove keys object.
* app_state.cc (app_state constructor): Update.
  (app_state::process_options):  Write keydir_option to the opts structure,
  not the keys object, if appropriate.
  (app_state::write_options): Get the keydir_option from the opts structure.
* key_store.cc (key_store_state): Make key_dir const.  Add ssh_sign_mode
  field.  Replace app_state reference with lua_hooks reference.  Update
  all member functions and key_store member functions to match.
  (key_store::set_key_dir): Delete.
* key_store.hh: Update to match.
* monotone.cc (cpp_main): Do not do anything about the key_dir here.

* cmd_netsync.cc (extract_address, find_key, find_key_if_needed):
  Don't take an app_state argument.
* cmd_packet.cc (packet_db_writer): Similarly.

* automate.cc, cmd_db.cc, cmd_key_cert.cc, cmd_list.cc, cmd_merging.cc
* cmd_netsync.cc, cmd_othervcs.cc, cmd_packet.cc, cmd_ws_commit.cc: 
Include key_store.hh.  Create key_store objects in top-level CMD functions as
necessary, and change uses to match.  Remove some pointless transaction_guards
while we're at it.

txtQ_ZaiW5kom.txt
Description: Diff [f297a9bf05bbbfe19ddedbe5ee45d6719f5fac4c] -> [1cdfc523087a9900454e9f0c5d102dd16a81e121]