6f4d233062
Removes separate `Command` key (use `Meta` instead). Adds an event flag to automatically remap `Command` <-> `Control` (cannot be set alongside `Control` or `Meta`).
1581 lines
68 KiB
C++
1581 lines
68 KiB
C++
/*************************************************************************/
|
|
/* 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/config/project_settings.h"
|
|
#include "core/os/keyboard.h"
|
|
#include "core/os/time.h"
|
|
#include "editor/editor_file_system.h"
|
|
#include "editor/editor_node.h"
|
|
#include "editor/editor_scale.h"
|
|
#include "editor/editor_settings.h"
|
|
#include "editor/filesystem_dock.h"
|
|
#include "scene/gui/separator.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("_set_commit_list_size"), &VersionControlEditorPlugin::_set_commit_list_size);
|
|
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_file_dialog"), &VersionControlEditorPlugin::_popup_file_dialog);
|
|
|
|
ClassDB::bind_method(D_METHOD("popup_vcs_set_up_dialog"), &VersionControlEditorPlugin::popup_vcs_set_up_dialog);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_create_vcs_metadata_files() {
|
|
String dir = "res://";
|
|
EditorVCSInterface::create_vcs_metadata_files(EditorVCSInterface::VCSMetadata(metadata_selection->get_selected()), dir);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_notification(int p_what) {
|
|
if (p_what == NOTIFICATION_READY) {
|
|
String installed_plugin = GLOBAL_DEF("editor/version_control/plugin_name", "");
|
|
String project_path = GLOBAL_DEF("editor/version_control/project_path", OS::get_singleton()->get_resource_dir());
|
|
project_path_input->set_text(project_path);
|
|
bool has_autoload_enable = GLOBAL_DEF("editor/version_control/autoload_on_startup", false);
|
|
|
|
if (installed_plugin != "" && has_autoload_enable) {
|
|
if (_load_plugin(installed_plugin, project_path)) {
|
|
_set_credentials();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_populate_available_vcs_names() {
|
|
set_up_choice->clear();
|
|
for (int i = 0; i < available_plugins.size(); i++) {
|
|
set_up_choice->add_item(available_plugins[i]);
|
|
}
|
|
}
|
|
|
|
VersionControlEditorPlugin *VersionControlEditorPlugin::get_singleton() {
|
|
return singleton ? singleton : memnew(VersionControlEditorPlugin);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::popup_vcs_metadata_dialog() {
|
|
metadata_dialog->popup_centered();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::popup_vcs_set_up_dialog(const Control *p_gui_base) {
|
|
fetch_available_vcs_plugin_names();
|
|
if (!available_plugins.is_empty()) {
|
|
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 {
|
|
// TODO: Give info to user on how to fix this error.
|
|
EditorNode::get_singleton()->show_warning(TTR("No VCS plugins are available in the project. Install a VCS plugin to use VCS integration features."), 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, project_path_input->get_text())) {
|
|
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()->set("editor/version_control/project_path", project_path_input->get_text());
|
|
ProjectSettings::get_singleton()->save();
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_set_vcs_ui_state(bool p_enabled) {
|
|
select_project_path_button->set_disabled(p_enabled);
|
|
set_up_dialog->get_ok_button()->set_disabled(!p_enabled);
|
|
project_path_input->set_editable(!p_enabled);
|
|
set_up_choice->set_disabled(p_enabled);
|
|
toggle_vcs_choice->set_pressed_no_signal(p_enabled);
|
|
}
|
|
|
|
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 p_project_path) {
|
|
Object *extension_instance = ClassDB::instantiate(p_name);
|
|
ERR_FAIL_NULL_V_MSG(extension_instance, false, "Received a nullptr VCS extension instance during construction.");
|
|
|
|
EditorVCSInterface *vcs_plugin = Object::cast_to<EditorVCSInterface>(extension_instance);
|
|
ERR_FAIL_NULL_V_MSG(vcs_plugin, false, vformat("Could not cast VCS extension instance to %s.", EditorVCSInterface::get_class_static()));
|
|
|
|
String res_dir = project_path_input->get_text();
|
|
|
|
ERR_FAIL_COND_V_MSG(!vcs_plugin->initialize(res_dir), false, "Could not initialize " + p_name);
|
|
|
|
EditorVCSInterface::set_singleton(vcs_plugin);
|
|
|
|
register_editor();
|
|
EditorFileSystem::get_singleton()->connect(SNAME("filesystem_changed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area));
|
|
|
|
_refresh_stage_area();
|
|
_refresh_commit_list();
|
|
_refresh_branch_list();
|
|
_refresh_remote_list();
|
|
|
|
return true;
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_update_set_up_warning(String p_new_text) {
|
|
bool empty_settings = set_up_username->get_text().strip_edges().is_empty() &&
|
|
set_up_password->get_text().is_empty() &&
|
|
set_up_ssh_public_key_path->get_text().strip_edges().is_empty() &&
|
|
set_up_ssh_private_key_path->get_text().strip_edges().is_empty() &&
|
|
set_up_ssh_passphrase->get_text().is_empty();
|
|
|
|
if (empty_settings) {
|
|
set_up_warning_text->add_theme_color_override(SNAME("font_color"), EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("warning_color"), SNAME("Editor")));
|
|
set_up_warning_text->set_text(TTR("Remote settings are empty. VCS features that use the network may not work."));
|
|
} else {
|
|
set_up_warning_text->set_text("");
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_refresh_branch_list() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
List<String> branch_list = EditorVCSInterface::get_singleton()->get_branch_list();
|
|
branch_select->clear();
|
|
|
|
branch_select->set_disabled(branch_list.is_empty());
|
|
|
|
String current_branch = EditorVCSInterface::get_singleton()->get_current_branch_name();
|
|
|
|
for (int i = 0; i < branch_list.size(); i++) {
|
|
branch_select->add_icon_item(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("VcsBranches"), SNAME("EditorIcons")), branch_list[i], i);
|
|
|
|
if (branch_list[i] == current_branch) {
|
|
branch_select->select(i);
|
|
}
|
|
}
|
|
}
|
|
|
|
String VersionControlEditorPlugin::_get_date_string_from(int64_t p_unix_timestamp, int64_t p_offset_minutes) const {
|
|
return vformat(
|
|
"%s %s",
|
|
Time::get_singleton()->get_datetime_string_from_unix_time(p_unix_timestamp + p_offset_minutes * 60, true),
|
|
Time::get_singleton()->get_offset_string_from_offset_minutes(p_offset_minutes));
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_set_commit_list_size(int p_index) {
|
|
_refresh_commit_list();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_refresh_commit_list() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
commit_list->get_root()->clear_children();
|
|
|
|
List<EditorVCSInterface::Commit> commit_info_list = EditorVCSInterface::get_singleton()->get_previous_commits(commit_list_size_button->get_selected_metadata());
|
|
|
|
for (List<EditorVCSInterface::Commit>::Element *e = commit_info_list.front(); e; e = e->next()) {
|
|
EditorVCSInterface::Commit commit = e->get();
|
|
TreeItem *item = commit_list->create_item();
|
|
|
|
// Only display the first line of a commit message
|
|
int line_ending = commit.msg.find_char('\n');
|
|
String commit_display_msg = commit.msg.substr(0, line_ending);
|
|
String commit_date_string = _get_date_string_from(commit.unix_timestamp, commit.offset_minutes);
|
|
|
|
Dictionary meta_data;
|
|
meta_data[SNAME("commit_id")] = commit.id;
|
|
meta_data[SNAME("commit_title")] = commit_display_msg;
|
|
meta_data[SNAME("commit_subtitle")] = commit.msg.substr(line_ending).strip_edges();
|
|
meta_data[SNAME("commit_unix_timestamp")] = commit.unix_timestamp;
|
|
meta_data[SNAME("commit_author")] = commit.author;
|
|
meta_data[SNAME("commit_date_string")] = commit_date_string;
|
|
|
|
item->set_text(0, commit_display_msg);
|
|
item->set_text(1, commit.author.strip_edges());
|
|
item->set_metadata(0, meta_data);
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_refresh_remote_list() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
List<String> remotes = EditorVCSInterface::get_singleton()->get_remotes();
|
|
|
|
String current_remote = remote_select->get_selected_metadata();
|
|
remote_select->clear();
|
|
|
|
remote_select->set_disabled(remotes.is_empty());
|
|
|
|
for (int i = 0; i < remotes.size(); i++) {
|
|
remote_select->add_icon_item(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("ArrowUp"), SNAME("EditorIcons")), remotes[i], i);
|
|
remote_select->set_item_metadata(i, remotes[i]);
|
|
|
|
if (remotes[i] == current_remote) {
|
|
remote_select->select(i);
|
|
}
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_commit() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
String msg = commit_message->get_text().strip_edges();
|
|
|
|
ERR_FAIL_COND_MSG(msg.is_empty(), "No commit message was provided.");
|
|
|
|
EditorVCSInterface::get_singleton()->commit(msg);
|
|
|
|
version_control_dock_button->set_pressed(false);
|
|
|
|
commit_message->release_focus();
|
|
commit_button->release_focus();
|
|
commit_message->set_text("");
|
|
|
|
_refresh_stage_area();
|
|
_refresh_commit_list();
|
|
_refresh_branch_list();
|
|
_clear_diff();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_branch_item_selected(int p_index) {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
String branch_name = branch_select->get_item_text(p_index);
|
|
EditorVCSInterface::get_singleton()->checkout_branch(branch_name);
|
|
|
|
EditorFileSystem::get_singleton()->scan_changes();
|
|
ScriptEditor::get_singleton()->reload_scripts();
|
|
|
|
_refresh_branch_list();
|
|
_refresh_commit_list();
|
|
_refresh_stage_area();
|
|
_clear_diff();
|
|
|
|
_update_opened_tabs();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_remote_selected(int p_index) {
|
|
_refresh_remote_list();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_ssh_public_key_selected(String p_path) {
|
|
set_up_ssh_public_key_path->set_text(p_path);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_ssh_private_key_selected(String p_path) {
|
|
set_up_ssh_private_key_path->set_text(p_path);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_popup_file_dialog(Variant p_file_dialog_variant) {
|
|
FileDialog *file_dialog = Object::cast_to<FileDialog>(p_file_dialog_variant);
|
|
ERR_FAIL_NULL(file_dialog);
|
|
|
|
file_dialog->popup_centered_ratio();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_create_branch() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
String new_branch_name = branch_create_name_input->get_text().strip_edges();
|
|
|
|
EditorVCSInterface::get_singleton()->create_branch(new_branch_name);
|
|
EditorVCSInterface::get_singleton()->checkout_branch(new_branch_name);
|
|
|
|
branch_create_name_input->clear();
|
|
_refresh_branch_list();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_create_remote() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
String new_remote_name = remote_create_name_input->get_text().strip_edges();
|
|
String new_remote_url = remote_create_url_input->get_text().strip_edges();
|
|
|
|
EditorVCSInterface::get_singleton()->create_remote(new_remote_name, new_remote_url);
|
|
|
|
remote_create_name_input->clear();
|
|
remote_create_url_input->clear();
|
|
_refresh_remote_list();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_update_branch_create_button(String p_new_text) {
|
|
branch_create_ok->set_disabled(p_new_text.strip_edges().is_empty());
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_update_remote_create_button(String p_new_text) {
|
|
remote_create_ok->set_disabled(p_new_text.strip_edges().is_empty());
|
|
}
|
|
|
|
int VersionControlEditorPlugin::_get_item_count(Tree *p_tree) {
|
|
if (!p_tree->get_root()) {
|
|
return 0;
|
|
}
|
|
return p_tree->get_root()->get_children().size();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_refresh_stage_area() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
staged_files->get_root()->clear_children();
|
|
unstaged_files->get_root()->clear_children();
|
|
|
|
List<EditorVCSInterface::StatusFile> status_files = EditorVCSInterface::get_singleton()->get_modified_files_data();
|
|
for (List<EditorVCSInterface::StatusFile>::Element *E = status_files.front(); E; E = E->next()) {
|
|
EditorVCSInterface::StatusFile sf = E->get();
|
|
if (sf.area == EditorVCSInterface::TREE_AREA_STAGED) {
|
|
_add_new_item(staged_files, sf.file_path, sf.change_type);
|
|
} else if (sf.area == EditorVCSInterface::TREE_AREA_UNSTAGED) {
|
|
_add_new_item(unstaged_files, sf.file_path, sf.change_type);
|
|
}
|
|
}
|
|
|
|
staged_files->queue_redraw();
|
|
unstaged_files->queue_redraw();
|
|
|
|
int total_changes = status_files.size();
|
|
String commit_tab_title = TTR("Commit") + (total_changes > 0 ? " (" + itos(total_changes) + ")" : "");
|
|
version_commit_dock->set_name(commit_tab_title);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_discard_file(String p_file_path, EditorVCSInterface::ChangeType p_change) {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
if (p_change == EditorVCSInterface::CHANGE_TYPE_NEW) {
|
|
Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_RESOURCES);
|
|
dir->remove(p_file_path);
|
|
} else {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
EditorVCSInterface::get_singleton()->discard_file(p_file_path);
|
|
}
|
|
// FIXIT: The project.godot file shows weird behaviour
|
|
EditorFileSystem::get_singleton()->update_file(p_file_path);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_discard_all() {
|
|
TreeItem *file_entry = unstaged_files->get_root()->get_first_child();
|
|
while (file_entry) {
|
|
String file_path = file_entry->get_meta(SNAME("file_path"));
|
|
EditorVCSInterface::ChangeType change = (EditorVCSInterface::ChangeType)(int)file_entry->get_meta(SNAME("change_type"));
|
|
_discard_file(file_path, change);
|
|
|
|
file_entry = file_entry->get_next();
|
|
}
|
|
_refresh_stage_area();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_add_new_item(Tree *p_tree, String p_file_path, EditorVCSInterface::ChangeType p_change) {
|
|
String change_text = p_file_path + " (" + change_type_to_strings[p_change] + ")";
|
|
|
|
TreeItem *new_item = p_tree->create_item();
|
|
new_item->set_text(0, change_text);
|
|
new_item->set_icon(0, change_type_to_icon[p_change]);
|
|
new_item->set_meta(SNAME("file_path"), p_file_path);
|
|
new_item->set_meta(SNAME("change_type"), p_change);
|
|
new_item->set_custom_color(0, change_type_to_color[p_change]);
|
|
|
|
new_item->add_button(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("File"), SNAME("EditorIcons")), BUTTON_TYPE_OPEN, false, TTR("Open in editor"));
|
|
if (p_tree == unstaged_files) {
|
|
new_item->add_button(0, EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Close"), SNAME("EditorIcons")), BUTTON_TYPE_DISCARD, false, TTR("Discard changes"));
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_fetch() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
EditorVCSInterface::get_singleton()->fetch(remote_select->get_selected_metadata());
|
|
_refresh_branch_list();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_pull() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
EditorVCSInterface::get_singleton()->pull(remote_select->get_selected_metadata());
|
|
_refresh_stage_area();
|
|
_refresh_branch_list();
|
|
_refresh_commit_list();
|
|
_clear_diff();
|
|
_update_opened_tabs();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_push() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
EditorVCSInterface::get_singleton()->push(remote_select->get_selected_metadata(), false);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_force_push() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
EditorVCSInterface::get_singleton()->push(remote_select->get_selected_metadata(), true);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_update_opened_tabs() {
|
|
Vector<EditorData::EditedScene> open_scenes = EditorNode::get_singleton()->get_editor_data().get_edited_scenes();
|
|
for (int i = 0; i < open_scenes.size(); i++) {
|
|
if (open_scenes[i].root == NULL) {
|
|
continue;
|
|
}
|
|
EditorNode::get_singleton()->reload_scene(open_scenes[i].path);
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_move_all(Object *p_tree) {
|
|
Tree *tree = Object::cast_to<Tree>(p_tree);
|
|
|
|
TreeItem *file_entry = tree->get_root()->get_first_child();
|
|
while (file_entry) {
|
|
_move_item(tree, file_entry);
|
|
|
|
file_entry = file_entry->get_next();
|
|
}
|
|
_refresh_stage_area();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_load_diff(Object *p_tree) {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
version_control_dock_button->set_pressed(true);
|
|
|
|
Tree *tree = Object::cast_to<Tree>(p_tree);
|
|
if (tree == staged_files) {
|
|
show_commit_diff_header = false;
|
|
String file_path = tree->get_selected()->get_meta(SNAME("file_path"));
|
|
diff_title->set_text(TTR("Staged Changes"));
|
|
diff_content = EditorVCSInterface::get_singleton()->get_diff(file_path, EditorVCSInterface::TREE_AREA_STAGED);
|
|
} else if (tree == unstaged_files) {
|
|
show_commit_diff_header = false;
|
|
String file_path = tree->get_selected()->get_meta(SNAME("file_path"));
|
|
diff_title->set_text(TTR("Unstaged Changes"));
|
|
diff_content = EditorVCSInterface::get_singleton()->get_diff(file_path, EditorVCSInterface::TREE_AREA_UNSTAGED);
|
|
} else if (tree == commit_list) {
|
|
show_commit_diff_header = true;
|
|
Dictionary meta_data = tree->get_selected()->get_metadata(0);
|
|
String commit_id = meta_data[SNAME("commit_id")];
|
|
String commit_title = meta_data[SNAME("commit_title")];
|
|
diff_title->set_text(commit_title);
|
|
diff_content = EditorVCSInterface::get_singleton()->get_diff(commit_id, EditorVCSInterface::TREE_AREA_COMMIT);
|
|
}
|
|
_display_diff(0);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_clear_diff() {
|
|
diff->clear();
|
|
diff_content.clear();
|
|
diff_title->set_text("");
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_item_activated(Object *p_tree) {
|
|
Tree *tree = Object::cast_to<Tree>(p_tree);
|
|
|
|
_move_item(tree, tree->get_selected());
|
|
_refresh_stage_area();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_move_item(Tree *p_tree, TreeItem *p_item) {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
if (p_tree == staged_files) {
|
|
EditorVCSInterface::get_singleton()->unstage_file(p_item->get_meta(SNAME("file_path")));
|
|
} else {
|
|
EditorVCSInterface::get_singleton()->stage_file(p_item->get_meta(SNAME("file_path")));
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_cell_button_pressed(Object *p_item, int p_column, int p_id, int p_mouse_button_index) {
|
|
TreeItem *item = Object::cast_to<TreeItem>(p_item);
|
|
String file_path = item->get_meta(SNAME("file_path"));
|
|
EditorVCSInterface::ChangeType change = (EditorVCSInterface::ChangeType)(int)item->get_meta(SNAME("change_type"));
|
|
|
|
if (p_id == BUTTON_TYPE_OPEN && change != EditorVCSInterface::CHANGE_TYPE_DELETED) {
|
|
Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_RESOURCES);
|
|
if (!dir->file_exists(file_path)) {
|
|
return;
|
|
}
|
|
|
|
file_path = "res://" + file_path;
|
|
if (ResourceLoader::get_resource_type(file_path) == "PackedScene") {
|
|
EditorNode::get_singleton()->open_request(file_path);
|
|
} else if (file_path.ends_with(".gd")) {
|
|
EditorNode::get_singleton()->load_resource(file_path);
|
|
ScriptEditor::get_singleton()->reload_scripts();
|
|
} else {
|
|
FileSystemDock::get_singleton()->navigate_to_path(file_path);
|
|
}
|
|
|
|
} else if (p_id == BUTTON_TYPE_DISCARD) {
|
|
_discard_file(file_path, change);
|
|
_refresh_stage_area();
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_display_diff(int p_idx) {
|
|
DiffViewType diff_view = (DiffViewType)diff_view_type_select->get_selected();
|
|
|
|
diff->clear();
|
|
|
|
if (show_commit_diff_header) {
|
|
Dictionary meta_data = commit_list->get_selected()->get_metadata(0);
|
|
String commit_id = meta_data[SNAME("commit_id")];
|
|
String commit_subtitle = meta_data[SNAME("commit_subtitle")];
|
|
String commit_date = meta_data[SNAME("commit_date")];
|
|
String commit_author = meta_data[SNAME("commit_author")];
|
|
String commit_date_string = meta_data[SNAME("commit_date_string")];
|
|
|
|
diff->push_font(EditorNode::get_singleton()->get_gui_base()->get_theme_font(SNAME("doc_bold"), SNAME("EditorFonts")));
|
|
diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("accent_color"), SNAME("Editor")));
|
|
diff->add_text(TTR("Commit:") + " " + commit_id);
|
|
diff->add_newline();
|
|
diff->add_text(TTR("Author:") + " " + commit_author);
|
|
diff->add_newline();
|
|
diff->add_text(TTR("Date:") + " " + commit_date_string);
|
|
diff->add_newline();
|
|
if (!commit_subtitle.is_empty()) {
|
|
diff->add_text(TTR("Subtitle:") + " " + commit_subtitle);
|
|
diff->add_newline();
|
|
}
|
|
diff->add_newline();
|
|
diff->pop();
|
|
diff->pop();
|
|
}
|
|
|
|
for (int i = 0; i < diff_content.size(); i++) {
|
|
EditorVCSInterface::DiffFile diff_file = diff_content[i];
|
|
|
|
diff->push_font(EditorNode::get_singleton()->get_gui_base()->get_theme_font(SNAME("doc_bold"), SNAME("EditorFonts")));
|
|
diff->push_color(EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("accent_color"), SNAME("Editor")));
|
|
diff->add_text(TTR("File:") + " " + diff_file.new_file);
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->add_newline();
|
|
diff->push_font(EditorNode::get_singleton()->get_gui_base()->get_theme_font(SNAME("status_source"), SNAME("EditorFonts")));
|
|
for (int j = 0; j < diff_file.diff_hunks.size(); j++) {
|
|
EditorVCSInterface::DiffHunk hunk = diff_file.diff_hunks[j];
|
|
|
|
String old_start = String::num_int64(hunk.old_start);
|
|
String new_start = String::num_int64(hunk.new_start);
|
|
String old_lines = String::num_int64(hunk.old_lines);
|
|
String new_lines = String::num_int64(hunk.new_lines);
|
|
|
|
diff->append_text("[center]@@ " + old_start + "," + old_lines + " " + new_start + "," + new_lines + " @@[/center]");
|
|
diff->add_newline();
|
|
|
|
switch (diff_view) {
|
|
case DIFF_VIEW_TYPE_SPLIT:
|
|
_display_diff_split_view(hunk.diff_lines);
|
|
break;
|
|
case DIFF_VIEW_TYPE_UNIFIED:
|
|
_display_diff_unified_view(hunk.diff_lines);
|
|
break;
|
|
}
|
|
diff->add_newline();
|
|
diff->add_newline();
|
|
}
|
|
diff->pop();
|
|
|
|
diff->add_newline();
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_display_diff_split_view(List<EditorVCSInterface::DiffLine> &p_diff_content) {
|
|
List<EditorVCSInterface::DiffLine> parsed_diff;
|
|
|
|
for (int i = 0; i < p_diff_content.size(); i++) {
|
|
EditorVCSInterface::DiffLine diff_line = p_diff_content[i];
|
|
String line = diff_line.content.strip_edges(false, true);
|
|
|
|
if (diff_line.new_line_no >= 0 && diff_line.old_line_no >= 0) {
|
|
diff_line.new_text = line;
|
|
diff_line.old_text = line;
|
|
parsed_diff.push_back(diff_line);
|
|
} else if (diff_line.new_line_no == -1) {
|
|
diff_line.new_text = "";
|
|
diff_line.old_text = line;
|
|
parsed_diff.push_back(diff_line);
|
|
} else if (diff_line.old_line_no == -1) {
|
|
int j = parsed_diff.size() - 1;
|
|
while (j >= 0 && parsed_diff[j].new_line_no == -1) {
|
|
j--;
|
|
}
|
|
|
|
if (j == parsed_diff.size() - 1) {
|
|
// no lines are modified
|
|
diff_line.new_text = line;
|
|
diff_line.old_text = "";
|
|
parsed_diff.push_back(diff_line);
|
|
} else {
|
|
// lines are modified
|
|
EditorVCSInterface::DiffLine modified_line = parsed_diff[j + 1];
|
|
modified_line.new_text = line;
|
|
modified_line.new_line_no = diff_line.new_line_no;
|
|
parsed_diff[j + 1] = modified_line;
|
|
}
|
|
}
|
|
}
|
|
|
|
diff->push_table(6);
|
|
/*
|
|
[cell]Old Line No[/cell]
|
|
[cell]prefix[/cell]
|
|
[cell]Old Code[/cell]
|
|
|
|
[cell]New Line No[/cell]
|
|
[cell]prefix[/cell]
|
|
[cell]New Line[/cell]
|
|
*/
|
|
|
|
diff->set_table_column_expand(2, true);
|
|
diff->set_table_column_expand(5, true);
|
|
|
|
for (int i = 0; i < parsed_diff.size(); i++) {
|
|
EditorVCSInterface::DiffLine diff_line = parsed_diff[i];
|
|
|
|
bool has_change = diff_line.status != " ";
|
|
static const Color red = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("error_color"), SNAME("Editor"));
|
|
static const Color green = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("success_color"), SNAME("Editor"));
|
|
static const Color white = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("font_color"), SNAME("Label")) * Color(1, 1, 1, 0.6);
|
|
|
|
if (diff_line.old_line_no >= 0) {
|
|
diff->push_cell();
|
|
diff->push_indent(1);
|
|
diff->push_color(has_change ? red : white);
|
|
diff->add_text(String::num_int64(diff_line.old_line_no));
|
|
diff->pop();
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->push_color(has_change ? red : white);
|
|
diff->add_text(has_change ? "-|" : " |");
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->push_color(has_change ? red : white);
|
|
diff->add_text(diff_line.old_text);
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
} else {
|
|
diff->push_cell();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->pop();
|
|
}
|
|
|
|
if (diff_line.new_line_no >= 0) {
|
|
diff->push_cell();
|
|
diff->push_indent(1);
|
|
diff->push_color(has_change ? green : white);
|
|
diff->add_text(String::num_int64(diff_line.new_line_no));
|
|
diff->pop();
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->push_color(has_change ? green : white);
|
|
diff->add_text(has_change ? "+|" : " |");
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->push_color(has_change ? green : white);
|
|
diff->add_text(diff_line.new_text);
|
|
diff->pop();
|
|
diff->pop();
|
|
} else {
|
|
diff->push_cell();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->pop();
|
|
}
|
|
}
|
|
diff->pop();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_display_diff_unified_view(List<EditorVCSInterface::DiffLine> &p_diff_content) {
|
|
diff->push_table(4);
|
|
diff->set_table_column_expand(3, true);
|
|
|
|
/*
|
|
[cell]Old Line No[/cell]
|
|
[cell]New Line No[/cell]
|
|
[cell]status[/cell]
|
|
[cell]code[/cell]
|
|
*/
|
|
for (int i = 0; i < p_diff_content.size(); i++) {
|
|
EditorVCSInterface::DiffLine diff_line = p_diff_content[i];
|
|
String line = diff_line.content.strip_edges(false, true);
|
|
|
|
Color color;
|
|
if (diff_line.status == "+") {
|
|
color = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("success_color"), SNAME("Editor"));
|
|
} else if (diff_line.status == "-") {
|
|
color = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("error_color"), SNAME("Editor"));
|
|
} else {
|
|
color = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("font_color"), SNAME("Label"));
|
|
color *= Color(1, 1, 1, 0.6);
|
|
}
|
|
|
|
diff->push_cell();
|
|
diff->push_color(color);
|
|
diff->push_indent(1);
|
|
diff->add_text(diff_line.old_line_no >= 0 ? String::num_int64(diff_line.old_line_no) : "");
|
|
diff->pop();
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->push_color(color);
|
|
diff->push_indent(1);
|
|
diff->add_text(diff_line.new_line_no >= 0 ? String::num_int64(diff_line.new_line_no) : "");
|
|
diff->pop();
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->push_color(color);
|
|
diff->add_text(diff_line.status != "" ? diff_line.status + "|" : " |");
|
|
diff->pop();
|
|
diff->pop();
|
|
|
|
diff->push_cell();
|
|
diff->push_color(color);
|
|
diff->add_text(line);
|
|
diff->pop();
|
|
diff->pop();
|
|
}
|
|
|
|
diff->pop();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_update_commit_button() {
|
|
commit_button->set_disabled(commit_message->get_text().strip_edges().is_empty());
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_remove_branch() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
EditorVCSInterface::get_singleton()->remove_branch(branch_to_remove);
|
|
branch_to_remove.clear();
|
|
|
|
_refresh_branch_list();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_remove_remote() {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
EditorVCSInterface::get_singleton()->remove_remote(remote_to_remove);
|
|
remote_to_remove.clear();
|
|
|
|
_refresh_remote_list();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_extra_option_selected(int p_index) {
|
|
CHECK_PLUGIN_INITIALIZED();
|
|
|
|
switch ((ExtraOption)p_index) {
|
|
case EXTRA_OPTION_FORCE_PUSH:
|
|
_force_push();
|
|
break;
|
|
case EXTRA_OPTION_CREATE_BRANCH:
|
|
branch_create_confirm->popup_centered();
|
|
break;
|
|
case EXTRA_OPTION_CREATE_REMOTE:
|
|
remote_create_confirm->popup_centered();
|
|
break;
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_popup_branch_remove_confirm(int p_index) {
|
|
branch_to_remove = extra_options_remove_branch_list->get_item_text(p_index);
|
|
|
|
branch_remove_confirm->set_text(vformat(TTR("Do you want to remove the %s branch?"), branch_to_remove));
|
|
branch_remove_confirm->popup_centered();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_popup_remote_remove_confirm(int p_index) {
|
|
remote_to_remove = extra_options_remove_remote_list->get_item_text(p_index);
|
|
|
|
remote_remove_confirm->set_text(vformat(TTR("Do you want to remove the %s remote?"), branch_to_remove));
|
|
remote_remove_confirm->popup_centered();
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_update_extra_options() {
|
|
extra_options_remove_branch_list->clear();
|
|
for (int i = 0; i < branch_select->get_item_count(); i++) {
|
|
extra_options_remove_branch_list->add_icon_item(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("VcsBranches"), SNAME("EditorIcons")), branch_select->get_item_text(branch_select->get_item_id(i)));
|
|
}
|
|
extra_options_remove_branch_list->update_canvas_items();
|
|
|
|
extra_options_remove_remote_list->clear();
|
|
for (int i = 0; i < remote_select->get_item_count(); i++) {
|
|
extra_options_remove_remote_list->add_icon_item(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("ArrowUp"), SNAME("EditorIcons")), remote_select->get_item_text(remote_select->get_item_id(i)));
|
|
}
|
|
extra_options_remove_remote_list->update_canvas_items();
|
|
}
|
|
|
|
bool VersionControlEditorPlugin::_is_staging_area_empty() {
|
|
return staged_files->get_root()->get_child_count() == 0;
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_commit_message_gui_input(const Ref<InputEvent> &p_event) {
|
|
if (!commit_message->has_focus()) {
|
|
return;
|
|
}
|
|
if (commit_message->get_text().strip_edges().is_empty()) {
|
|
// Do not allow empty commit messages.
|
|
return;
|
|
}
|
|
const Ref<InputEventKey> k = p_event;
|
|
|
|
if (k.is_valid() && k->is_pressed()) {
|
|
if (ED_IS_SHORTCUT("version_control/commit", p_event)) {
|
|
if (_is_staging_area_empty()) {
|
|
// Stage all files only when no files were previously staged.
|
|
_move_all(unstaged_files);
|
|
}
|
|
|
|
_commit();
|
|
|
|
commit_message->accept_event();
|
|
}
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_toggle_vcs_integration(bool p_toggled) {
|
|
if (p_toggled) {
|
|
_initialize_vcs();
|
|
} else {
|
|
shut_down();
|
|
}
|
|
}
|
|
|
|
void VersionControlEditorPlugin::_project_path_selected(String p_project_path) {
|
|
project_path_input->set_text(p_project_path);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::fetch_available_vcs_plugin_names() {
|
|
available_plugins.clear();
|
|
ClassDB::get_direct_inheriters_from_class(EditorVCSInterface::get_class_static(), &available_plugins);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::register_editor() {
|
|
EditorNode::get_singleton()->add_control_to_dock(EditorNode::DOCK_SLOT_RIGHT_UL, version_commit_dock);
|
|
|
|
version_control_dock_button = EditorNode::get_singleton()->add_bottom_panel_item(TTR("Version Control"), version_control_dock);
|
|
|
|
_set_vcs_ui_state(true);
|
|
}
|
|
|
|
void VersionControlEditorPlugin::shut_down() {
|
|
if (!EditorVCSInterface::get_singleton()) {
|
|
return;
|
|
}
|
|
|
|
if (EditorFileSystem::get_singleton()->is_connected(SNAME("filesystem_changed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area))) {
|
|
EditorFileSystem::get_singleton()->disconnect(SNAME("filesystem_changed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area));
|
|
}
|
|
|
|
EditorVCSInterface::get_singleton()->shut_down();
|
|
memdelete(EditorVCSInterface::get_singleton());
|
|
EditorVCSInterface::set_singleton(nullptr);
|
|
|
|
EditorNode::get_singleton()->remove_control_from_dock(version_commit_dock);
|
|
EditorNode::get_singleton()->remove_bottom_panel_item(version_control_dock);
|
|
|
|
_set_vcs_ui_state(false);
|
|
}
|
|
|
|
VersionControlEditorPlugin::VersionControlEditorPlugin() {
|
|
singleton = this;
|
|
|
|
version_control_actions = memnew(PopupMenu);
|
|
|
|
metadata_dialog = memnew(ConfirmationDialog);
|
|
metadata_dialog->set_title(TTR("Create Version Control Metadata"));
|
|
metadata_dialog->set_min_size(Size2(200, 40));
|
|
metadata_dialog->get_ok_button()->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_create_vcs_metadata_files));
|
|
version_control_actions->add_child(metadata_dialog);
|
|
|
|
VBoxContainer *metadata_vb = memnew(VBoxContainer);
|
|
metadata_dialog->add_child(metadata_vb);
|
|
|
|
HBoxContainer *metadata_hb = memnew(HBoxContainer);
|
|
metadata_hb->set_custom_minimum_size(Size2(200, 20));
|
|
metadata_vb->add_child(metadata_hb);
|
|
|
|
Label *l = memnew(Label);
|
|
l->set_text(TTR("Create VCS metadata files for:"));
|
|
metadata_hb->add_child(l);
|
|
|
|
metadata_selection = memnew(OptionButton);
|
|
metadata_selection->set_custom_minimum_size(Size2(100, 20));
|
|
metadata_selection->add_item("None", (int)EditorVCSInterface::VCSMetadata::NONE);
|
|
metadata_selection->add_item("Git", (int)EditorVCSInterface::VCSMetadata::GIT);
|
|
metadata_selection->select((int)EditorVCSInterface::VCSMetadata::GIT);
|
|
metadata_hb->add_child(metadata_selection);
|
|
|
|
l = memnew(Label);
|
|
l->set_text(TTR("Existing VCS metadata files will be overwritten."));
|
|
metadata_vb->add_child(l);
|
|
|
|
set_up_dialog = memnew(AcceptDialog);
|
|
set_up_dialog->set_title(TTR("Local Settings"));
|
|
set_up_dialog->set_min_size(Size2(600, 100));
|
|
set_up_dialog->add_cancel_button("Cancel");
|
|
set_up_dialog->set_hide_on_ok(true);
|
|
version_control_actions->add_child(set_up_dialog);
|
|
|
|
Button *set_up_apply_button = set_up_dialog->get_ok_button();
|
|
set_up_apply_button->set_text(TTR("Apply"));
|
|
set_up_apply_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_set_credentials));
|
|
|
|
set_up_vbc = memnew(VBoxContainer);
|
|
set_up_vbc->set_alignment(BoxContainer::ALIGNMENT_CENTER);
|
|
set_up_dialog->add_child(set_up_vbc);
|
|
|
|
HBoxContainer *set_up_hbc = memnew(HBoxContainer);
|
|
set_up_hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_vbc->add_child(set_up_hbc);
|
|
|
|
Label *set_up_vcs_label = memnew(Label);
|
|
set_up_vcs_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_vcs_label->set_text(TTR("VCS Provider"));
|
|
set_up_hbc->add_child(set_up_vcs_label);
|
|
|
|
set_up_choice = memnew(OptionButton);
|
|
set_up_choice->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_hbc->add_child(set_up_choice);
|
|
|
|
HBoxContainer *project_path_hbc = memnew(HBoxContainer);
|
|
project_path_hbc->set_h_size_flags(Control::SIZE_FILL);
|
|
set_up_vbc->add_child(project_path_hbc);
|
|
|
|
Label *project_path_label = memnew(Label);
|
|
project_path_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
project_path_label->set_text(TTR("VCS Project Path"));
|
|
project_path_hbc->add_child(project_path_label);
|
|
|
|
project_path_input = memnew(LineEdit);
|
|
project_path_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
project_path_input->set_text(OS::get_singleton()->get_resource_dir());
|
|
project_path_hbc->add_child(project_path_input);
|
|
|
|
FileDialog *select_project_path_file_dialog = memnew(FileDialog);
|
|
select_project_path_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
|
|
select_project_path_file_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_DIR);
|
|
select_project_path_file_dialog->set_show_hidden_files(true);
|
|
select_project_path_file_dialog->set_current_dir(OS::get_singleton()->get_resource_dir());
|
|
select_project_path_file_dialog->connect(SNAME("dir_selected"), callable_mp(this, &VersionControlEditorPlugin::_project_path_selected));
|
|
project_path_hbc->add_child(select_project_path_file_dialog);
|
|
|
|
select_project_path_button = memnew(Button);
|
|
select_project_path_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Folder", "EditorIcons"));
|
|
select_project_path_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_popup_file_dialog).bind(select_project_path_file_dialog));
|
|
select_project_path_button->set_tooltip_text(TTR("Select VCS project path"));
|
|
project_path_hbc->add_child(select_project_path_button);
|
|
|
|
HBoxContainer *toggle_vcs_hbc = memnew(HBoxContainer);
|
|
toggle_vcs_hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_vbc->add_child(toggle_vcs_hbc);
|
|
|
|
Label *toggle_vcs_label = memnew(Label);
|
|
toggle_vcs_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
toggle_vcs_label->set_text(TTR("Connect to VCS"));
|
|
toggle_vcs_hbc->add_child(toggle_vcs_label);
|
|
|
|
toggle_vcs_choice = memnew(CheckButton);
|
|
toggle_vcs_choice->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
toggle_vcs_choice->set_pressed_no_signal(false);
|
|
toggle_vcs_choice->connect(SNAME("toggled"), callable_mp(this, &VersionControlEditorPlugin::_toggle_vcs_integration));
|
|
toggle_vcs_hbc->add_child(toggle_vcs_choice);
|
|
|
|
set_up_vbc->add_child(memnew(HSeparator));
|
|
|
|
set_up_settings_vbc = memnew(VBoxContainer);
|
|
set_up_settings_vbc->set_alignment(BoxContainer::ALIGNMENT_CENTER);
|
|
set_up_vbc->add_child(set_up_settings_vbc);
|
|
|
|
Label *remote_login = memnew(Label);
|
|
remote_login->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_login->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
|
|
remote_login->set_text(TTR("Remote Login"));
|
|
set_up_settings_vbc->add_child(remote_login);
|
|
|
|
HBoxContainer *set_up_username_input = memnew(HBoxContainer);
|
|
set_up_username_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_settings_vbc->add_child(set_up_username_input);
|
|
|
|
Label *set_up_username_label = memnew(Label);
|
|
set_up_username_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_username_label->set_text(TTR("Username"));
|
|
set_up_username_input->add_child(set_up_username_label);
|
|
|
|
set_up_username = memnew(LineEdit);
|
|
set_up_username->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_username->set_text(EDITOR_DEF("version_control/username", ""));
|
|
set_up_username->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
|
|
set_up_username_input->add_child(set_up_username);
|
|
|
|
HBoxContainer *set_up_password_input = memnew(HBoxContainer);
|
|
set_up_password_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_settings_vbc->add_child(set_up_password_input);
|
|
|
|
Label *set_up_password_label = memnew(Label);
|
|
set_up_password_label->set_text(TTR("Password"));
|
|
set_up_password_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_password_input->add_child(set_up_password_label);
|
|
|
|
set_up_password = memnew(LineEdit);
|
|
set_up_password->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_password->set_secret(true);
|
|
set_up_password->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
|
|
set_up_password_input->add_child(set_up_password);
|
|
|
|
HBoxContainer *set_up_ssh_public_key_input = memnew(HBoxContainer);
|
|
set_up_ssh_public_key_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_settings_vbc->add_child(set_up_ssh_public_key_input);
|
|
|
|
Label *set_up_ssh_public_key_label = memnew(Label);
|
|
set_up_ssh_public_key_label->set_text(TTR("SSH Public Key Path"));
|
|
set_up_ssh_public_key_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_public_key_input->add_child(set_up_ssh_public_key_label);
|
|
|
|
HBoxContainer *set_up_ssh_public_key_input_hbc = memnew(HBoxContainer);
|
|
set_up_ssh_public_key_input_hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_public_key_input->add_child(set_up_ssh_public_key_input_hbc);
|
|
|
|
set_up_ssh_public_key_path = memnew(LineEdit);
|
|
set_up_ssh_public_key_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_public_key_path->set_text(EDITOR_DEF("version_control/ssh_public_key_path", ""));
|
|
set_up_ssh_public_key_path->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
|
|
set_up_ssh_public_key_input_hbc->add_child(set_up_ssh_public_key_path);
|
|
|
|
set_up_ssh_public_key_file_dialog = memnew(FileDialog);
|
|
set_up_ssh_public_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
|
|
set_up_ssh_public_key_file_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_FILE);
|
|
set_up_ssh_public_key_file_dialog->set_show_hidden_files(true);
|
|
// TODO: Make this start at the user's home folder
|
|
Ref<DirAccess> d = DirAccess::open(OS::get_singleton()->get_system_dir(OS::SYSTEM_DIR_DOCUMENTS));
|
|
d->change_dir("../");
|
|
set_up_ssh_public_key_file_dialog->set_current_dir(d->get_current_dir());
|
|
set_up_ssh_public_key_file_dialog->connect(SNAME("file_selected"), callable_mp(this, &VersionControlEditorPlugin::_ssh_public_key_selected));
|
|
set_up_ssh_public_key_input_hbc->add_child(set_up_ssh_public_key_file_dialog);
|
|
|
|
Button *select_public_path_button = memnew(Button);
|
|
select_public_path_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Folder", "EditorIcons"));
|
|
select_public_path_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_popup_file_dialog).bind(set_up_ssh_public_key_file_dialog));
|
|
select_public_path_button->set_tooltip_text(TTR("Select SSH public key path"));
|
|
set_up_ssh_public_key_input_hbc->add_child(select_public_path_button);
|
|
|
|
HBoxContainer *set_up_ssh_private_key_input = memnew(HBoxContainer);
|
|
set_up_ssh_private_key_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_settings_vbc->add_child(set_up_ssh_private_key_input);
|
|
|
|
Label *set_up_ssh_private_key_label = memnew(Label);
|
|
set_up_ssh_private_key_label->set_text(TTR("SSH Private Key Path"));
|
|
set_up_ssh_private_key_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_private_key_input->add_child(set_up_ssh_private_key_label);
|
|
|
|
HBoxContainer *set_up_ssh_private_key_input_hbc = memnew(HBoxContainer);
|
|
set_up_ssh_private_key_input_hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_private_key_input->add_child(set_up_ssh_private_key_input_hbc);
|
|
|
|
set_up_ssh_private_key_path = memnew(LineEdit);
|
|
set_up_ssh_private_key_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_private_key_path->set_text(EDITOR_DEF("version_control/ssh_private_key_path", ""));
|
|
set_up_ssh_private_key_path->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
|
|
set_up_ssh_private_key_input_hbc->add_child(set_up_ssh_private_key_path);
|
|
|
|
set_up_ssh_private_key_file_dialog = memnew(FileDialog);
|
|
set_up_ssh_private_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
|
|
set_up_ssh_private_key_file_dialog->set_file_mode(FileDialog::FILE_MODE_OPEN_FILE);
|
|
set_up_ssh_private_key_file_dialog->set_show_hidden_files(true);
|
|
// TODO: Make this start at the user's home folder
|
|
set_up_ssh_private_key_file_dialog->set_current_dir(d->get_current_dir());
|
|
set_up_ssh_private_key_file_dialog->connect("file_selected", callable_mp(this, &VersionControlEditorPlugin::_ssh_private_key_selected));
|
|
set_up_ssh_private_key_input_hbc->add_child(set_up_ssh_private_key_file_dialog);
|
|
|
|
Button *select_private_path_button = memnew(Button);
|
|
select_private_path_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon("Folder", "EditorIcons"));
|
|
select_private_path_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_popup_file_dialog).bind(set_up_ssh_private_key_file_dialog));
|
|
select_private_path_button->set_tooltip_text(TTR("Select SSH private key path"));
|
|
set_up_ssh_private_key_input_hbc->add_child(select_private_path_button);
|
|
|
|
HBoxContainer *set_up_ssh_passphrase_input = memnew(HBoxContainer);
|
|
set_up_ssh_passphrase_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_settings_vbc->add_child(set_up_ssh_passphrase_input);
|
|
|
|
Label *set_up_ssh_passphrase_label = memnew(Label);
|
|
set_up_ssh_passphrase_label->set_text(TTR("SSH Passphrase"));
|
|
set_up_ssh_passphrase_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_passphrase_input->add_child(set_up_ssh_passphrase_label);
|
|
|
|
set_up_ssh_passphrase = memnew(LineEdit);
|
|
set_up_ssh_passphrase->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_ssh_passphrase->set_secret(true);
|
|
set_up_ssh_passphrase->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
|
|
set_up_ssh_passphrase_input->add_child(set_up_ssh_passphrase);
|
|
|
|
set_up_warning_text = memnew(Label);
|
|
set_up_warning_text->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
|
|
set_up_warning_text->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
set_up_settings_vbc->add_child(set_up_warning_text);
|
|
|
|
version_commit_dock = memnew(VBoxContainer);
|
|
version_commit_dock->set_visible(false);
|
|
version_commit_dock->set_name(TTR("Commit"));
|
|
|
|
VBoxContainer *unstage_area = memnew(VBoxContainer);
|
|
unstage_area->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
|
unstage_area->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
version_commit_dock->add_child(unstage_area);
|
|
|
|
HBoxContainer *unstage_title = memnew(HBoxContainer);
|
|
unstage_area->add_child(unstage_title);
|
|
|
|
Label *unstage_label = memnew(Label);
|
|
unstage_label->set_text(TTR("Unstaged Changes"));
|
|
unstage_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
unstage_title->add_child(unstage_label);
|
|
|
|
refresh_button = memnew(Button);
|
|
refresh_button->set_tooltip_text(TTR("Detect new changes"));
|
|
refresh_button->set_flat(true);
|
|
refresh_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
|
|
refresh_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_stage_area));
|
|
refresh_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_commit_list));
|
|
refresh_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_branch_list));
|
|
refresh_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_remote_list));
|
|
unstage_title->add_child(refresh_button);
|
|
|
|
discard_all_button = memnew(Button);
|
|
discard_all_button->set_tooltip_text(TTR("Discard all changes"));
|
|
discard_all_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Close"), SNAME("EditorIcons")));
|
|
discard_all_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_discard_all));
|
|
discard_all_button->set_flat(true);
|
|
unstage_title->add_child(discard_all_button);
|
|
|
|
stage_all_button = memnew(Button);
|
|
stage_all_button->set_flat(true);
|
|
stage_all_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("MoveDown"), SNAME("EditorIcons")));
|
|
stage_all_button->set_tooltip_text(TTR("Stage all changes"));
|
|
unstage_title->add_child(stage_all_button);
|
|
|
|
unstaged_files = memnew(Tree);
|
|
unstaged_files->set_h_size_flags(Tree::SIZE_EXPAND_FILL);
|
|
unstaged_files->set_v_size_flags(Tree::SIZE_EXPAND_FILL);
|
|
unstaged_files->set_select_mode(Tree::SELECT_ROW);
|
|
unstaged_files->connect(SNAME("item_selected"), callable_mp(this, &VersionControlEditorPlugin::_load_diff).bind(unstaged_files));
|
|
unstaged_files->connect(SNAME("item_activated"), callable_mp(this, &VersionControlEditorPlugin::_item_activated).bind(unstaged_files));
|
|
unstaged_files->connect(SNAME("button_clicked"), callable_mp(this, &VersionControlEditorPlugin::_cell_button_pressed));
|
|
unstaged_files->create_item();
|
|
unstaged_files->set_hide_root(true);
|
|
unstage_area->add_child(unstaged_files);
|
|
|
|
VBoxContainer *stage_area = memnew(VBoxContainer);
|
|
stage_area->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
|
stage_area->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
version_commit_dock->add_child(stage_area);
|
|
|
|
HBoxContainer *stage_title = memnew(HBoxContainer);
|
|
stage_area->add_child(stage_title);
|
|
|
|
Label *stage_label = memnew(Label);
|
|
stage_label->set_text(TTR("Staged Changes"));
|
|
stage_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
stage_title->add_child(stage_label);
|
|
|
|
unstage_all_button = memnew(Button);
|
|
unstage_all_button->set_flat(true);
|
|
unstage_all_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("MoveUp"), SNAME("EditorIcons")));
|
|
unstage_all_button->set_tooltip_text(TTR("Unstage all changes"));
|
|
stage_title->add_child(unstage_all_button);
|
|
|
|
staged_files = memnew(Tree);
|
|
staged_files->set_h_size_flags(Tree::SIZE_EXPAND_FILL);
|
|
staged_files->set_v_size_flags(Tree::SIZE_EXPAND_FILL);
|
|
staged_files->set_select_mode(Tree::SELECT_ROW);
|
|
staged_files->connect(SNAME("item_selected"), callable_mp(this, &VersionControlEditorPlugin::_load_diff).bind(staged_files));
|
|
staged_files->connect(SNAME("button_clicked"), callable_mp(this, &VersionControlEditorPlugin::_cell_button_pressed));
|
|
staged_files->connect(SNAME("item_activated"), callable_mp(this, &VersionControlEditorPlugin::_item_activated).bind(staged_files));
|
|
staged_files->create_item();
|
|
staged_files->set_hide_root(true);
|
|
stage_area->add_child(staged_files);
|
|
|
|
// Editor crashes if bind is null
|
|
unstage_all_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_move_all).bind(staged_files));
|
|
stage_all_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_move_all).bind(unstaged_files));
|
|
|
|
version_commit_dock->add_child(memnew(HSeparator));
|
|
|
|
VBoxContainer *commit_area = memnew(VBoxContainer);
|
|
version_commit_dock->add_child(commit_area);
|
|
|
|
Label *commit_label = memnew(Label);
|
|
commit_label->set_text(TTR("Commit Message"));
|
|
commit_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
commit_area->add_child(commit_label);
|
|
|
|
commit_message = memnew(TextEdit);
|
|
commit_message->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
commit_message->set_h_grow_direction(Control::GrowDirection::GROW_DIRECTION_BEGIN);
|
|
commit_message->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END);
|
|
commit_message->set_custom_minimum_size(Size2(200, 100));
|
|
commit_message->set_line_wrapping_mode(TextEdit::LINE_WRAPPING_BOUNDARY);
|
|
commit_message->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_commit_button));
|
|
commit_message->connect(SNAME("gui_input"), callable_mp(this, &VersionControlEditorPlugin::_commit_message_gui_input));
|
|
commit_area->add_child(commit_message);
|
|
|
|
ED_SHORTCUT("version_control/commit", TTR("Commit"), KeyModifierMask::CMD_OR_CTRL | Key::ENTER);
|
|
|
|
commit_button = memnew(Button);
|
|
commit_button->set_text(TTR("Commit Changes"));
|
|
commit_button->set_disabled(true);
|
|
commit_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_commit));
|
|
commit_area->add_child(commit_button);
|
|
|
|
version_commit_dock->add_child(memnew(HSeparator));
|
|
|
|
HBoxContainer *commit_list_hbc = memnew(HBoxContainer);
|
|
version_commit_dock->add_child(commit_list_hbc);
|
|
|
|
Label *commit_list_label = memnew(Label);
|
|
commit_list_label->set_text(TTR("Commit List"));
|
|
commit_list_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
commit_list_hbc->add_child(commit_list_label);
|
|
|
|
commit_list_size_button = memnew(OptionButton);
|
|
commit_list_size_button->set_tooltip_text(TTR("Commit list size"));
|
|
commit_list_size_button->add_item("10");
|
|
commit_list_size_button->set_item_metadata(0, 10);
|
|
commit_list_size_button->add_item("20");
|
|
commit_list_size_button->set_item_metadata(1, 20);
|
|
commit_list_size_button->add_item("30");
|
|
commit_list_size_button->set_item_metadata(2, 30);
|
|
commit_list_size_button->connect(SNAME("item_selected"), callable_mp(this, &VersionControlEditorPlugin::_set_commit_list_size));
|
|
commit_list_hbc->add_child(commit_list_size_button);
|
|
|
|
commit_list = memnew(Tree);
|
|
commit_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
commit_list->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END);
|
|
commit_list->set_custom_minimum_size(Size2(200, 160));
|
|
commit_list->create_item();
|
|
commit_list->set_hide_root(true);
|
|
commit_list->set_select_mode(Tree::SELECT_ROW);
|
|
commit_list->set_columns(2); // Commit msg, author
|
|
commit_list->set_column_custom_minimum_width(0, 40);
|
|
commit_list->set_column_custom_minimum_width(1, 20);
|
|
commit_list->connect(SNAME("item_selected"), callable_mp(this, &VersionControlEditorPlugin::_load_diff).bind(commit_list));
|
|
version_commit_dock->add_child(commit_list);
|
|
|
|
version_commit_dock->add_child(memnew(HSeparator));
|
|
|
|
HBoxContainer *menu_bar = memnew(HBoxContainer);
|
|
menu_bar->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
menu_bar->set_v_size_flags(Control::SIZE_FILL);
|
|
version_commit_dock->add_child(menu_bar);
|
|
|
|
branch_select = memnew(OptionButton);
|
|
branch_select->set_tooltip_text(TTR("Branches"));
|
|
branch_select->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
branch_select->connect(SNAME("item_selected"), callable_mp(this, &VersionControlEditorPlugin::_branch_item_selected));
|
|
branch_select->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_branch_list));
|
|
menu_bar->add_child(branch_select);
|
|
|
|
branch_create_confirm = memnew(AcceptDialog);
|
|
branch_create_confirm->set_title(TTR("Create New Branch"));
|
|
branch_create_confirm->set_min_size(Size2(400, 100));
|
|
branch_create_confirm->set_hide_on_ok(true);
|
|
version_commit_dock->add_child(branch_create_confirm);
|
|
|
|
branch_create_ok = branch_create_confirm->get_ok_button();
|
|
branch_create_ok->set_text(TTR("Create"));
|
|
branch_create_ok->set_disabled(true);
|
|
branch_create_ok->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_create_branch));
|
|
|
|
branch_remove_confirm = memnew(AcceptDialog);
|
|
branch_remove_confirm->set_title(TTR("Remove Branch"));
|
|
branch_remove_confirm->add_cancel_button();
|
|
version_commit_dock->add_child(branch_remove_confirm);
|
|
|
|
Button *branch_remove_ok = branch_remove_confirm->get_ok_button();
|
|
branch_remove_ok->set_text(TTR("Remove"));
|
|
branch_remove_ok->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_remove_branch));
|
|
|
|
VBoxContainer *branch_create_vbc = memnew(VBoxContainer);
|
|
branch_create_vbc->set_alignment(BoxContainer::ALIGNMENT_CENTER);
|
|
branch_create_confirm->add_child(branch_create_vbc);
|
|
|
|
HBoxContainer *branch_create_hbc = memnew(HBoxContainer);
|
|
branch_create_hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
branch_create_vbc->add_child(branch_create_hbc);
|
|
|
|
Label *branch_create_name_label = memnew(Label);
|
|
branch_create_name_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
branch_create_name_label->set_text(TTR("Branch Name"));
|
|
branch_create_hbc->add_child(branch_create_name_label);
|
|
|
|
branch_create_name_input = memnew(LineEdit);
|
|
branch_create_name_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
branch_create_name_input->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_branch_create_button));
|
|
branch_create_hbc->add_child(branch_create_name_input);
|
|
|
|
remote_select = memnew(OptionButton);
|
|
remote_select->set_tooltip_text(TTR("Remotes"));
|
|
remote_select->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_select->connect(SNAME("item_selected"), callable_mp(this, &VersionControlEditorPlugin::_remote_selected));
|
|
remote_select->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_refresh_remote_list));
|
|
menu_bar->add_child(remote_select);
|
|
|
|
remote_create_confirm = memnew(AcceptDialog);
|
|
remote_create_confirm->set_title(TTR("Create New Remote"));
|
|
remote_create_confirm->set_min_size(Size2(400, 100));
|
|
remote_create_confirm->set_hide_on_ok(true);
|
|
version_commit_dock->add_child(remote_create_confirm);
|
|
|
|
remote_create_ok = remote_create_confirm->get_ok_button();
|
|
remote_create_ok->set_text(TTR("Create"));
|
|
remote_create_ok->set_disabled(true);
|
|
remote_create_ok->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_create_remote));
|
|
|
|
remote_remove_confirm = memnew(AcceptDialog);
|
|
remote_remove_confirm->set_title(TTR("Remove Remote"));
|
|
remote_remove_confirm->add_cancel_button();
|
|
version_commit_dock->add_child(remote_remove_confirm);
|
|
|
|
Button *remote_remove_ok = remote_remove_confirm->get_ok_button();
|
|
remote_remove_ok->set_text(TTR("Remove"));
|
|
remote_remove_ok->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_remove_remote));
|
|
|
|
VBoxContainer *remote_create_vbc = memnew(VBoxContainer);
|
|
remote_create_vbc->set_alignment(BoxContainer::ALIGNMENT_CENTER);
|
|
remote_create_confirm->add_child(remote_create_vbc);
|
|
|
|
HBoxContainer *remote_create_name_hbc = memnew(HBoxContainer);
|
|
remote_create_name_hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_create_vbc->add_child(remote_create_name_hbc);
|
|
|
|
Label *remote_create_name_label = memnew(Label);
|
|
remote_create_name_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_create_name_label->set_text(TTR("Remote Name"));
|
|
remote_create_name_hbc->add_child(remote_create_name_label);
|
|
|
|
remote_create_name_input = memnew(LineEdit);
|
|
remote_create_name_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_create_name_input->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_remote_create_button));
|
|
remote_create_name_hbc->add_child(remote_create_name_input);
|
|
|
|
HBoxContainer *remote_create_hbc = memnew(HBoxContainer);
|
|
remote_create_hbc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_create_vbc->add_child(remote_create_hbc);
|
|
|
|
Label *remote_create_url_label = memnew(Label);
|
|
remote_create_url_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_create_url_label->set_text(TTR("Remote URL"));
|
|
remote_create_hbc->add_child(remote_create_url_label);
|
|
|
|
remote_create_url_input = memnew(LineEdit);
|
|
remote_create_url_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
remote_create_url_input->connect(SNAME("text_changed"), callable_mp(this, &VersionControlEditorPlugin::_update_remote_create_button));
|
|
remote_create_hbc->add_child(remote_create_url_input);
|
|
|
|
fetch_button = memnew(Button);
|
|
fetch_button->set_flat(true);
|
|
fetch_button->set_tooltip_text(TTR("Fetch"));
|
|
fetch_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")));
|
|
fetch_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_fetch));
|
|
menu_bar->add_child(fetch_button);
|
|
|
|
pull_button = memnew(Button);
|
|
pull_button->set_flat(true);
|
|
pull_button->set_tooltip_text(TTR("Pull"));
|
|
pull_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("MoveDown"), SNAME("EditorIcons")));
|
|
pull_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_pull));
|
|
menu_bar->add_child(pull_button);
|
|
|
|
push_button = memnew(Button);
|
|
push_button->set_flat(true);
|
|
push_button->set_tooltip_text(TTR("Push"));
|
|
push_button->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("MoveUp"), SNAME("EditorIcons")));
|
|
push_button->connect(SNAME("pressed"), callable_mp(this, &VersionControlEditorPlugin::_push));
|
|
menu_bar->add_child(push_button);
|
|
|
|
extra_options = memnew(MenuButton);
|
|
extra_options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("GuiTabMenuHl"), SNAME("EditorIcons")));
|
|
extra_options->get_popup()->connect(SNAME("about_to_popup"), callable_mp(this, &VersionControlEditorPlugin::_update_extra_options));
|
|
extra_options->get_popup()->connect(SNAME("id_pressed"), callable_mp(this, &VersionControlEditorPlugin::_extra_option_selected));
|
|
menu_bar->add_child(extra_options);
|
|
|
|
extra_options->get_popup()->add_item(TTR("Force Push"), EXTRA_OPTION_FORCE_PUSH);
|
|
extra_options->get_popup()->add_separator();
|
|
extra_options->get_popup()->add_item(TTR("Create New Branch"), EXTRA_OPTION_CREATE_BRANCH);
|
|
|
|
extra_options_remove_branch_list = memnew(PopupMenu);
|
|
extra_options_remove_branch_list->connect(SNAME("id_pressed"), callable_mp(this, &VersionControlEditorPlugin::_popup_branch_remove_confirm));
|
|
extra_options_remove_branch_list->set_name("Remove Branch");
|
|
extra_options->get_popup()->add_child(extra_options_remove_branch_list);
|
|
extra_options->get_popup()->add_submenu_item(TTR("Remove Branch"), "Remove Branch");
|
|
|
|
extra_options->get_popup()->add_separator();
|
|
extra_options->get_popup()->add_item(TTR("Create New Remote"), EXTRA_OPTION_CREATE_REMOTE);
|
|
|
|
extra_options_remove_remote_list = memnew(PopupMenu);
|
|
extra_options_remove_remote_list->connect(SNAME("id_pressed"), callable_mp(this, &VersionControlEditorPlugin::_popup_remote_remove_confirm));
|
|
extra_options_remove_remote_list->set_name("Remove Remote");
|
|
extra_options->get_popup()->add_child(extra_options_remove_remote_list);
|
|
extra_options->get_popup()->add_submenu_item(TTR("Remove Remote"), "Remove Remote");
|
|
|
|
change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_NEW] = TTR("New");
|
|
change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_MODIFIED] = TTR("Modified");
|
|
change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_RENAMED] = TTR("Renamed");
|
|
change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_DELETED] = TTR("Deleted");
|
|
change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = TTR("Typechange");
|
|
change_type_to_strings[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = TTR("Unmerged");
|
|
|
|
change_type_to_color[EditorVCSInterface::CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("success_color"), SNAME("Editor"));
|
|
change_type_to_color[EditorVCSInterface::CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("warning_color"), SNAME("Editor"));
|
|
change_type_to_color[EditorVCSInterface::CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("warning_color"), SNAME("Editor"));
|
|
change_type_to_color[EditorVCSInterface::CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("error_color"), SNAME("Editor"));
|
|
change_type_to_color[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("font_color"), SNAME("Editor"));
|
|
change_type_to_color[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = EditorNode::get_singleton()->get_gui_base()->get_theme_color(SNAME("warning_color"), SNAME("Editor"));
|
|
|
|
change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_NEW] = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("StatusSuccess"), SNAME("EditorIcons"));
|
|
change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_MODIFIED] = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("StatusWarning"), SNAME("EditorIcons"));
|
|
change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_RENAMED] = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("StatusWarning"), SNAME("EditorIcons"));
|
|
change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_TYPECHANGE] = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("StatusWarning"), SNAME("EditorIcons"));
|
|
change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_DELETED] = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("StatusError"), SNAME("EditorIcons"));
|
|
change_type_to_icon[EditorVCSInterface::CHANGE_TYPE_UNMERGED] = EditorNode::get_singleton()->get_gui_base()->get_theme_icon(SNAME("StatusWarning"), SNAME("EditorIcons"));
|
|
|
|
version_control_dock = memnew(VBoxContainer);
|
|
version_control_dock->set_v_size_flags(Control::SIZE_EXPAND_FILL);
|
|
version_control_dock->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
|
|
version_control_dock->hide();
|
|
|
|
HBoxContainer *diff_heading = memnew(HBoxContainer);
|
|
diff_heading->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
diff_heading->set_tooltip_text(TTR("View file diffs before committing them to the latest version"));
|
|
version_control_dock->add_child(diff_heading);
|
|
|
|
diff_title = memnew(Label);
|
|
diff_title->set_h_size_flags(Control::SIZE_EXPAND_FILL);
|
|
diff_heading->add_child(diff_title);
|
|
|
|
Label *view = memnew(Label);
|
|
view->set_text(TTR("View:"));
|
|
diff_heading->add_child(view);
|
|
|
|
diff_view_type_select = memnew(OptionButton);
|
|
diff_view_type_select->add_item(TTR("Split"), DIFF_VIEW_TYPE_SPLIT);
|
|
diff_view_type_select->add_item(TTR("Unified"), DIFF_VIEW_TYPE_UNIFIED);
|
|
diff_view_type_select->connect(SNAME("item_selected"), callable_mp(this, &VersionControlEditorPlugin::_display_diff));
|
|
diff_heading->add_child(diff_view_type_select);
|
|
|
|
diff = memnew(RichTextLabel);
|
|
diff->set_h_size_flags(TextEdit::SIZE_EXPAND_FILL);
|
|
diff->set_v_size_flags(TextEdit::SIZE_EXPAND_FILL);
|
|
diff->set_use_bbcode(true);
|
|
diff->set_selection_enabled(true);
|
|
version_control_dock->add_child(diff);
|
|
|
|
_update_set_up_warning("");
|
|
}
|
|
|
|
VersionControlEditorPlugin::~VersionControlEditorPlugin() {
|
|
shut_down();
|
|
memdelete(version_commit_dock);
|
|
memdelete(version_control_dock);
|
|
memdelete(version_control_actions);
|
|
}
|