monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision f4e3e76b572a8d360fe957d93836eebcf7a0d6


From: monotone
Subject: [Monotone-commits-diffs] Revision f4e3e76b572a8d360fe957d93836eebcf7a0d6b2
Date: Mon, 18 Feb 2008 19:06:43 +0100

-----------------------------------------------------------------
Revision: f4e3e76b572a8d360fe957d93836eebcf7a0d6b2
Ancestor: be8eaaacfdb9a2b50a445fe59e714a8746f0a944
Author: address@hidden
Date: 2008-02-18T06:05:40
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        app_state.cc app_state.hh automate.cc cmd_db.cc
        cmd_diff_log.cc cmd_merging.cc cmd_netsync.cc
        cmd_ws_commit.cc commands.cc database.cc monotone.cc
        selectors.cc work.cc work.hh work_migration.cc

ChangeLog: 

Final prep for pulling the workspace object out of the app_state.
You do not want to merge this; wait for the next patch, tomorrow.

 * app_state.cc (process_options, write_options, create_workspace):
   Move to work.hh; now workspace class and/or instance methods.
   (require_workspace): Now a thin wrapper around another workspace
   class method.
   (constructor): Remove references to deleted member variables.
 * app_state.hh (app_state): Remove found_workspace and branch_is_sticky
   member variables - now class data of workspace.

 * work.cc (get_user_log_path): Turn into a static function.
   (directory_is_workspace, workspace::found, workspace::branch_is_sticky)
   (workspace::require_workspace, workspace::create_workspace)
   (read_options_file, write_options_file)
   (workspace::get_database_option, workspace::print_ws_option): New.
   (workspace::get_ws_options_from_path): Delete.
   (workspace::get_ws_options, workspace::write_ws_options):
   Incorporate code formerly in app_state; use the above new functions.
 * work.hh: Add a bunch of commentary about the distinction between class
   and instance methods (not yet quite true).  Make several methods into
   class methods.

 * automate.cc (get_option): Most code moved to new workspace instance
   method, print_ws_option.
 * cmd_db.cc (db_kill_rev_locally)
 * monotone.cc (cpp_main)
 * work_migrationc.cc (check_ws_format): Use workspace::found.
 * cmd_diff_log.cc (log): Use workspace::require_workspace.  Mark the
   string passed to that function for translation.
 * cmd_merging.cc (update): Use work.set_ws_options.
 * cmd_netsync.cc (clone)
 * cmd_ws_commit.cc (checkout, setup, import):
   Use workspace::create_workspace.
   (commit): Use work.set_ws_options.
 * commands.cc (process): Use workspace::check_ws_format and
   workspace::get_ws_options.

 * database.cc (check_db_exists): Reorder cases and remove unnecessary
   break statements.  Use directory_is_workspace and
   workspace::get_database_option.
 * selectors.cc (decode_selector): Use workspace::require_workspace.

Attachment: txtjywz9lZmMV.txt
Description: Diff [be8eaaacfdb9a2b50a445fe59e714a8746f0a944] -> [f4e3e76b572a8d360fe957d93836eebcf7a0d6b2]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]