[Commits] [wesnoth/wesnoth] c2bcb8: Move everything in src/filesystem.hpp into its own...

Sun Oct 26 03:58:54 UTC 2014

  Branch: refs/heads/1.12
  Home:   https://github.com/wesnoth/wesnoth
  Commit: c2bcb8dcc05c571acb7d7d360e0e3162456e74be
      https://github.com/wesnoth/wesnoth/commit/c2bcb8dcc05c571acb7d7d360e0e3162456e74be
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/addon/manager.cpp
    M src/addon/manager_ui.cpp
    M src/ai/configuration.cpp
    M src/ai/formula/function_table.cpp
    M src/campaign_server/addon_utils.cpp
    M src/campaign_server/campaign_server.cpp
    M src/config_cache.cpp
    M src/dialogs.cpp
    M src/editor/editor_main.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/map_context.cpp
    M src/editor/palette/editor_palettes.cpp
    M src/filesystem.cpp
    M src/filesystem.hpp
    M src/font.cpp
    M src/game.cpp
    M src/game_config_manager.cpp
    M src/game_config_manager.hpp
    M src/game_controller.cpp
    M src/game_preferences_display.cpp
    M src/gamestatus.cpp
    M src/gui/dialogs/editor/custom_tod.cpp
    M src/gui/dialogs/game_paths.cpp
    M src/gui/dialogs/lobby/lobby_data.cpp
    M src/gui/dialogs/mp_create_game.cpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/wml_error.cpp
    M src/gui/widgets/settings.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/image.cpp
    M src/language.cpp
    M src/menu_events.cpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_lobby.cpp
    M src/network.cpp
    M src/network_worker.cpp
    M src/persist_context.cpp
    M src/playcampaign.cpp
    M src/preferences.cpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/scripting/lua.cpp
    M src/serialization/preprocessor.cpp
    M src/serialization/schema_validator.cpp
    M src/server/ban.cpp
    M src/server/game.cpp
    M src/server/room_manager.cpp
    M src/server/server.cpp
    M src/sound.cpp
    M src/sound_music_track.cpp
    M src/tests/create_images.cpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/gui/test_save_dialog.cpp
    M src/tests/main.cpp
    M src/tests/test_image_modifications.cpp
    M src/tests/test_network_worker.cpp
    M src/tests/utils/game_config_manager.cpp
    M src/tools/exploder_cutter.cpp
    M src/tools/schema/schema_generator.cpp
    M src/tools/validator/validator_tool.cpp
    M src/widgets/button.cpp
    M src/widgets/file_menu.cpp

  Log Message:
  -----------
  Move everything in src/filesystem.hpp into its own namespace

Conflicts:
	src/addon/manager.cpp
	src/campaign_server/campaign_server.cpp
	src/editor/map/context_manager.cpp
	src/editor/map/map_context.cpp
	src/font.cpp
	src/game.cpp
	src/game_config_manager.cpp
	src/gui/dialogs/editor/custom_tod.cpp
	src/gui/dialogs/lobby/lobby_data.cpp
	src/gui/dialogs/mp_create_game.cpp
	src/gui/widgets/settings.cpp
	src/hotkeys.cpp
	src/multiplayer_create_engine.cpp
	src/multiplayer_lobby.cpp
	src/network.cpp
	src/playcampaign.cpp
	src/savegame.cpp
	src/serialization/preprocessor.cpp

I produce this by cherry-picking gfgtdf's commit of AI's original
commit, from master to 1.12 as usual. git figured out about 2/3
of the file correctly, the rest I mostly had to do by hand. I have
now inspected each line of the diff, it looks good to me.

Edit: There were minor issues in campaign_server, now resolved
after rebasing this.

  Commit: 37b6ae68f38b3feff11b9cf55945dc46280a7863
      https://github.com/wesnoth/wesnoth/commit/37b6ae68f38b3feff11b9cf55945dc46280a7863
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/editor/map/map_context.cpp
    M src/filesystem.cpp
    M src/filesystem.hpp
    M src/game_controller.cpp
    M src/gui/dialogs/editor/custom_tod.cpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/wml_error.cpp
    M src/image.cpp
    M src/serialization/preprocessor.cpp
    M src/tools/exploder_cutter.cpp
    M src/tools/schema/schema_generator.cpp

  Log Message:
  -----------
  Rename filesystem::file_name to filesystem::base_name

Amended: src/editor/map/map_context.cpp
   src/gui/dialogs/editor/custom_tod.cpp
   src/gui/dialogs/screenshot_notification.cpp
   src/gui/dialogs/wml_error.cpp
   src/serialization/preprocessor.cpp

  Commit: 027b2dc1ac9635fad2f8814a4592f5d95ac36b8e
      https://github.com/wesnoth/wesnoth/commit/027b2dc1ac9635fad2f8814a4592f5d95ac36b8e
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/ai/lua/core.cpp
    M src/editor/map/editor_map.cpp
    M src/gui/dialogs/lobby/lobby_info.cpp
    M src/loadscreen.cpp
    M src/network_ana.cpp

  Log Message:
  -----------
  Remove some unneeded includes

  Commit: 7cc8760c19ed70dee0d62efb20bdc28c76c20d35
      https://github.com/wesnoth/wesnoth/commit/7cc8760c19ed70dee0d62efb20bdc28c76c20d35
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/filesystem.hpp

  Log Message:
  -----------
  Make filesystem.hpp not depend on config.hpp being included first

Conflicts:
	src/filesystem.hpp

  Commit: 3cfcfecde35f975998c87ee1ec8460c336faa3fc
      https://github.com/wesnoth/wesnoth/commit/3cfcfecde35f975998c87ee1ec8460c336faa3fc
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/filesystem.cpp
    M src/filesystem.hpp
    M src/savegame.cpp

  Log Message:
  -----------
  Rename file_create_time to file_modified_time, as that's what it does

  Commit: 0bcb62f5191f03ada52232af459f348ceefb8d14
      https://github.com/wesnoth/wesnoth/commit/0bcb62f5191f03ada52232af459f348ceefb8d14
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/filesystem.hpp

  Log Message:
  -----------
  Remove a comment that is no longer true

  Commit: 6cc14f73760c45a0ed19edfee15a9dbc3b84b557
      https://github.com/wesnoth/wesnoth/commit/6cc14f73760c45a0ed19edfee15a9dbc3b84b557
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/image.cpp

  Log Message:
  -----------
  Don't try to iterate over things that are not directories

  Commit: ec68390c755a7f2b6299d3c4cd9637b983e8df7d
      https://github.com/wesnoth/wesnoth/commit/ec68390c755a7f2b6299d3c4cd9637b983e8df7d
  Author: Alexander van Gessel (AI0867) <ai0867 at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/SConscript
    M src/filesystem.cpp
    A src/filesystem_common.cpp

  Log Message:
  -----------
  Split the parts of filesystem.cpp that don't directly interface with the filesystem off into filesystem_common.cpp

  Commit: fd5a263a4bcaf07d388fb58d0c42a202ed4a9001
      https://github.com/wesnoth/wesnoth/commit/fd5a263a4bcaf07d388fb58d0c42a202ed4a9001
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M src/CMakeLists.txt

  Log Message:
  -----------
  add filesystem_common.cpp to cmake

  Commit: b0b42c45b7ca1bd5baf4e5f6164c95a0032ca00c
      https://github.com/wesnoth/wesnoth/commit/b0b42c45b7ca1bd5baf4e5f6164c95a0032ca00c
  Author: gfgtdf <f492343 at rmqkr.net>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M .travis.yml
    M SConstruct
    M scons/boost.py
    M src/SConscript
    M src/filesystem.cpp
    M src/filesystem.hpp
    A src/filesystem_boost.cpp
    M src/font.cpp
    M src/persist_context.cpp
    M src/savegame.cpp
    M src/tests/gui/test_save_dialog.cpp
    M src/tests/test_network_worker.cpp
    M src/widgets/file_menu.cpp

  Log Message:
  -----------
  Merge branch 'boost_filesystem' of https://github.com/AI0867/wesnoth into AI-boost_filesystem_3

Conflicts:
	.travis.yml
	SConstruct
	src/campaign_server/campaign_server.cpp
	src/create_engine.cpp
	src/editor/map/map_context.cpp
	src/game_config_manager.cpp
	src/gui/dialogs/screenshot_notification.cpp
	src/gui/dialogs/wml_error.cpp
	src/savegame.cpp

Conflicts:
	.travis.yml
	SConstruct
	src/save_index.cpp

The second conflict list is from the cherry-pick, the
first is from gfgtdf's original merge.

For me there was additional conflict in
filesystem_boost.cpp, because the
"treat_failure_as_error" flag does not exist in 1.12
branch, it was introduced to accomodate unit tests.

Additionally, dirsize was added even though its not
needed in 1.12 (I removed it), and the change

remove -> filesystem::delete_file

which appear in save_index.cpp in master needed to be
recreated in savegame.cpp in 1.12.

  Commit: 164a02f7c05db1fb550302eff00586169d7b7f99
      https://github.com/wesnoth/wesnoth/commit/164a02f7c05db1fb550302eff00586169d7b7f99
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    M src/addon/manager.cpp
    M src/addon/manager_ui.cpp
    M src/ai/configuration.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/lua/core.cpp
    M src/campaign_server/addon_utils.cpp
    M src/campaign_server/campaign_server.cpp
    M src/config_cache.cpp
    M src/dialogs.cpp
    M src/editor/editor_main.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/editor_map.cpp
    M src/editor/map/map_context.cpp
    M src/editor/palette/editor_palettes.cpp
    M src/filesystem.cpp
    M src/filesystem.hpp
    A src/filesystem_common.cpp
    M src/font.cpp
    M src/game.cpp
    M src/game_config_manager.cpp
    M src/game_config_manager.hpp
    M src/game_controller.cpp
    M src/game_preferences_display.cpp
    M src/gamestatus.cpp
    M src/gui/dialogs/editor/custom_tod.cpp
    M src/gui/dialogs/game_paths.cpp
    M src/gui/dialogs/lobby/lobby_data.cpp
    M src/gui/dialogs/lobby/lobby_info.cpp
    M src/gui/dialogs/mp_create_game.cpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/wml_error.cpp
    M src/gui/widgets/settings.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_preferences_display.cpp
    M src/image.cpp
    M src/language.cpp
    M src/loadscreen.cpp
    M src/menu_events.cpp
    M src/multiplayer_create_engine.cpp
    M src/multiplayer_lobby.cpp
    M src/network.cpp
    M src/network_ana.cpp
    M src/network_worker.cpp
    M src/persist_context.cpp
    M src/playcampaign.cpp
    M src/preferences.cpp
    M src/savegame.cpp
    M src/savegame.hpp
    M src/scripting/lua.cpp
    M src/serialization/preprocessor.cpp
    M src/serialization/schema_validator.cpp
    M src/server/ban.cpp
    M src/server/game.cpp
    M src/server/room_manager.cpp
    M src/server/server.cpp
    M src/sound.cpp
    M src/sound_music_track.cpp
    M src/tests/create_images.cpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/gui/test_save_dialog.cpp
    M src/tests/main.cpp
    M src/tests/test_image_modifications.cpp
    M src/tests/test_network_worker.cpp
    M src/tests/utils/game_config_manager.cpp
    M src/tools/exploder_cutter.cpp
    M src/tools/schema/schema_generator.cpp
    M src/tools/validator/validator_tool.cpp
    M src/widgets/button.cpp
    M src/widgets/file_menu.cpp

  Log Message:
  -----------
  Merge branch 'AI_BFS_part_I_ii' into 1.12

  Commit: 593528749988a712dd52a78c8e16c9741e2e6b4d
      https://github.com/wesnoth/wesnoth/commit/593528749988a712dd52a78c8e16c9741e2e6b4d
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M .travis.yml
    M SConstruct
    M scons/boost.py
    M src/SConscript
    M src/filesystem.cpp
    M src/filesystem.hpp
    A src/filesystem_boost.cpp
    M src/font.cpp
    M src/persist_context.cpp
    M src/savegame.cpp
    M src/tests/gui/test_save_dialog.cpp
    M src/tests/test_network_worker.cpp
    M src/widgets/file_menu.cpp

  Log Message:
  -----------
  Merge branch 'AI_BFS_part_II' into 1.12

Compare: https://github.com/wesnoth/wesnoth/compare/b228f0002a20...593528749988