[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 88c25cc95b218165750597495bd028a3c13f45
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 88c25cc95b218165750597495bd028a3c13f45f3 |
Date: |
Thu, 21 Feb 2008 02:05:44 +0100 |
-----------------------------------------------------------------
Revision: 88c25cc95b218165750597495bd028a3c13f45f3
Ancestor: f4e3e76b572a8d360fe957d93836eebcf7a0d6b2
Author: address@hidden
Date: 2008-02-21T00:06:18
Branch: net.venge.monotone.experiment.encapsulation
Modified files:
app_state.cc app_state.hh automate.cc cmd.hh cmd_automate.cc
cmd_db.cc cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc
cmd_list.cc cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc
cmd_packet.cc cmd_ws_commit.cc commands.cc key_store.cc
monotone.cc restrictions.cc restrictions.hh selectors.cc
work.cc work.hh
ChangeLog:
Take workspace object out of app_state. Construction of a workspace object
is now done in CMD functions and corresponds to the old require_workspace()
operation.
* app_state.hh: Do not include paths.hh or work.hh.
(class app_state): Delete work member and require_workspace method.
* app_state.cc: Do not include sanity.hh. Remove using-decl for std::string.
(app_state constructor): Update.
(app_state::require_workspace): Delete.
* cmd.hh (CMD_REQUIRES_WORKSPACE): Delete.
* work.cc: Include app_state.hh.
(workspace::require_workspace): Take an i18n_format argument only.
Do not call set_ws_options here.
(workspace constructors): There are now two variants, constructing from
an app_state, one with and one without an i18n_format argument. Both
call require_workspace. Both conditionally call set_ws_options,
depending on the writeback_options optional argument.
* work.hh: Update to match.
* restrictions.cc (WORK_ARGDECL, WORK_ARG, WORK_IGNORE_FILE): Delete again.
(map_nodes): Add another overload that takes both the included and the
excluded paths.
(unknown_p, unknown_node, unknown_path, unknown_unignored_node)
(unknown_unignored_path): New functors.
(validate_roster_paths, validate_workspace_paths): Delete; replaced by...
(validate_paths): ...this, which takes an unknown_p argument.
(node_restriction constructors, path_restriction constructors):
Use validate_paths. Add another overload for each existing overload,
which has the same signature except that it omits the workspace argument,
and passes a different functor to validate_paths.
Ifdef up all of the above so that unit tests only see the without-
workspace variants.
* restrictions.hh (node_restriction, path_restriction): Replace
WORK_ARGDECL kludge with the new overloads, ifdefed as above.
* selectors.cc (decode_selector): workspace::require_workspace now
takes only an i18n_format argument, no options.
* automate.cc, cmd_automate.cc, cmd_db.cc, cmd_diff_log.cc, cmd_files.cc
* cmd_key_cert.cc, cmd_list.cc, cmd_merging.cc, cmd_netsync.cc
* cmd_othervcs.cc, cmd_packet.cc, cmd_ws_commit.cc:
Include database.hh or work.hh as necessary. Declare workspace objects
in CMD functions instead of calling app.require_workspace or
CMD_REQUIRES_WORKSPACE. Where necessary, use
workspace::require_workspace class method or node_restriction
constructors that don't take a workspace argument.
* commands.cc, key_store.cc, monotone.cc: Include database.hh or work.hh as
necessary.
txtOevcGuttfI.txt
Description: Diff [f4e3e76b572a8d360fe957d93836eebcf7a0d6b2] -> [88c25cc95b218165750597495bd028a3c13f45f3]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 88c25cc95b218165750597495bd028a3c13f45f3,
monotone <=