[Monotone-commits-diffs] Revision 43df0ce4206510d364c401d4dd17db17b9a389b7

[monotone]

-----------------------------------------------------------------
Revision: 43df0ce4206510d364c401d4dd17db17b9a389b7
Ancestor: 2f16e5f5c6d2fb4bcf3ff37764b21c8a70254e5d
Author: address@hidden
Date: 2008-02-03T22:09:00
Branch: net.venge.monotone.experiment.encapsulation

Deleted entries:
        tests/database_is_closed_on_signal_exit
        tests/database_is_closed_on_signal_exit/__driver__.lua
Modified files:
        automate.cc cert.cc cert.hh cmd_db.cc cmd_key_cert.cc
        cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc
        cmd_ws_commit.cc key_store.cc key_store.hh keys.cc keys.hh
        netsync.cc project.cc revision.cc

ChangeLog: 

* key_store.cc (hook_get_current_branch_key, has_opt_signing_key)
  (get_opt_signing_key): Delete.
* key_store.hh: Similarly.  Add 'signing_key' field to key_store.
* cert.cc (load_key_pair, get_user_key): Move to keys.cc.
  (check_cert): Move to more logical place.
  (put_simple_revision_cert): Ditto.  Return result of db.put_revision_cert.
  Use keys.signing_key.
  (calculate_cert, make_simple_cert): Fold into sole caller,
  put_simple_revision_cert.
* cert.hh: Update prototypes.
* keys.cc (get_passphrase): Split into two overloads, one that always
  prompts the user and does no caching, and another that does the
  caching.  (get_user_key): Do what require_password did, and also put
  the public key in the database if it's not already there.  Stash the
  result in keys.signing_key for use by put_simple_revision_cert.
  (cache_user_key): New wrapper around get_user_key for the common
  case where caller doesn't care what the key is.
  (get_private_key, migrate_private_key, change_key_passphrase):
  Adjust calls to get_passphrase.
  (read_pubkey, write_pubkey): Move to netsync.cc.
* keys.hh: Update prototypes.

* project.cc (put_standard_certs_from_options): Update call to get_user_key.
* revision.cc: Use put_simple_revision_cert.
* automate.cc (au cert): Call cache_user_key early.  Remove unnecessary
  transaction_guard.  Use put_simple_revision_cert.
* cmd_db.cc (db_changesetify, db_rosterify): Use cache_user_key.
* cmd_key_cert.cc (genkey): Remove unnecessary transaction_guard.
  Use simpler overloads of get_passphrase and generate_key_pair.
  (passphrase): Use load_key_pair.
  (ssh_agent_export): Remove redundant N().  Use simpler overload of
  get_passphrase.
  (ssh_agent_add): Remove redundant N().
  (cert, testresult, suspend, comment): Use cache_user_key.
  (tag): Likewise; also use project.put_tag.
* cmd_merging.cc (merge_two): Don't call get_user_key.
  (merge, explicit_merge): Use cache_user_key.
  (merge_into_dir): Similarly.  Adjust control flow to avoid prompting for
  password or producing as many progress messages when there's nothing to do.
* cmd_netsync.cc (find_key): Simplify logic and update call to get_user_key.
  (find_key_if_needed): Fix formatting.
  (serve): Remove unnecessary call to require_password.  Rearrange control
  flow so find_key will do the right thing.
* cmd_othervcs.cc (cvs_import): Use cache_user_key.
* cmd_ws_commit.cc (disapprove, commit): Use cache_user_key.

* tests/database_is_closed_on_signal_exit: Delete; we decided some time ago
  this was not worth fixing.

txtkKSFpGbe73.txt
Description: Diff [2f16e5f5c6d2fb4bcf3ff37764b21c8a70254e5d] -> [43df0ce4206510d364c401d4dd17db17b9a389b7]