[Monotone-commits-diffs] Revision 26f3710830d44cdc1cd348327e9efccee752ce19

[monotone]

-----------------------------------------------------------------
Revision: 26f3710830d44cdc1cd348327e9efccee752ce19
Ancestor: 52a6015293e01d24426955e20e258b539748e918
Author: address@hidden
Date: 2008-02-15T04:16:10
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        app_state.cc app_state.hh cmd_db.cc cmd_merging.cc
        cmd_ws_commit.cc monotone.cc

ChangeLog: 

* app_state.cc: Prune headers.
  (app_state::allow_workspace, app_state::make_branch_sticky): Delete.
  (app_state::write_options): Add branch_is_sticky argument.  Write the
  branch option if either the boolean in the app_state or this argument
  is true.
* app_state.hh: Update to match.
  (app_state::write_options): Publicize.
* cmd_db.cc (db_kill_rev_locally): Remove unnecessary call to
  allow_workspace.
* cmd_merging.cc (update): Unconditionally call app.write_options(true)
  where we used to call app.make_branch_sticky.
* cmd_ws_commit.cc (commit): Similarly, but do the write_options with the
  rest of the workspace state updates.
* monotone.cc (cpp_main): Do here what used to be done in allow_workspace.

txt1fuujIJm7Y.txt
Description: Diff [52a6015293e01d24426955e20e258b539748e918] -> [26f3710830d44cdc1cd348327e9efccee752ce19]