[Monotone-commits-diffs] Revision 451480aff3b50cc3bf09304dbccb8ca660abde6c

[monotone]

-----------------------------------------------------------------
Revision: 451480aff3b50cc3bf09304dbccb8ca660abde6c
Ancestor: c25b17203749e4ad9616c16bfec781cd6ffeaacb
Author: address@hidden
Date: 2008-02-01T17:08:36
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        README.encapsulation app_state.cc app_state.hh automate.cc
        cert.cc cert.hh cmd.hh cmd_key_cert.cc cmd_list.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc commands.cc
        database.cc database.hh netsync.cc project.cc project.hh
        rcs_import.cc selectors.cc update.cc update.hh

ChangeLog: 

* project.cc (get_branch_heads):  Add ignore_suspend_certs argument.
  80-column compliance patrol.
  (get_branch_list): Rename check_certs_valid to check_heads.  If it is true,
  call get_branch_heads with ignore_suspend_certs false.
  (put_standard_certs): Add I()s for non-vacuous arguments.  Do not use
  cert_revision_author_default.  Change author argument to a string.
  (put_standard_certs_from_options): Add options and lua_hooks arguments.
  Fill out default date and author here.
* cert.cc (guess_branch): Take the options object rather than the database.
  (cert_revision_author_default): Delete.
* cert.hh: Update to match.
* commands.cc (notify_if_multiple_heads): Add ignore_suspend_certs argument.
* cmd.hh: Update to match.
* update.cc (acceptable_descendent): Take lua_hooks argument and use it for
  hook_accept_testresult_change.
  (calculate_update_set): Collapse into sole caller.  Adjust calls to
  acceptable_descendent.
  (pick_update_candidates): Add branch, ignore_suspend_certs, and lua
  arguments.
* update.hh: Update to match.

* automate.cc (au heads, au branches): Adjust calls to get_branch_heads.
* cmd_key_cert.cc (approve, suspend): Adjust calls to guess_branch.
* cmd_list.cc (ls branches): 80-column compliance patrol.
  (ls certs): Go back to direct use of lua object for
  hook_get_revision_cert_trust.
* cmd_merging.cc (update): One diagnostic moved here from update.cc.
  Adjust calls to pick_update_candidates and notify_if_multiple_heads.
  (merge_two): Adjust call to put_standard_certs_from_options.
  (merge, merge_into_dir, heads): Adjust calls to get_branch_heads.
* cmd_netsync.cc (clone): Adjust calls to get_branch_heads and guess_branch.
* cmd_ws_commit.cc (disapprove, checkout, commit): Adjust calls to
  get_branch_heads, guess_branch, and put_standard_certs_from_options.
* netsync.cc (process_hello_cmd, process_anonymous_cmd, process_auth_cmd)
  Adjust calls to get_branch_list.
* rcs_import.cc (cluster_consumer::store_auxiliary_certs): Adjust call
  to put_standard_certs.
* selectors.cc (selector_type): Add sel_any_head.
  (decode_selector): Map h: to sel_any_head if
  app.opts.ignore_suspend_certs is true.
  (complete_one_selector): Adjust calls to get_branch_list and
  get_branch_heads, using the distinction between sel_head and sel_any_head.

* database.hh (database): Replace app_state pointer with lua_hooks reference.
  Update member functions declarations for ...
* database.cc (database_impl constructor): Takes no arguments.
  (database constructor): Takes a lua_hooks reference, not a system_path.
  (get_manifest_cert_trust, get_revision_cert_trust): Use lua, not __app->lua.
  Add commentary about why these two hook wrappers survive.
  (set_app, hook_get_author, hook_accept_testresult_change)
  (get_opt_author, get_opt_ignore_suspend_certs, get_opt_date_or_cur_date)
  (has_opt_branch, get_opt_branchname, set_opt_branchname): Delete.

* app_state.hh (app_state): move lua_hooks member before database.
* app_state.cc (app_state constructor): database now just takes the lua hooks.
* README.encapsulation: done with database.cc!

txtWgE2krhxk2.txt
Description: Diff [c25b17203749e4ad9616c16bfec781cd6ffeaacb] -> [451480aff3b50cc3bf09304dbccb8ca660abde6c]