[Commits] [wesnoth/wesnoth] 3c9844: Make sure all error logs flush with std::endl, so ...

GitHub noreply at github.com
Tue May 20 20:04:50 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 3c9844889bab027653c588f75bddbf94f6232c4b
      https://github.com/wesnoth/wesnoth/commit/3c9844889bab027653c588f75bddbf94f6232c4b
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M src/actions/attack.cpp
    M src/actions/create.cpp
    M src/actions/undo.cpp
    M src/actions/vision.cpp
    M src/addon/client.cpp
    M src/addon/info.cpp
    M src/addon/manager.cpp
    M src/addon/manager_ui.cpp
    M src/ai/default/ai.cpp
    M src/ai/formula/ai.cpp
    M src/ai/formula/candidates.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/formula/stage_unit_formulas.cpp
    M src/ai/lua/unit_advancements_aspect.cpp
    M src/ai/recruitment/recruitment.cpp
    M src/ai/testing/ca.cpp
    M src/arrow.cpp
    M src/campaign_server/campaign_server.cpp
    M src/config_cache.cpp
    M src/construct_dialog.cpp
    M src/controller_base.cpp
    M src/desktop_util.cpp
    M src/display.cpp
    M src/editor/action/action_item.cpp
    M src/editor/action/action_unit.cpp
    M src/editor/action/mouse/mouse_action.cpp
    M src/editor/action/mouse/mouse_action_item.cpp
    M src/editor/action/mouse/mouse_action_unit.cpp
    M src/editor/editor_controller.cpp
    M src/editor/editor_main.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/editor_map.cpp
    M src/editor/palette/editor_palettes.cpp
    M src/editor/palette/item_palette.cpp
    M src/editor/palette/terrain_palettes.cpp
    M src/editor/palette/tristate_button.cpp
    M src/editor/palette/unit_palette.cpp
    M src/font.cpp
    M src/formula.cpp
    M src/game.cpp
    M src/game_config.cpp
    M src/game_config_manager.cpp
    M src/game_controller.cpp
    M src/game_display.cpp
    M src/game_events/action_wml.cpp
    M src/game_events/pump.cpp
    M src/game_preferences.cpp
    M src/gamestatus.cpp
    M src/generators/map_create.cpp
    M src/generators/mapgen.cpp
    M src/gui/auxiliary/canvas.cpp
    M src/gui/auxiliary/event/distributor.cpp
    M src/gui/auxiliary/iterator/policy_order.hpp
    M src/gui/dialogs/lobby/lobby_data.cpp
    M src/gui/dialogs/lobby/lobby_info.cpp
    M src/gui/dialogs/lobby_main.cpp
    M src/gui/dialogs/tip.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/widgets/helper.cpp
    M src/gui/widgets/settings.cpp
    M src/hotkey/hotkey_item.cpp
    M src/image.cpp
    M src/image_modifications.cpp
    M src/language.cpp
    M src/menu_events.cpp
    M src/multiplayer_connect_engine.cpp
    M src/multiplayer_ui.cpp
    M src/network.cpp
    M src/network_asio.cpp
    M src/network_worker.cpp
    M src/play_controller.cpp
    M src/playsingle_controller.cpp
    M src/playturn.cpp
    M src/playturn_network_adapter.cpp
    M src/replay.cpp
    M src/replay_controller.cpp
    M src/savegame.cpp
    M src/scripting/lua.cpp
    M src/scripting/lua_api.cpp
    M src/serialization/preprocessor.cpp
    M src/serialization/schema_validator.cpp
    M src/serialization/string_utils.cpp
    M src/serialization/unicode.cpp
    M src/server/ban.cpp
    M src/server/game.cpp
    M src/server/server.cpp
    M src/server/simple_wml.cpp
    M src/show_dialog.cpp
    M src/side_filter.cpp
    M src/sound.cpp
    M src/statistics.cpp
    M src/storyscreen/render.cpp
    M src/synced_context.cpp
    M src/terrain.cpp
    M src/terrain_builder.cpp
    M src/terrain_translation.cpp
    M src/theme.cpp
    M src/thread.cpp
    M src/tstring.cpp
    M src/unit_abilities.cpp
    M src/unit_map.cpp
    M src/unit_types.cpp
    M src/variable.cpp
    M src/video.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/side_actions.cpp
    M src/whiteboard/utility.cpp
    M src/widgets/button.cpp

  Log Message:
  -----------
  Make sure all error logs flush with std::endl, so we get on travis.

This is the result of running this command in directory src/

find . -type f -exec sed -i 's/\(ERR.*\)\\n\"\;/\1\" << std::endl\;/g' '{}' \;

and carefully inspecting the results.


  Commit: 03a956d05ce08b0f4da37c07c268dae016b08936
      https://github.com/wesnoth/wesnoth/commit/03a956d05ce08b0f4da37c07c268dae016b08936
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M src/addon/client.cpp
    M src/addon/manager.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/testing/ca.cpp
    M src/arrow.cpp
    M src/editor/editor_controller.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/toolkit/brush.cpp
    M src/font.cpp
    M src/game_controller.cpp
    M src/game_events/action_wml.cpp
    M src/game_events/conditional_wml.cpp
    M src/game_events/handlers.cpp
    M src/game_events/wmi_container.cpp
    M src/gui/auxiliary/timer.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/help.cpp
    M src/language.cpp
    M src/mouse_handler_base.cpp
    M src/mp_game_utils.cpp
    M src/network.cpp
    M src/network_asio.cpp
    M src/portrait.cpp
    M src/server/server.cpp
    M src/storyscreen/render.cpp
    M src/synced_commands.cpp
    M src/team.cpp
    M src/terrain_builder.cpp
    M src/terrain_filter.cpp
    M src/terrain_translation.cpp
    M src/unit.cpp
    M src/unit_types.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/move.cpp
    M src/widgets/textbox.cpp

  Log Message:
  -----------
  Make sure all warning logs are flushed, so travis gets the results.

This is the result of running command, in src/,

find . -type f -exec sed -i 's/\(WRN.*\)\\n\"\;/\1\" << std::endl\;/g' '{}' \;

and inspecting the results.

Also ran this subsequently:

find . -type f -exec sed -i 's/\(WARN.*\)\\n\"\;/\1\" << std::endl\;/g' '{}' \;

which only affected render.cpp


  Commit: f09d4056296632ada3eb68c69fcad840372ee7f3
      https://github.com/wesnoth/wesnoth/commit/f09d4056296632ada3eb68c69fcad840372ee7f3
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-20 (Tue, 20 May 2014)

  Changed paths:
    M src/addon/manager_ui.cpp
    M src/ai/formula/ai.cpp
    M src/ai/formula/candidates.cpp
    M src/ai/formula/function_table.cpp
    M src/ai/formula/stage_unit_formulas.cpp
    M src/ai/lua/unit_advancements_aspect.cpp
    M src/campaign_server/campaign_server.cpp
    M src/config_cache.cpp
    M src/editor/action/action_item.cpp
    M src/editor/action/action_unit.cpp
    M src/editor/editor_main.cpp
    M src/editor/map/context_manager.cpp
    M src/editor/map/editor_map.cpp
    M src/editor/toolkit/brush.cpp
    M src/font.cpp
    M src/game_config.cpp
    M src/game_controller.cpp
    M src/game_events/action_wml.cpp
    M src/game_events/pump.cpp
    M src/gui/dialogs/lobby/lobby_data.cpp
    M src/menu_events.cpp
    M src/mp_game_utils.cpp
    M src/multiplayer_connect_engine.cpp
    M src/multiplayer_ui.cpp
    M src/network.cpp
    M src/network_asio.cpp
    M src/network_worker.cpp
    M src/playturn.cpp
    M src/playturn_network_adapter.cpp
    M src/serialization/preprocessor.cpp
    M src/serialization/string_utils.cpp
    M src/server/ban.cpp
    M src/server/server.cpp
    M src/server/simple_wml.cpp
    M src/sound.cpp
    M src/synced_context.cpp
    M src/team.cpp
    M src/terrain.cpp
    M src/terrain_translation.cpp
    M src/thread.cpp
    M src/tstring.cpp
    M src/unit.cpp
    M src/unit_abilities.cpp
    M src/unit_map.cpp
    M src/unit_types.cpp
    M src/video.cpp

  Log Message:
  -----------
  cleanup previous two find and replace results

Just wanted to remove the empty strings that got created:

find . -type f -exec sed -i 's/<< "" <</<</g' '{}' \;

find . -type f -exec sed -i 's/<<"" <</<</g' '{}' \;

I also unstaged tools/schema/tags.cpp, since I don't think I changed
that.


Compare: https://github.com/wesnoth/wesnoth/compare/f4ac89c400df...f09d40562966


More information about the Commits mailing list