[Monotone-commits-diffs] Revision 5f6c2cd639dc0a9de1220d709493cd01d27e4991

[monotone]

-----------------------------------------------------------------
Revision: 5f6c2cd639dc0a9de1220d709493cd01d27e4991
Ancestor: eba345c1efff894469ff2787a88570f0999d25a4
Author: address@hidden
Date: 2008-01-08T23:04:32
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        automate.cc cert.cc cert.hh cmd_key_cert.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc key_store.hh rcs_import.cc
        revision.cc

ChangeLog: 

Yet another round of fixups after merge from mainline:
 * automate.cc (inventory): Remove N(args.size() == 0) that snuck back in.
 * cert.cc (get_user_key): Take the database, not the key_store.  Use the
   existing kludge hook that does what is needed here rather than the one I
   made up during the merge itself.  All callers changed to match.
 * cert.hh (get_user_key): Update prototype.
 * key_store.hh: Put back forward declaration of struct app_state.

txthiEPM4R55d.txt
Description: Diff [eba345c1efff894469ff2787a88570f0999d25a4] -> [5f6c2cd639dc0a9de1220d709493cd01d27e4991]