diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 152556039..ea5ac6914 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -152,7 +152,6 @@ #include "editor/plugins/theme_editor_plugin.h" #include "editor/plugins/tile_map_editor_plugin.h" #include "editor/plugins/tile_set_editor_plugin.h" -#include "editor/plugins/version_control_editor_plugin.h" #include "editor/plugins/viewport_preview_editor_plugin.h" #include "editor/progress_dialog.h" #include "editor/project_export.h" @@ -338,17 +337,6 @@ void EditorNode::_update_scene_tabs() { } } -void EditorNode::_version_control_menu_option(int p_idx) { - switch (vcs_actions_menu->get_item_id(p_idx)) { - case RUN_VCS_SETTINGS: { - VersionControlEditorPlugin::get_singleton()->popup_vcs_set_up_dialog(gui_base); - } break; - case RUN_VCS_SHUT_DOWN: { - VersionControlEditorPlugin::get_singleton()->shut_down(); - } break; - } -} - void EditorNode::_update_title() { const String appname = ProjectSettings::get_singleton()->get("application/config/name"); String title = (appname.empty() ? "Unnamed Project" : appname) + String(" - ") + VERSION_NAME; @@ -3766,7 +3754,6 @@ void EditorNode::register_editor_types() { ClassDB::register_class(); ClassDB::register_virtual_class(); ClassDB::register_class(); - ClassDB::register_class(); ClassDB::register_virtual_class(); ClassDB::register_virtual_class(); ClassDB::register_class(); @@ -5538,7 +5525,6 @@ void EditorNode::_bind_methods() { ClassDB::bind_method("_dropped_files", &EditorNode::_dropped_files); ClassDB::bind_method(D_METHOD("_global_menu_action"), &EditorNode::_global_menu_action, DEFVAL(Variant())); ClassDB::bind_method("_toggle_distraction_free_mode", &EditorNode::_toggle_distraction_free_mode); - ClassDB::bind_method("_version_control_menu_option", &EditorNode::_version_control_menu_option); ClassDB::bind_method("edit_item_resource", &EditorNode::edit_item_resource); ClassDB::bind_method(D_METHOD("get_gui_base"), &EditorNode::get_gui_base); @@ -6199,15 +6185,6 @@ EditorNode::EditorNode() { p->add_shortcut(ED_SHORTCUT("editor/project_settings", TTR("Project Settings...")), RUN_SETTINGS); p->connect("id_pressed", this, "_menu_option"); - vcs_actions_menu = VersionControlEditorPlugin::get_singleton()->get_version_control_actions_panel(); - vcs_actions_menu->set_name("Version Control"); - vcs_actions_menu->connect("index_pressed", this, "_version_control_menu_option"); - p->add_separator(); - p->add_child(vcs_actions_menu); - p->add_submenu_item(TTR("Version Control"), "Version Control"); - vcs_actions_menu->add_item(TTR("Set Up Version Control"), RUN_VCS_SETTINGS); - vcs_actions_menu->add_item(TTR("Shut Down Version Control"), RUN_VCS_SHUT_DOWN); - p->add_separator(); p->add_shortcut(ED_SHORTCUT("editor/export", TTR("Export...")), FILE_EXPORT_PROJECT); p->add_item(TTR("Install Android Build Template..."), FILE_INSTALL_ANDROID_SOURCE); @@ -6758,7 +6735,6 @@ EditorNode::EditorNode() { //more visually meaningful to have this later raise_bottom_panel_item(AnimationPlayerEditor::singleton); - add_editor_plugin(VersionControlEditorPlugin::get_singleton()); add_editor_plugin(memnew(ShaderEditorPlugin(this))); add_editor_plugin(memnew(CameraEditorPlugin(this))); diff --git a/editor/editor_node.h b/editor/editor_node.h index 4992d6bb4..d5d541ecc 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -171,8 +171,6 @@ private: RUN_DEBUG_SHADER_FALLBACKS, RUN_DEPLOY_REMOTE_DEBUG, RUN_RELOAD_SCRIPTS, - RUN_VCS_SETTINGS, - RUN_VCS_SHUT_DOWN, SETTINGS_UPDATE_CONTINUOUSLY, SETTINGS_UPDATE_VITAL_ONLY, SETTINGS_UPDATE_WHEN_CHANGED, @@ -331,7 +329,6 @@ private: EditorSettingsDialog *settings_config_dialog; RunSettingsDialog *run_settings_dialog; ProjectSettingsEditor *project_settings; - PopupMenu *vcs_actions_menu; EditorFileDialog *file; ExportTemplateManager *export_template_manager; EditorFileDialog *file_templates; @@ -489,7 +486,6 @@ private: void _get_scene_metadata(const String &p_file); void _update_title(); void _update_scene_tabs(); - void _version_control_menu_option(int p_idx); void _close_messages(); void _show_messages(); void _vp_resized(); diff --git a/editor/editor_vcs_interface.cpp b/editor/editor_vcs_interface.cpp deleted file mode 100644 index a06fca1aa..000000000 --- a/editor/editor_vcs_interface.cpp +++ /dev/null @@ -1,336 +0,0 @@ -/*************************************************************************/ -/* editor_vcs_interface.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#include "editor_vcs_interface.h" - -#include "editor_node.h" - -EditorVCSInterface *EditorVCSInterface::singleton = nullptr; - -void EditorVCSInterface::popup_error(String p_msg) { - // TRANSLATORS: %s refers to the name of a version control system (e.g. "Git"). - EditorNode::get_singleton()->show_warning(p_msg.strip_edges(), vformat(TTR("%s Error"), get_vcs_name())); -} - -bool EditorVCSInterface::initialize(String p_project_path) { - return call("_initialize", p_project_path); -} - -void EditorVCSInterface::set_credentials(String p_username, String p_password, String p_ssh_public_key, String p_ssh_private_key, String p_ssh_passphrase) { - call("_set_credentials", p_username, p_password, p_ssh_public_key, p_ssh_private_key, p_ssh_passphrase); -} - -List EditorVCSInterface::get_remotes() { - List remotes; - - Array result = call("_get_remotes"); - for (int i = 0; i < result.size(); i++) { - remotes.push_back(result[i]); - } - - return remotes; -} - -List EditorVCSInterface::get_modified_files_data() { - List status_files; - - Array result = call("_get_modified_files_data"); - for (int i = 0; i < result.size(); i++) { - status_files.push_back(_convert_status_file(result[i])); - } - - return status_files; -} - -void EditorVCSInterface::stage_file(String p_file_path) { - call("_stage_file", p_file_path); -} - -void EditorVCSInterface::unstage_file(String p_file_path) { - call("_unstage_file", p_file_path); -} - -void EditorVCSInterface::discard_file(String p_file_path) { - call("_discard_file", p_file_path); -} - -void EditorVCSInterface::commit(String p_msg) { - call("_commit", p_msg); -} - -List EditorVCSInterface::get_diff(String p_identifier, TreeArea p_area) { - List diff_files; - - Array result = call("_get_diff", p_identifier, p_area); - for (int i = 0; i < result.size(); i++) { - diff_files.push_back(_convert_diff_file(result[i])); - } - - return diff_files; -} - -List EditorVCSInterface::get_previous_commits(int p_max_commits) { - List commits; - - Array result = call("_get_previous_commits", p_max_commits); - for (int i = 0; i < result.size(); i++) { - commits.push_back(_convert_commit(result[i])); - } - - return commits; -} - -List EditorVCSInterface::get_branch_list() { - List branch_list; - - Array result = call("_get_branch_list"); - for (int i = 0; i < result.size(); i++) { - branch_list.push_back(result[i]); - } - - return branch_list; -} - -void EditorVCSInterface::create_branch(String p_branch_name) { - call("_create_branch", p_branch_name); -} - -void EditorVCSInterface::create_remote(String p_remote_name, String p_remote_url) { - call("_create_remote", p_remote_name, p_remote_url); -} - -void EditorVCSInterface::remove_branch(String p_branch_name) { - call("_remove_branch", p_branch_name); -} - -void EditorVCSInterface::remove_remote(String p_remote_name) { - call("_remove_remote", p_remote_name); -} - -String EditorVCSInterface::get_current_branch_name() { - return call("_get_current_branch_name"); -} - -bool EditorVCSInterface::checkout_branch(String p_branch_name) { - return call("_checkout_branch", p_branch_name); -} - -void EditorVCSInterface::pull(String p_remote) { - call("_pull", p_remote); -} - -void EditorVCSInterface::push(String p_remote, bool p_force) { - call("_push", p_remote, p_force); -} - -void EditorVCSInterface::fetch(String p_remote) { - call("_fetch", p_remote); -} - -List EditorVCSInterface::get_line_diff(String p_file_path, String p_text) { - List diff_hunks; - - Array result = call("_get_line_diff", p_file_path, p_text); - for (int i = 0; i < result.size(); i++) { - diff_hunks.push_back(_convert_diff_hunk(result[i])); - } - - return diff_hunks; -} - -bool EditorVCSInterface::shut_down() { - return call("_shut_down"); -} - -String EditorVCSInterface::get_vcs_name() { - return call("_get_vcs_name"); -} - -Dictionary EditorVCSInterface::create_diff_line(int p_new_line_no, int p_old_line_no, String p_content, String p_status) { - Dictionary diff_line; - diff_line["new_line_no"] = p_new_line_no; - diff_line["old_line_no"] = p_old_line_no; - diff_line["content"] = p_content; - diff_line["status"] = p_status; - - return diff_line; -} - -Dictionary EditorVCSInterface::create_diff_hunk(int p_old_start, int p_new_start, int p_old_lines, int p_new_lines) { - Dictionary diff_hunk; - diff_hunk["new_lines"] = p_new_lines; - diff_hunk["old_lines"] = p_old_lines; - diff_hunk["new_start"] = p_new_start; - diff_hunk["old_start"] = p_old_start; - diff_hunk["diff_lines"] = Array(); - return diff_hunk; -} - -Dictionary EditorVCSInterface::add_line_diffs_into_diff_hunk(Dictionary p_diff_hunk, Array p_line_diffs) { - p_diff_hunk["diff_lines"] = p_line_diffs; - return p_diff_hunk; -} - -Dictionary EditorVCSInterface::create_diff_file(String p_new_file, String p_old_file) { - Dictionary file_diff; - file_diff["new_file"] = p_new_file; - file_diff["old_file"] = p_old_file; - file_diff["diff_hunks"] = Array(); - return file_diff; -} - -Dictionary EditorVCSInterface::create_commit(String p_msg, String p_author, String p_id, String p_date) { - Dictionary commit_info; - commit_info["message"] = p_msg; - commit_info["author"] = p_author; - commit_info["date"] = p_date; - commit_info["id"] = p_id; - return commit_info; -} - -Dictionary EditorVCSInterface::add_diff_hunks_into_diff_file(Dictionary p_diff_file, Array p_diff_hunks) { - p_diff_file["diff_hunks"] = p_diff_hunks; - return p_diff_file; -} - -Dictionary EditorVCSInterface::create_status_file(String p_file_path, ChangeType p_change, TreeArea p_area) { - Dictionary sf; - sf["file_path"] = p_file_path; - sf["change_type"] = p_change; - sf["area"] = p_area; - return sf; -} - -EditorVCSInterface::DiffLine EditorVCSInterface::_convert_diff_line(Dictionary p_diff_line) { - DiffLine d; - d.new_line_no = p_diff_line["new_line_no"]; - d.old_line_no = p_diff_line["old_line_no"]; - d.content = p_diff_line["content"]; - d.status = p_diff_line["status"]; - return d; -} - -EditorVCSInterface::DiffHunk EditorVCSInterface::_convert_diff_hunk(Dictionary p_diff_hunk) { - DiffHunk dh; - dh.new_lines = p_diff_hunk["new_lines"]; - dh.old_lines = p_diff_hunk["old_lines"]; - dh.new_start = p_diff_hunk["new_start"]; - dh.old_start = p_diff_hunk["old_start"]; - Array diff_lines = p_diff_hunk["diff_lines"]; - for (int i = 0; i < diff_lines.size(); i++) { - DiffLine dl = _convert_diff_line(diff_lines[i]); - dh.diff_lines.push_back(dl); - } - return dh; -} - -EditorVCSInterface::DiffFile EditorVCSInterface::_convert_diff_file(Dictionary p_diff_file) { - DiffFile df; - df.new_file = p_diff_file["new_file"]; - df.old_file = p_diff_file["old_file"]; - Array diff_hunks = p_diff_file["diff_hunks"]; - for (int i = 0; i < diff_hunks.size(); i++) { - DiffHunk dh = _convert_diff_hunk(diff_hunks[i]); - df.diff_hunks.push_back(dh); - } - return df; -} - -EditorVCSInterface::Commit EditorVCSInterface::_convert_commit(Dictionary p_commit) { - EditorVCSInterface::Commit c; - c.msg = p_commit["message"]; - c.author = p_commit["author"]; - c.date = p_commit["date"]; - c.id = p_commit["id"]; - return c; -} - -EditorVCSInterface::StatusFile EditorVCSInterface::_convert_status_file(Dictionary p_status_file) { - StatusFile sf; - sf.file_path = p_status_file["file_path"]; - sf.change_type = (ChangeType)(int)p_status_file["change_type"]; - sf.area = (TreeArea)(int)p_status_file["area"]; - return sf; -} - -void EditorVCSInterface::_bind_methods() { - // Proxy end points that implement the VCS specific operations that the editor demands. - BIND_VMETHOD(MethodInfo(Variant::BOOL, "_initialize", PropertyInfo(Variant::STRING, "project_path"))); - BIND_VMETHOD(MethodInfo("_set_credentials", PropertyInfo(Variant::STRING, "username"), PropertyInfo(Variant::STRING, "password"), PropertyInfo(Variant::STRING, "ssh_public_key_path"), PropertyInfo(Variant::STRING, "ssh_private_key_path"), PropertyInfo(Variant::STRING, "ssh_passphrase"))); - BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_remotes")); - BIND_VMETHOD(MethodInfo(Variant::STRING, "_get_vcs_name")); - BIND_VMETHOD(MethodInfo(Variant::BOOL, "_shut_down")); - BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_modified_files_data")); - BIND_VMETHOD(MethodInfo("_commit", PropertyInfo(Variant::STRING, "msg"))); - BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_diff", PropertyInfo(Variant::STRING, "identifier"), PropertyInfo(Variant::INT, "area"))); - BIND_VMETHOD(MethodInfo("_stage_file", PropertyInfo(Variant::STRING, "file_path"))); - BIND_VMETHOD(MethodInfo("_unstage_file", PropertyInfo(Variant::STRING, "file_path"))); - BIND_VMETHOD(MethodInfo("_discard_file", PropertyInfo(Variant::STRING, "file_path"))); - BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_previous_commits", PropertyInfo(Variant::INT, "max_commits"))); - BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_branch_list")); - BIND_VMETHOD(MethodInfo("_create_branch", PropertyInfo(Variant::STRING, "branch_name"))); - BIND_VMETHOD(MethodInfo("_remove_branch", PropertyInfo(Variant::STRING, "branch_name"))); - BIND_VMETHOD(MethodInfo("_create_remote", PropertyInfo(Variant::STRING, "remote_name"), PropertyInfo(Variant::STRING, "remote_url"))); - BIND_VMETHOD(MethodInfo("_remove_remote", PropertyInfo(Variant::STRING, "remote_name"))); - BIND_VMETHOD(MethodInfo(Variant::STRING, "_get_current_branch_name")); - BIND_VMETHOD(MethodInfo(Variant::BOOL, "_checkout_branch", PropertyInfo(Variant::STRING, "branch_name"))); - BIND_VMETHOD(MethodInfo("_push", PropertyInfo(Variant::STRING, "remote"), PropertyInfo(Variant::BOOL, "force"))); - BIND_VMETHOD(MethodInfo("_pull", PropertyInfo(Variant::STRING, "remote"))); - BIND_VMETHOD(MethodInfo("_fetch", PropertyInfo(Variant::STRING, "remote"))); - BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_line_diff", PropertyInfo(Variant::STRING, "file_path"), PropertyInfo(Variant::STRING, "text"))); - - ClassDB::bind_method(D_METHOD("create_diff_line", "new_line_no", "old_line_no", "content", "status"), &EditorVCSInterface::create_diff_line); - ClassDB::bind_method(D_METHOD("create_diff_hunk", "old_start", "new_start", "old_lines", "new_lines"), &EditorVCSInterface::create_diff_hunk); - ClassDB::bind_method(D_METHOD("create_diff_file", "new_file", "old_file"), &EditorVCSInterface::create_diff_file); - ClassDB::bind_method(D_METHOD("create_commit", "msg", "author", "id", "date"), &EditorVCSInterface::create_commit); - ClassDB::bind_method(D_METHOD("create_status_file", "file_path", "change_type", "area"), &EditorVCSInterface::create_status_file); - ClassDB::bind_method(D_METHOD("add_diff_hunks_into_diff_file", "diff_file", "diff_hunks"), &EditorVCSInterface::add_diff_hunks_into_diff_file); - ClassDB::bind_method(D_METHOD("add_line_diffs_into_diff_hunk", "diff_hunk", "line_diffs"), &EditorVCSInterface::add_line_diffs_into_diff_hunk); - ClassDB::bind_method(D_METHOD("popup_error", "msg"), &EditorVCSInterface::popup_error); - - BIND_ENUM_CONSTANT(CHANGE_TYPE_NEW); - BIND_ENUM_CONSTANT(CHANGE_TYPE_MODIFIED); - BIND_ENUM_CONSTANT(CHANGE_TYPE_RENAMED); - BIND_ENUM_CONSTANT(CHANGE_TYPE_DELETED); - BIND_ENUM_CONSTANT(CHANGE_TYPE_TYPECHANGE); - BIND_ENUM_CONSTANT(CHANGE_TYPE_UNMERGED); - - BIND_ENUM_CONSTANT(TREE_AREA_COMMIT); - BIND_ENUM_CONSTANT(TREE_AREA_STAGED); - BIND_ENUM_CONSTANT(TREE_AREA_UNSTAGED); -} - -EditorVCSInterface *EditorVCSInterface::get_singleton() { - return singleton; -} - -void EditorVCSInterface::set_singleton(EditorVCSInterface *p_singleton) { - singleton = p_singleton; -} diff --git a/editor/editor_vcs_interface.h b/editor/editor_vcs_interface.h deleted file mode 100644 index d738f4ddf..000000000 --- a/editor/editor_vcs_interface.h +++ /dev/null @@ -1,149 +0,0 @@ -/*************************************************************************/ -/* editor_vcs_interface.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#ifndef EDITOR_VCS_INTERFACE_H -#define EDITOR_VCS_INTERFACE_H - -#include "core/object.h" -#include "core/ustring.h" -#include "scene/gui/panel_container.h" - -class EditorVCSInterface : public Object { - GDCLASS(EditorVCSInterface, Object) - -public: - enum ChangeType { - CHANGE_TYPE_NEW = 0, - CHANGE_TYPE_MODIFIED = 1, - CHANGE_TYPE_RENAMED = 2, - CHANGE_TYPE_DELETED = 3, - CHANGE_TYPE_TYPECHANGE = 4, - CHANGE_TYPE_UNMERGED = 5 - }; - - enum TreeArea { - TREE_AREA_COMMIT = 0, - TREE_AREA_STAGED = 1, - TREE_AREA_UNSTAGED = 2 - }; - - struct DiffLine { - int new_line_no; - int old_line_no; - String content; - String status; - - String old_text; - String new_text; - }; - - struct DiffHunk { - int new_start; - int old_start; - int new_lines; - int old_lines; - List diff_lines; - }; - - struct DiffFile { - String new_file; - String old_file; - List diff_hunks; - }; - - struct Commit { - String author; - String msg; - String id; - String date; - }; - - struct StatusFile { - TreeArea area; - ChangeType change_type; - String file_path; - }; - -protected: - static EditorVCSInterface *singleton; - - static void _bind_methods(); - - DiffLine _convert_diff_line(Dictionary p_diff_line); - DiffHunk _convert_diff_hunk(Dictionary p_diff_hunk); - DiffFile _convert_diff_file(Dictionary p_diff_file); - Commit _convert_commit(Dictionary p_commit); - StatusFile _convert_status_file(Dictionary p_status_file); - -public: - static EditorVCSInterface *get_singleton(); - static void set_singleton(EditorVCSInterface *p_singleton); - - // Proxy functions to the editor for use - bool initialize(String p_project_path); - void set_credentials(String p_username, String p_password, String p_ssh_public_key_path, String p_ssh_private_key_path, String p_ssh_passphrase); - List get_modified_files_data(); - void stage_file(String p_file_path); - void unstage_file(String p_file_path); - void discard_file(String p_file_path); - void commit(String p_msg); - List get_diff(String p_identifier, TreeArea p_area); - bool shut_down(); - String get_vcs_name(); - List get_previous_commits(int p_max_commits); - List get_branch_list(); - List get_remotes(); - void create_branch(String p_branch_name); - void remove_branch(String p_branch_name); - void create_remote(String p_remote_name, String p_remote_url); - void remove_remote(String p_remote_name); - String get_current_branch_name(); - bool checkout_branch(String p_branch_name); - void pull(String p_remote); - void push(String p_remote, bool p_force); - void fetch(String p_remote); - List get_line_diff(String p_file_path, String p_text); - - // Helper functions to create and convert Dictionary into data structures - Dictionary create_diff_line(int p_new_line_no, int p_old_line_no, String p_content, String p_status); - Dictionary create_diff_hunk(int p_old_start, int p_new_start, int p_old_lines, int p_new_lines); - Dictionary create_diff_file(String p_new_file, String p_old_file); - Dictionary create_commit(String p_msg, String p_author, String p_id, String p_date); - Dictionary create_status_file(String p_file_path, ChangeType p_change, TreeArea p_area); - Dictionary add_line_diffs_into_diff_hunk(Dictionary p_diff_hunk, Array p_line_diffs); - Dictionary add_diff_hunks_into_diff_file(Dictionary p_diff_file, Array p_diff_hunks); - - void popup_error(String p_msg); -}; - -VARIANT_ENUM_CAST(EditorVCSInterface::ChangeType); -VARIANT_ENUM_CAST(EditorVCSInterface::TreeArea); - -#endif // !EDITOR_VCS_INTERFACE_H diff --git a/editor/plugins/version_control_editor_plugin.cpp b/editor/plugins/version_control_editor_plugin.cpp deleted file mode 100644 index 2741c8dac..000000000 --- a/editor/plugins/version_control_editor_plugin.cpp +++ /dev/null @@ -1,1501 +0,0 @@ -/*************************************************************************/ -/* version_control_editor_plugin.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#include "version_control_editor_plugin.h" - -#include "core/bind/core_bind.h" -#include "core/os/keyboard.h" -#include "core/script_language.h" -#include "editor/editor_file_system.h" -#include "editor/editor_node.h" -#include "editor/editor_scale.h" -#include "editor/filesystem_dock.h" - -#define CHECK_PLUGIN_INITIALIZED() \ - ERR_FAIL_COND_MSG(!EditorVCSInterface::get_singleton(), "No VCS plugin is initialized. Select a Version Control Plugin from Project menu."); - -VersionControlEditorPlugin *VersionControlEditorPlugin::singleton = nullptr; - -void VersionControlEditorPlugin::_bind_methods() { - ClassDB::bind_method(D_METHOD("_initialize_vcs"), &VersionControlEditorPlugin::_initialize_vcs); - ClassDB::bind_method(D_METHOD("_set_credentials"), &VersionControlEditorPlugin::_set_credentials); - ClassDB::bind_method(D_METHOD("_update_set_up_warning"), &VersionControlEditorPlugin::_update_set_up_warning); - ClassDB::bind_method(D_METHOD("_commit"), &VersionControlEditorPlugin::_commit); - ClassDB::bind_method(D_METHOD("_refresh_stage_area"), &VersionControlEditorPlugin::_refresh_stage_area); - ClassDB::bind_method(D_METHOD("_move_all"), &VersionControlEditorPlugin::_move_all); - ClassDB::bind_method(D_METHOD("_load_diff"), &VersionControlEditorPlugin::_load_diff); - ClassDB::bind_method(D_METHOD("_display_diff"), &VersionControlEditorPlugin::_display_diff); - ClassDB::bind_method(D_METHOD("_item_activated"), &VersionControlEditorPlugin::_item_activated); - ClassDB::bind_method(D_METHOD("_update_branch_create_button"), &VersionControlEditorPlugin::_update_branch_create_button); - ClassDB::bind_method(D_METHOD("_update_remote_create_button"), &VersionControlEditorPlugin::_update_remote_create_button); - ClassDB::bind_method(D_METHOD("_update_commit_button"), &VersionControlEditorPlugin::_update_commit_button); - ClassDB::bind_method(D_METHOD("_refresh_branch_list"), &VersionControlEditorPlugin::_refresh_branch_list); - ClassDB::bind_method(D_METHOD("_refresh_commit_list"), &VersionControlEditorPlugin::_refresh_commit_list); - ClassDB::bind_method(D_METHOD("_refresh_remote_list"), &VersionControlEditorPlugin::_refresh_remote_list); - ClassDB::bind_method(D_METHOD("_ssh_public_key_selected"), &VersionControlEditorPlugin::_ssh_public_key_selected); - ClassDB::bind_method(D_METHOD("_ssh_private_key_selected"), &VersionControlEditorPlugin::_ssh_private_key_selected); - ClassDB::bind_method(D_METHOD("_commit_message_gui_input"), &VersionControlEditorPlugin::_commit_message_gui_input); - ClassDB::bind_method(D_METHOD("_cell_button_pressed"), &VersionControlEditorPlugin::_cell_button_pressed); - ClassDB::bind_method(D_METHOD("_discard_all"), &VersionControlEditorPlugin::_discard_all); - ClassDB::bind_method(D_METHOD("_create_branch"), &VersionControlEditorPlugin::_create_branch); - ClassDB::bind_method(D_METHOD("_create_remote"), &VersionControlEditorPlugin::_create_remote); - ClassDB::bind_method(D_METHOD("_remove_branch"), &VersionControlEditorPlugin::_remove_branch); - ClassDB::bind_method(D_METHOD("_remove_remote"), &VersionControlEditorPlugin::_remove_remote); - ClassDB::bind_method(D_METHOD("_branch_item_selected"), &VersionControlEditorPlugin::_branch_item_selected); - ClassDB::bind_method(D_METHOD("_remote_selected"), &VersionControlEditorPlugin::_remote_selected); - ClassDB::bind_method(D_METHOD("_fetch"), &VersionControlEditorPlugin::_fetch); - ClassDB::bind_method(D_METHOD("_pull"), &VersionControlEditorPlugin::_pull); - ClassDB::bind_method(D_METHOD("_push"), &VersionControlEditorPlugin::_push); - ClassDB::bind_method(D_METHOD("_extra_option_selected"), &VersionControlEditorPlugin::_extra_option_selected); - ClassDB::bind_method(D_METHOD("_update_extra_options"), &VersionControlEditorPlugin::_update_extra_options); - ClassDB::bind_method(D_METHOD("_popup_branch_remove_confirm"), &VersionControlEditorPlugin::_popup_branch_remove_confirm); - ClassDB::bind_method(D_METHOD("_popup_remote_remove_confirm"), &VersionControlEditorPlugin::_popup_remote_remove_confirm); - - ClassDB::bind_method(D_METHOD("popup_vcs_set_up_dialog"), &VersionControlEditorPlugin::popup_vcs_set_up_dialog); -} - -void VersionControlEditorPlugin::_notification(int p_what) { - if (p_what == NOTIFICATION_READY) { - String installed_plugin = GLOBAL_GET("editor/version_control/plugin_name"); - bool has_autoload_enable = GLOBAL_GET("editor/version_control/autoload_on_startup"); - - if (installed_plugin != "" && has_autoload_enable) { - if (_load_plugin(installed_plugin)) { - _set_up(); - _set_credentials(); - } - } - } -} - -void VersionControlEditorPlugin::_populate_available_vcs_names() { - static bool called = false; - - if (!called) { - List available_plugins = get_available_vcs_names(); - for (int i = 0; i < available_plugins.size(); i++) { - set_up_choice->add_item(available_plugins[i]); - } - - called = true; - } -} - -VersionControlEditorPlugin *VersionControlEditorPlugin::get_singleton() { - return singleton ? singleton : memnew(VersionControlEditorPlugin); -} - -void VersionControlEditorPlugin::popup_vcs_set_up_dialog(const Control *p_gui_base) { - fetch_available_vcs_plugin_names(); - List available_plugins = get_available_vcs_names(); - if (available_plugins.size() >= 1) { - Size2 popup_size = Size2(400, 100); - Size2 window_size = p_gui_base->get_viewport_rect().size; - popup_size.x = MIN(window_size.x * 0.5, popup_size.x); - popup_size.y = MIN(window_size.y * 0.5, popup_size.y); - - _populate_available_vcs_names(); - - set_up_dialog->popup_centered_clamped(popup_size * EDSCALE); - } else { - EditorNode::get_singleton()->show_warning(TTR("No VCS plugins are available."), TTR("Error")); - } -} - -void VersionControlEditorPlugin::_initialize_vcs() { - ERR_FAIL_COND_MSG(EditorVCSInterface::get_singleton(), EditorVCSInterface::get_singleton()->get_vcs_name() + " is already active."); - - const int id = set_up_choice->get_selected_id(); - String selected_plugin = set_up_choice->get_item_text(id); - - if (_load_plugin(selected_plugin)) { - _set_up(); - - ProjectSettings::get_singleton()->set("editor/version_control/autoload_on_startup", true); - ProjectSettings::get_singleton()->set("editor/version_control/plugin_name", selected_plugin); - ProjectSettings::get_singleton()->save(); - } -} - -void VersionControlEditorPlugin::_set_credentials() { - CHECK_PLUGIN_INITIALIZED(); - - String username = set_up_username->get_text(); - String password = set_up_password->get_text(); - String ssh_public_key = set_up_ssh_public_key_path->get_text(); - String ssh_private_key = set_up_ssh_private_key_path->get_text(); - String ssh_passphrase = set_up_ssh_passphrase->get_text(); - - EditorVCSInterface::get_singleton()->set_credentials( - username, - password, - ssh_public_key, - ssh_private_key, - ssh_passphrase); - - EditorSettings::get_singleton()->set_setting("version_control/username", username); - EditorSettings::get_singleton()->set_setting("version_control/ssh_public_key_path", ssh_public_key); - EditorSettings::get_singleton()->set_setting("version_control/ssh_private_key_path", ssh_private_key); -} - -bool VersionControlEditorPlugin::_load_plugin(String p_name) { - String path = ScriptServer::get_global_class_path(p_name); - Ref