Merge pull request #165 from godotengine/update-4.0-stable

Update extension API to Godot 4.0-stable

.github/workflows/build.yml

@@ -7,15 +7,15 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
-      - name: build-linux-release-x64
+      - name: build-linux-editor-x64
         run: |
           git submodule update --init --recursive
           pip3 install --user scons
-          scons platform=linux target=release bits=64 godot_cpp=yes generate_bindings=yes use_custom_api_file=yes custom_api_file=api.ci.json -j $(nproc)
-          ldd demo/addons/godot-git-plugin/linux/libgitapi.so
+          scons platform=linux target=editor generate_bindings=yes -j $(nproc)
+          ldd demo/addons/godot-git-plugin/linux/*.so
       - uses: actions/upload-artifact@v2
         with:
-          name: godot-git-plugin-linux-release-x64-${{ github.sha }}
+          name: libgit_plugin.linux.x86_64.editor.so-${{ github.sha }}
           if-no-files-found: error
           path: |
             demo/
@@ -29,32 +29,32 @@ jobs:
           python-version: "3.x"
           architecture: "x64"
       - uses: ilammy/msvc-dev-cmd@v1
-      - name: build-windows-release-x64
+      - name: build-windows-editor-x64
         run: |
           git submodule update --init --recursive
           pip3 install --user scons
-          scons platform=windows target=release bits=64 godot_cpp=yes generate_bindings=yes use_custom_api_file=yes custom_api_file=api.ci.json -j $env:NUMBER_OF_PROCESSORS
-          dumpbin /dependents .\demo\addons\godot-git-plugin\win64\libgitapi.dll
+          scons platform=windows target=editor generate_bindings=yes -j $env:NUMBER_OF_PROCESSORS
+          dumpbin /dependents .\demo\addons\godot-git-plugin\win64\*.dll
       - uses: actions/upload-artifact@v2
         with:
-          name: godot-git-plugin-windows-release-x64-${{ github.sha }}
+          name: libgit_plugin.windows.x86_64.editor.dll-${{ github.sha }}
           if-no-files-found: error
           path: |
             demo/
 
-  macos-x64:
+  macos-universal:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
-      - name: build-macos-release-x64
+      - name: build-macos-editor-universal
         run: |
           git submodule update --init --recursive
           brew install scons
-          scons platform=osx target=release bits=64 godot_cpp=yes generate_bindings=yes use_custom_api_file=yes custom_api_file=api.ci.json macos_arch=universal use_llvm=yes -j $(sysctl -n hw.logicalcpu)
-          otool -L demo/addons/godot-git-plugin/osx/libgitapi.dylib
+          scons platform=macos target=editor generate_bindings=yes macos_arch=universal use_llvm=yes macos_deployment_target=10.13 -j $(sysctl -n hw.logicalcpu)
+          otool -L demo/addons/godot-git-plugin/macos/*.dylib
       - uses: actions/upload-artifact@v2
         with:
-          name: godot-git-plugin-macos-release-x64-${{ github.sha }}
+          name: libgit_plugin.macos.universal.editor.dylib-${{ github.sha }}
           if-no-files-found: error
           path: |
             demo/

.gitignore

@@ -1,8 +1,12 @@
 # SConstruct db
 *.dblite
 
+# Godot ignores
+demo/.godot/
+
 # Godot Serialisations
-api.json
+extension_api.json
+!/ci/extension_api.json
 
 # Visual Studio Cache
 .vs/
@@ -16,7 +20,7 @@ api.json
 # Binaries
 build/
 bin/
-osx/
+macos/
 linux/
 win64/
 *.lib

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2022 The Godot Engine community
+Copyright (c) 2016-2023 The Godot Engine community
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,6 +1,8 @@
 [![C/C++ CI](https://github.com/godotengine/godot-git-plugin/actions/workflows/build.yml/badge.svg)](https://github.com/godotengine/godot-git-plugin/actions/workflows/build.yml)
 
-# GDNative Based Git Plugin for Godot Version Control Editor Plugin
+<img src="/icon.png" width="25%" />
+
+# Godot Git Plugin
 
 Git implementation of the Godot Engine VCS interface in Godot. We use [libgit2](https://libgit2.org) as our backend to simulate Git in code.
 
@@ -24,29 +26,44 @@ This section onwards is only meant to be used if you intend to compile the plugi
   - Windows
     - No extra steps required other than setting up the compilers.
   - MacOS
-    - For making universal builds targeting both Apple Silicon and x86_64, you can optionally run `build_openssl_universal_osx.sh` to build OpenSSL yourself and replace the already prebuilt libraries provided inside `thirdparty/openssl/`, otherwise, just run `brew install openssl@1.1`.
+    - For making universal builds targeting both Apple Silicon and x86_64, you can optionally run `build_openssl_universal_macos.sh` to build OpenSSL yourself and replace the already prebuilt libraries provided inside `thirdparty/openssl/`, otherwise, just run `brew install openssl@1.1` to use the prebuilt libraries provided in this repository.
   - Linux
-    - Run `sudo apt-get install libssl-dev`, or local package manager equivalent.
+    - Run `sudo apt-get install libssl-dev`, or your local package manager's equivalent.
 
-### Build
+### Release Build
 
 ```
-scons platform=<platform> target=release bits=64 -j 6
+scons platform=<platform> target=editor -j 6
 ```
 
+> You may get the gdextension dump yourself from Godot using the instructions in the next section, or use the ones provided in `godot-cpp/gdextension` or `ci/`.
+
 For more build options, run `scons platform=<platform> -h`
 
-## Bleeding Edge
+## Dev builds
 
-Most of the times when new features are being worked on for the Godot VCS Integration, it requires developers to make changes in the Godot Editor source code along with this plugin. This means we need to manually generate the GDNative API from the custom Godot builds and then use it to compile godot-cpp.
+When new features are being worked on for the Godot VCS Integration, the build process sometimes requires developers to make changes in the GDExtension API along with this plugin. This means we need to manually generate the GDExtension API from the custom Godot builds and use it to compile godot-cpp, and then finally link the resulting godot-cpp binary into this plugin.
 
-To build using custom GDNative API definition JSON files, run the below helper command:
+If you need to use a custom GDExtension API:
 
-```
-scons platform=<platform> target=debug godot_cpp=yes generate_bindings=yes bits=64 use_custom_api_file=yes custom_api_file=path/to/api.json -j 6
+1. Dump the new bindings from the custom Godot build.
+
+```shell
+cd local/copy/of/godot/source
+.\bin\godot.xxx --headless --dump-gdextension-interface --dump-extension-api
 ```
 
-Once this command can completed successfully, the standard build commands in the above section can be run without recompiling godot-cpp. To stop godot-cpp from recompiling, do not use the `godot_cpp` option in SCons arguments. To view more options available while recompiling godot-cpp, run `scons platform=<platform> godot_cpp=yes -h`.
+2. Build the plugin along with the godot-cpp library.
+
+```
+scons platform=<platform> target=editor generate_bindings=yes dev_build=yes -j 6
+```
+
+> You only need to build godot-cpp once every change in the GDExtension API, hence, `generate_bindings=yes` should only be passed in during the first time after generating a new GDExtension API dump.
+
+3. Open the project provided inside `demo/` in the custom Godot build.
+
+To view more options available while recompiling godot-git-plugin, run `scons platform=<platform> -h`.
 
 ---
 

SConstruct

@@ -10,55 +10,35 @@ opts = Variables([], ARGUMENTS)
 env = Environment(ENV=os.environ)
 
 # Define our options
-opts.Add(EnumVariable("target", "Compilation target",
-         "debug", ["d", "debug", "r", "release"]))
-opts.Add(EnumVariable("platform", "Compilation platform",
-         "", ["", "windows", "linux", "osx"]))
-opts.Add(EnumVariable("p", "Compilation target, alias for \"platform\"",
-         "", ["", "windows", "linux", "osx"]))
-opts.Add(BoolVariable(
-    "godot_cpp", "Build godot-cpp by forwarding arguments to it.", "no"))
-opts.Add(BoolVariable("use_llvm",
-         "Use the LLVM / Clang compiler - only effective when targeting Linux or FreeBSD.", "no"))
 opts.Add(PathVariable("target_path",
          "The path where the lib is installed.", "demo/addons/godot-git-plugin/"))
 opts.Add(PathVariable("target_name", "The library name.",
-         "libgitapi", PathVariable.PathAccept))
-opts.Add(EnumVariable("bits", "The bit architecture.", "64", ["64"]))
-opts.Add(EnumVariable("macos_arch", "Target macOS architecture",
-         "universal", ["universal", "x86_64", "arm64"]))
+         "libgit_plugin", PathVariable.PathAccept))
 opts.Add(PathVariable("macos_openssl", "Path to OpenSSL library root - only used in macOS builds.",
                       "/usr/local/opt/openssl@1.1/", PathVariable.PathAccept))  # TODO: Find a way to configure this to use the cloned OpenSSL source code, based on `macos_arch`.
 opts.Add(PathVariable("macos_openssl_static_ssl", "Path to OpenSSL libssl.a library - only used in macOS builds.",
          os.path.join(os.path.abspath(os.getcwd()), "thirdparty/openssl/libssl.a"), PathVariable.PathAccept))
 opts.Add(PathVariable("macos_openssl_static_crypto", "Path to OpenSSL libcrypto.a library - only used in macOS builds.",
          os.path.join(os.path.abspath(os.getcwd()), "thirdparty/openssl/libcrypto.a"), PathVariable.PathAccept))
+opts.Add(PathVariable("linux_openssl_static_ssl", "Path to OpenSSL libssl.a library - only used in Linux builds.",
+         "/usr/lib/x86_64-linux-gnu/libssl.a", PathVariable.PathAccept))
+opts.Add(PathVariable("linux_openssl_static_crypto", "Path to OpenSSL libcrypto.a library - only used in Linux builds.",
+         "/usr/lib/x86_64-linux-gnu/libcrypto.a", PathVariable.PathAccept))
 
 # Updates the environment with the option variables.
 opts.Update(env)
 
-if env["platform"] == "osx":
-    # Use only clang on osx because we need to do universal builds
-    env["CXX"] = "clang++"
-    env["CC"] = "clang"
+if ARGUMENTS.get("custom_api_file", "") != "":
+    ARGUMENTS["custom_api_file"] = "../" + ARGUMENTS["custom_api_file"]
 
-    if env["macos_arch"] == "universal":
-        env.Append(LINKFLAGS=["-arch", "x86_64", "-arch", "arm64"])
-        env.Append(CCFLAGS=["-arch", "x86_64", "-arch", "arm64"])
-    else:
-        env.Append(LINKFLAGS=["-arch", env["macos_arch"]])
-        env.Append(CCFLAGS=["-arch", env["macos_arch"]])
+ARGUMENTS["target"] = "editor"
+env = SConscript("godot-cpp/SConstruct").Clone()
+opts.Update(env)
 
 Export("env")
 
 SConscript("thirdparty/SCsub")
 
-if env["godot_cpp"]:
-    if ARGUMENTS.get("use_custom_api_file", False) and ARGUMENTS.get("custom_api_file", "") != "":
-        ARGUMENTS["custom_api_file"] = "../" + ARGUMENTS["custom_api_file"]
-
-    SConscript("godot-cpp/SConstruct")
-
 SConscript("godot-git-plugin/SCsub")
 
 # Generates help for the -h scons option.

THIRDPARTY.md

@@ -2,13 +2,13 @@
 
 The Godot Git Plugin source code uses the following third-party source code:
 
-1. godotengine/godot-cpp - MIT License - https://github.com/godotengine/godot-cpp/tree/99e9dd1d9396ed3af40678263b509078e5265ffc
+1. godotengine/godot-cpp - MIT License - https://github.com/godotengine/godot-cpp/tree/02336831735fd6affbe0a6fa252ec98d3e78120c
 2. libgit2/libgit2 - GPLv2 with a special Linking Exception - https://github.com/libgit2/libgit2/tree/b7bad55e4bb0a285b073ba5e02b01d3f522fc95d
 3. libssh2/libssh2 - BSD-3-Clause License - https://github.com/libssh2/libssh2/tree/635caa90787220ac3773c1d5ba11f1236c22eae8
 
 We also link to these third-party libraries (only in the compiled binary form):
 
-1. OpenSSL - Only on Linux and MacOS - OpenSSL License - http://www.openssl.org/source/openssl-1.1.1i.tar.gz
+1. OpenSSL - Only on Linux and MacOS - OpenSSL License - http://www.openssl.org/source/openssl-1.1.1s.tar.gz
 
 ## License Texts
 
@@ -17,7 +17,7 @@ We also link to these third-party libraries (only in the compiled binary form):
 ```
 # MIT License
 
-Copyright (c) 2017-2021 Godot Engine contributors.
+Copyright (c) 2017-2022 Godot Engine contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build_openssl_universal_macos.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OPENSSL_VERSION="1.1.1i"
+OPENSSL_VERSION="1.1.1s"
 
 curl -OL http://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
 tar -xzvf openssl-$OPENSSL_VERSION.tar.gz
@@ -12,9 +12,9 @@ cd openssl_arm64
 make
 cd ../
 cd openssl_x86_64
-./Configure darwin64-x86_64-cc
+./Configure darwin64-x86_64-cc -mmacosx-version-min=10.13
 make
 cd ../
-lipo -create openssl_arm64/libcrypto.a openssl_x86_64/libcrypto.a -output libcrypto.a
-lipo -create openssl_arm64/libssl.a openssl_x86_64/libssl.a -output libssl.a
+lipo -create openssl_arm64/libcrypto.a openssl_x86_64/libcrypto.a -output thirdparty/openssl/libcrypto.a
+lipo -create openssl_arm64/libssl.a openssl_x86_64/libssl.a -output thirdparty/openssl/libssl.a
 rm openssl-$OPENSSL_VERSION.tar.gz

demo/.gitattributes

@@ -1,17 +1,2 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.cpp text
-*.c text
-*.h text
-*.gd text
-*.cs text
-
-# Declare files that will always have CRLF line endings on checkout.
-*.sln text eol=crlf
-
-# Denote all files that are truly binary and should not be modified.
-*.png binary
-*.jpg binary
+# Normalize EOL for all files that Git considers text files.
+* text=auto eol=lf

demo/.gitignore

@@ -1,11 +1,2 @@
-# Godot-specific ignores
-.import/
-export.cfg
-export_presets.cfg
-
-# Imported translations (automatically generated from CSV files)
-*.translation
-
-# Mono-specific ignores
-.mono/
-data_*/
+# Godot 4+ specific ignores
+.godot/

demo/addons/godot-git-plugin/git_api.gdnlib

@@ -1,18 +0,0 @@
-[general]
-
-load_once=true
-symbol_prefix="godot_"
-reloadable=false
-singleton=false
-
-[entry]
-
-OSX.64="res://addons/godot-git-plugin/osx/libgitapi.dylib"
-Windows.64="res://addons/godot-git-plugin/win64/libgitapi.dll"
-X11.64="res://addons/godot-git-plugin/linux/libgitapi.so"
-
-[dependencies]
-
-OSX.64=[  ]
-Windows.64=[  ]
-X11.64=[  ]

demo/addons/godot-git-plugin/git_api.gdns

@@ -1,9 +0,0 @@
-[gd_resource type="NativeScript" load_steps=2 format=2]
-
-[ext_resource path="res://addons/godot-git-plugin/git_api.gdnlib" type="GDNativeLibrary" id=1]
-
-[resource]
-resource_name = "GitAPI"
-class_name = "GitAPI"
-library = ExtResource( 1 )
-script_class_name = "GitAPI"

demo/addons/godot-git-plugin/git_plugin.gdextension

@@ -0,0 +1,11 @@
+[configuration]
+
+entry_symbol = "git_plugin_init"
+
+[libraries]
+
+macos.editor = "macos/libgit_plugin.macos.editor.universal.dylib"
+windows.editor.x86_64 = "win64/libgit_plugin.windows.editor.x86_64.dll"
+linux.editor.x86_64 = "linux/libgit_plugin.linux.editor.x86_64.so"
+linux.editor.arm64 = "linux/libgit_plugin.linux.editor.arm64.so"
+linux.editor.rv64 = ""

demo/addons/godot-git-plugin/plugin.cfg

@@ -2,6 +2,6 @@
 
 name="Godot Git Plugin"
 description="This plugin lets you interact with Git without leaving the Godot editor. More information can be found at https://github.com/godotengine/godot-git-plugin/wiki"
-author="ChronicallySerious"
-version="v2.0.0"
-script="git_api.gdns"
+author="twaritwaikar"
+version="v3.0.0-beta1"
+script="godot-git-plugin.gd"

demo/default_env.tres

@@ -1,7 +0,0 @@
-[gd_resource type="Environment" load_steps=2 format=2]
-
-[sub_resource type="ProceduralSky" id=1]
-
-[resource]
-background_mode = 2
-background_sky = SubResource( 1 )

demo/demo.tscn

@@ -1,3 +1,3 @@
-[gd_scene format=2]
+[gd_scene format=3 uid="uid://cr5ci1iwmxnlb"]
 
-[node name="Node2D" type="Node2D"]
+[node name="Node3D" type="Node3D"]

demo/icon.png.import

@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

demo/new_script.gd

@@ -1,16 +1,12 @@
 extends Node
 
 
-# Declare member variables here. Examples:
-# var a = 2
-# var b = "text"
-
-
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	print("Hello Godot!")
+	print("Hello world!")
 	pass # Replace with function body.
 
+
 # Called every frame. 'delta' is the elapsed time since the previous frame.
-#func _process(delta):
-#	pass
+func _process(delta):
+	pass

demo/project.godot

@@ -6,29 +6,17 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=4
-
-_global_script_classes=[ {
-"base": "EditorVCSInterface",
-"class": "GitAPI",
-"language": "NativeScript",
-"path": "res://addons/godot-git-plugin/git_api.gdns"
-} ]
-_global_script_class_icons={
-"GitAPI": ""
-}
+config_version=5
 
 [application]
 
-config/name="demo"
-run/main_scene="res://demo.tscn"
-config/icon="res://icon.png"
+config/features=PackedStringArray("4.0")
 
 [editor]
 
+version_control/plugin_name="GitPlugin"
 version_control/autoload_on_startup=true
-version_control/plugin_name="GitAPI"
 
-[rendering]
+[editor_plugins]
 
-environment/default_environment="res://default_env.tres"
+enabled=PackedStringArray()

godot-git-plugin/SCsub

@@ -5,19 +5,11 @@ import os
 env = {}
 Import("env")
 
-godot_headers_path = "../godot-cpp/godot-headers/"
-cpp_bindings_path = "../godot-cpp/"
-cpp_library = "libgodot-cpp"
-bits = env["bits"]
-
 # Process some arguments
 if env["use_llvm"]:
     env["CC"] = "clang"
     env["CXX"] = "clang++"
 
-if env["p"] != "":
-    env["platform"] = env["p"]
-
 if env["platform"] == "":
     print("No valid target platform selected.")
     quit()
@@ -28,65 +20,39 @@ if not os.path.isdir(env["target_path"]):
     os.mkdir(env["target_path"])
 
 # Check our platform specifics
-if env["platform"] == "osx":
-    env["target_path"] += "osx/"
-    cpp_library += ".osx"
+if env["platform"] == "macos":
+    env["target_path"] += "macos/"
 
     # Force static linkage (https://stackoverflow.com/a/2995999/7370948)
-    static_ssl = File(env["macos_openssl_static_ssl"])
-    static_crypto = File(env["macos_openssl_static_crypto"])
-    env.Append(LIBS=[static_ssl, static_crypto])
+    env.Append(LIBS=[File(env["macos_openssl_static_ssl"]),
+                     File(env["macos_openssl_static_crypto"])])
 
-    if env["target"] in ("debug", "d"):
-        env.Append(CCFLAGS=["-g", "-O2", "-std=c++17"])
-    else:
-        env.Append(CCFLAGS=["-g", "-O3", "-std=c++17"])
+    if env["macos_deployment_target"] != "default":
+        env.Append(CCFLAGS=["-mmacosx-version-min=" +
+                            env["macos_deployment_target"]])
+        env.Append(LINKFLAGS=["-mmacosx-version-min=" +
+                              env["macos_deployment_target"]])
 
 elif env["platform"] == "linux":
     env["target_path"] += "linux/"
-    cpp_library += ".linux"
-    env.Append(LIBS=["ssl", "crypto"])
-
-    if env["target"] in ("debug", "d"):
-        env.Append(CCFLAGS=["-fPIC", "-g3", "-Og", "-std=c++17"])
-    else:
-        env.Append(CCFLAGS=["-fPIC", "-g", "-O3", "-std=c++17"])
+    env.Append(LIBS=[File(env["linux_openssl_static_ssl"]),
+                     File(env["linux_openssl_static_crypto"])])
 
 elif env["platform"] == "windows":
     env["target_path"] += "win64/"
-    cpp_library += ".windows"
-    # This makes sure to keep the session environment variables on windows,
-    # that way you can run scons in a vs 2017 prompt and it will find all the required tools
-    env.Append(ENV=os.environ)
 
-    env.Append(CCFLAGS=["-DWIN32", "-D_WIN32", "-D_WINDOWS",
-               "-W3", "-GR", "-D_CRT_SECURE_NO_WARNINGS", "/std:c++17"])
-    env.Append(LIBS=["Advapi32", "Winhttp", "Rpcrt4",
-               "crypt32", "OLE32", "user32"])
-    if env["target"] in ("debug", "d"):
-        env.Append(CCFLAGS=["-EHsc", "-D_DEBUG", "-MDd", "/DEBUG"])
-        env["PDB"] = env["target_name"] + ".pdb"
-    else:
-        env.Append(CCFLAGS=["-O2", "-EHsc", "-DNDEBUG", "-MD"])
-
-if env["target"] in ("debug", "d"):
-    cpp_library += ".debug"
-else:
-    cpp_library += ".release"
-
-if env['platform'] == 'osx' and env['macos_arch'] != 'universal':
-    cpp_library += "." + env['macos_arch']
-else:
-    cpp_library += "." + str(bits)
+    env.Append(LIBS=["advapi32", "winhttp", "rpcrt4", "crypt32",
+               "ole32", "user32", "wsock32", "ws2_32", "bcrypt"])
 
 env.Append(CPPPATH=[".", "src/"])
-env.Append(CPPPATH=[godot_headers_path, cpp_bindings_path + "include/",
-           cpp_bindings_path + "include/core/", cpp_bindings_path + "include/gen/"])
+
 env.Append(CPPPATH=["../thirdparty/git2/libgit2/include/"])
-env.Append(LIBPATH=[cpp_bindings_path + "bin/", "../thirdparty/bin/"])
-env.Prepend(LIBS=[cpp_library, "git2", "ssh2"])
+env.Append(LIBPATH=["../thirdparty/bin/"])
+env.Prepend(LIBS=["git2", "ssh2"])
 
 library = env.SharedLibrary(
-    target=env["target_path"] + env["target_name"],
-    source=Glob("src/*.cpp"))
+    target=env["target_path"] +
+    "{}{}{}".format(env["target_name"], env["suffix"], env["SHLIBSUFFIX"]),
+    source=Glob("src/*.cpp")
+)
 Default(library)

godot-git-plugin/src/allocation_defs.h

@@ -1,7 +0,0 @@
-#ifndef ALLOCATION_DEF_H
-#define ALLOCATION_DEF_H
-
-#define memnew(klass) new klass()
-#define memdelete(pointer) pointer ? delete pointer : WARN_PRINT("GitAPI: Tried to delete a NULL object");
-
-#endif // !ALLOCATION_DEF_H

godot-git-plugin/src/gdlibrary.cpp

@@ -1,20 +1,31 @@
-#include "git_api.h"
+#include "git_plugin.h"
 
-#include <Godot.hpp>
+#include "godot_cpp/core/class_db.hpp"
+#include "godot_cpp/godot.hpp"
 
-extern "C" void GDN_EXPORT godot_gdnative_init(godot_gdnative_init_options *o) {
-	godot::Godot::gdnative_init(o);
+void initialize_git_plugin_module(godot::ModuleInitializationLevel p_level) {
+	if (p_level != godot::MODULE_INITIALIZATION_LEVEL_EDITOR) {
+		return;
+	}
+
+	godot::ClassDB::register_class<GitPlugin>();
 }
 
-extern "C" void GDN_EXPORT godot_gdnative_singleton(godot_gdnative_init_options *o) {
+void uninitialize_git_plugin_module(godot::ModuleInitializationLevel p_level) {
+	if (p_level != godot::MODULE_INITIALIZATION_LEVEL_EDITOR) {
+		return;
+	}
 }
 
-extern "C" void GDN_EXPORT godot_gdnative_terminate(godot_gdnative_terminate_options *o) {
-	godot::Godot::gdnative_terminate(o);
-}
+extern "C" {
 
-extern "C" void GDN_EXPORT godot_nativescript_init(void *handle) {
-	godot::Godot::nativescript_init(handle);
+GDExtensionBool GDE_EXPORT git_plugin_init(const GDExtensionInterface *p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+	godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
 
-	godot::register_tool_class<godot::GitAPI>();
+	init_obj.register_initializer(initialize_git_plugin_module);
+	init_obj.register_terminator(uninitialize_git_plugin_module);
+	init_obj.set_minimum_library_initialization_level(godot::MODULE_INITIALIZATION_LEVEL_EDITOR);
+
+	return init_obj.init();
+}
 }

godot-git-plugin/src/git_api.h

@@ -1,153 +0,0 @@
-#ifndef GIT_API_H
-#define GIT_API_H
-
-#include <memory>
-#include <vector>
-
-#include <GodotGlobal.hpp>
-#include <AcceptDialog.hpp>
-#include <Button.hpp>
-#include <Control.hpp>
-#include <Directory.hpp>
-#include <EditorVCSInterface.hpp>
-#include <File.hpp>
-#include <Godot.hpp>
-#include <LineEdit.hpp>
-#include <OS.hpp>
-
-#include <allocation_defs.h>
-#include <git_common.h>
-
-#include <git2.h>
-
-namespace godot {
-
-class GitAPI;
-
-struct DiffHelper {
-	Array *diff_hunks;
-	GitAPI *git_api;
-};
-
-struct CString {
-	char *data = nullptr;
-
-	CString() = delete;
-	CString(const String &string) :
-			data(string.alloc_c_string()) {}
-	CString(CString &&) = delete;
-	CString &operator=(const CString &) = delete;
-	CString &operator=(CString &&) = delete;
-
-	~CString() {
-		if (data) {
-			godot::api->godot_free(data);
-			data = nullptr;
-		}
-	}
-};
-
-template <class T>
-class Capture {
-	T &smart_ptr = nullptr;
-
-	using Raw = decltype(smart_ptr.get());
-
-	Raw raw = nullptr;
-
-public:
-	Capture() = delete;
-	Capture(T &ptr) :
-			smart_ptr(ptr) {}
-	Capture(Capture &&) = delete;
-	Capture &operator=(const Capture &) = delete;
-	Capture &operator=(Capture &&) = delete;
-
-	operator Raw *() {
-		return &raw;
-	}
-
-	~Capture() {
-		if (raw) {
-			smart_ptr.reset(raw);
-		}
-	}
-};
-
-template <auto DeleteFn>
-struct FunctionDeleter {
-	template <class T>
-	void operator()(T *ptr) {
-		DeleteFn(ptr);
-	}
-};
-
-template <class T, auto DeleteFn>
-using unique_ptr_deleter = std::unique_ptr<T, FunctionDeleter<DeleteFn>>;
-
-using git_annotated_commit_ptr = unique_ptr_deleter<git_annotated_commit, git_annotated_commit_free>;
-using git_blob_ptr = unique_ptr_deleter<git_blob, git_blob_free>;
-using git_branch_iterator_ptr = unique_ptr_deleter<git_branch_iterator, git_branch_iterator_free>;
-using git_commit_ptr = unique_ptr_deleter<git_commit, git_commit_free>;
-using git_diff_ptr = unique_ptr_deleter<git_diff, git_diff_free>;
-using git_index_ptr = unique_ptr_deleter<git_index, git_index_free>;
-using git_object_ptr = unique_ptr_deleter<git_object, git_object_free>;
-using git_patch_ptr = unique_ptr_deleter<git_patch, git_patch_free>;
-using git_reference_ptr = unique_ptr_deleter<git_reference, git_reference_free>;
-using git_remote_ptr = unique_ptr_deleter<git_remote, git_remote_free>;
-using git_repository_ptr = unique_ptr_deleter<git_repository, git_repository_free>;
-using git_revwalk_ptr = unique_ptr_deleter<git_revwalk, git_revwalk_free>;
-using git_signature_ptr = unique_ptr_deleter<git_signature, git_signature_free>;
-using git_status_list_ptr = unique_ptr_deleter<git_status_list, git_status_list_free>;
-using git_tree_ptr = unique_ptr_deleter<git_tree, git_tree_free>;
-
-class GitAPI : public EditorVCSInterface {
-	GODOT_CLASS(GitAPI, EditorVCSInterface)
-
-	Credentials creds;
-	bool has_merge = false;
-	git_repository_ptr repo;
-	git_oid pull_merge_oid = {};
-
-	// Endpoints
-	bool _checkout_branch(const String branch_name);
-	void _commit(const String msg);
-	void _create_branch(const String branch_name);
-	void _create_remote(const String remote_name, const String remote_url);
-	void _discard_file(const String file_path);
-	void _fetch(const String remote);
-	Array _get_branch_list();
-	String _get_current_branch_name();
-	Array _get_diff(const String identifier, const int64_t area);
-	Array _get_line_diff(const String file_path, const String text);
-	Array _get_modified_files_data();
-	Array _get_previous_commits(const int64_t max_commits);
-	Array _get_remotes();
-	String _get_vcs_name();
-	bool _initialize(const String project_path);
-	void _pull(const String remote);
-	void _push(const String remote, const bool force);
-	void _remove_branch(const String branch_name);
-	void _remove_remote(const String remote_name);
-	void _set_credentials(const String username, const String password, const String ssh_public_key_path, const String ssh_private_key_path, const String ssh_passphrase);
-	bool _shut_down();
-	void _stage_file(const String file_path);
-	void _unstage_file(const String file_path);
-
-	// Helpers
-	Array _parse_diff(git_diff *p_diff);
-
-public:
-	static void _register_methods();
-
-	bool check_errors(int error, String function, String file, int line, String message, const std::vector<git_error_code> &ignores = {});
-	void create_gitignore_and_gitattributes();
-	bool create_initial_commit();
-	String get_commit_date(const git_time *intime);
-
-	void _init();
-};
-
-} // namespace godot
-
-#endif // !GIT_API_H

godot-git-plugin/src/git_callbacks.cpp

@@ -1,14 +1,19 @@
-#include <git_common.h>
+#include <iostream>
+#include <cstring>
 
-#include <git_api.h>
+#include "git_callbacks.h"
+#include "git_plugin.h"
+
+#include "godot_cpp/godot.hpp"
+#include "godot_cpp/variant/utility_functions.hpp"
 
 extern "C" int progress_cb(const char *str, int len, void *data) {
 	(void)data;
 
 	char *progress_str = new char[len + 1];
-	memcpy(progress_str, str, len);
+	std::memcpy(progress_str, str, len);
 	progress_str[len] = '\0';
-	godot::Godot::print("remote: " + godot::String(progress_str).strip_edges());
+	godot::UtilityFunctions::push_warning("remote: ", CString(godot::String(progress_str).strip_edges()).data);
 	delete[] progress_str;
 
 	return 0;
@@ -22,10 +27,10 @@ extern "C" int update_cb(const char *refname, const git_oid *a, const git_oid *b
 
 	git_oid_tostr(b_str, short_commit_length, b);
 	if (git_oid_is_zero(a)) {
-		godot::Godot::print("* [new] " + godot::String(b_str) + " " + godot::String(refname));
+		godot::UtilityFunctions::print("* [new] ", CString(godot::String(b_str)).data, " ", CString(godot::String(refname)).data);
 	} else {
 		git_oid_tostr(a_str, short_commit_length, a);
-		godot::Godot::print("[updated] " + godot::String(a_str) + "..." + godot::String(b_str) + " " + godot::String(refname));
+		godot::UtilityFunctions::print("[updated] ", CString(godot::String(a_str)).data, "...", CString(godot::String(b_str)).data, " ", CString(godot::String(refname)).data);
 	}
 
 	return 0;
@@ -35,9 +40,11 @@ extern "C" int transfer_progress_cb(const git_indexer_progress *stats, void *pay
 	(void)payload;
 
 	if (stats->received_objects == stats->total_objects) {
-		godot::Godot::print("Resolving deltas " + godot::String::num_int64(stats->indexed_deltas) + "/" + godot::String::num_int64(stats->total_deltas));
+		godot::UtilityFunctions::print("Resolving deltas ", uint32_t(stats->indexed_deltas), "/", uint32_t(stats->total_deltas));
 	} else if (stats->total_objects > 0) {
-		godot::Godot::print("Received " + godot::String::num_int64(stats->received_objects) + "/" + godot::String::num_int64(stats->total_objects) + " objects (" + godot::String::num_int64(stats->indexed_objects) + ") in " + godot::String::num_int64(static_cast<int>(stats->received_bytes)) + " bytes");
+		godot::UtilityFunctions::print(
+				"Received ", uint32_t(stats->received_objects), "/", uint32_t(stats->total_objects),
+				" objects (", uint32_t(stats->indexed_objects), ") in ", uint32_t(stats->received_bytes), " bytes");
 	}
 	return 0;
 }
@@ -56,18 +63,16 @@ extern "C" int push_transfer_progress_cb(unsigned int current, unsigned int tota
 		progress = (current * 100) / total;
 	}
 
-	godot::Godot::print("Writing Objects: " +
-						godot::String::num_int64(progress) + "% (" +
-						godot::String::num_int64((int)current) + "/" + godot::String::num_int64((int)total) + "), " + godot::String::num_int64(bytes) + " bytes, done.");
+	godot::UtilityFunctions::print("Writing Objects: ", uint32_t(progress), "% (", uint32_t(current), "/", uint32_t(total), ", ", uint32_t(bytes), " bytes done.");
 	return 0;
 }
 
 extern "C" int push_update_reference_cb(const char *refname, const char *status, void *data) {
 	godot::String status_str = status;
 	if (status_str == "") {
-		godot::Godot::print("[rejected] " + godot::String(refname) + " " + status_str);
+		godot::UtilityFunctions::print("[rejected] ", CString(godot::String(refname)).data, " ", CString(status_str).data);
 	} else {
-		godot::Godot::print("[updated] " + godot::String(refname));
+		godot::UtilityFunctions::print("[updated] ", CString(godot::String(refname)).data);
 	}
 	return 0;
 }
@@ -78,29 +83,29 @@ extern "C" int credentials_cb(git_cred **out, const char *url, const char *usern
 	godot::String proper_username = username_from_url ? username_from_url : creds->username;
 
 	if (allowed_types & GIT_CREDENTIAL_USERPASS_PLAINTEXT) {
-		return git_cred_userpass_plaintext_new(out, godot::CString(proper_username).data, godot::CString(creds->password).data);
+		return git_cred_userpass_plaintext_new(out, CString(proper_username).data, CString(creds->password).data);
 	}
 
 	if (allowed_types & GIT_CREDENTIAL_SSH_KEY) {
 		return git_credential_ssh_key_new(out,
-				godot::CString(proper_username).data,
-				godot::CString(creds->ssh_public_key_path).data,
-				godot::CString(creds->ssh_private_key_path).data,
-				godot::CString(creds->ssh_passphrase).data);
+				CString(proper_username).data,
+				CString(creds->ssh_public_key_path).data,
+				CString(creds->ssh_private_key_path).data,
+				CString(creds->ssh_passphrase).data);
 	}
 
 	if (allowed_types & GIT_CREDENTIAL_USERNAME) {
-		return git_credential_username_new(out, godot::CString(proper_username).data);
+		return git_credential_username_new(out, CString(proper_username).data);
 	}
 
 	return GIT_EUSER;
 }
 
 extern "C" int diff_hunk_cb(const git_diff_delta *delta, const git_diff_hunk *range, void *payload) {
-	godot::DiffHelper *diff_helper = (godot::DiffHelper *)payload;
+	DiffHelper *diff_helper = (DiffHelper *)payload;
 
-	godot::Dictionary hunk = diff_helper->git_api->create_diff_hunk(range->old_start, range->new_start, range->old_lines, range->new_lines);
+	godot::Dictionary hunk = diff_helper->git_plugin->create_diff_hunk(range->old_start, range->new_start, range->old_lines, range->new_lines);
 	diff_helper->diff_hunks->push_back(hunk);
 
 	return 1;
-}
+}

godot-git-plugin/src/git_callbacks.h

@@ -1,18 +1,13 @@
-#ifndef GIT_COMMON_H
-#define GIT_COMMON_H
+#pragma once
 
-#include <cstdio>
+#include "godot_cpp/variant/array.hpp"
+#include "git2.h"
 
-#include <Godot.hpp>
+class GitPlugin;
 
-#include <git2.h>
-
-struct Credentials {
-	godot::String username;
-	godot::String password;
-	godot::String ssh_public_key_path;
-	godot::String ssh_private_key_path;
-	godot::String ssh_passphrase;
+struct DiffHelper {
+	godot::Array *diff_hunks;
+	GitPlugin *git_plugin;
 };
 
 extern "C" int progress_cb(const char *str, int len, void *data);
@@ -23,5 +18,3 @@ extern "C" int credentials_cb(git_cred **out, const char *url, const char *usern
 extern "C" int push_transfer_progress_cb(unsigned int current, unsigned int total, size_t bytes, void *payload);
 extern "C" int push_update_reference_cb(const char *refname, const char *status, void *data);
 extern "C" int diff_hunk_cb(const git_diff_delta *delta, const git_diff_hunk *range, void *payload);
-
-#endif // !GIT_COMMON_H

godot-git-plugin/src/git_plugin.cpp

@@ -1,4 +1,11 @@
-#include "git_api.h"
+#include "git_plugin.h"
+
+#include <cstring>
+
+#include <git2/tree.h>
+#include "godot_cpp/core/class_db.hpp"
+#include "godot_cpp/classes/file_access.hpp"
+#include "godot_cpp/variant/utility_functions.hpp"
 
 #define GIT2_CALL(error, msg)                                         \
 	if (check_errors(error, __FUNCTION__, __FILE__, __LINE__, msg)) { \
@@ -22,35 +29,25 @@
 
 #define COMMA ,
 
-namespace godot {
-
-void GitAPI::_register_methods() {
-	register_method("_commit", &GitAPI::_commit);
-	register_method("_get_modified_files_data", &GitAPI::_get_modified_files_data);
-	register_method("_get_remotes", &GitAPI::_get_remotes);
-	register_method("_get_diff", &GitAPI::_get_diff);
-	register_method("_get_vcs_name", &GitAPI::_get_vcs_name);
-	register_method("_initialize", &GitAPI::_initialize);
-	register_method("_shut_down", &GitAPI::_shut_down);
-	register_method("_stage_file", &GitAPI::_stage_file);
-	register_method("_discard_file", &GitAPI::_discard_file);
-	register_method("_unstage_file", &GitAPI::_unstage_file);
-	register_method("_get_previous_commits", &GitAPI::_get_previous_commits);
-	register_method("_get_branch_list", &GitAPI::_get_branch_list);
-	register_method("_create_branch", &GitAPI::_create_branch);
-	register_method("_create_remote", &GitAPI::_create_remote);
-	register_method("_remove_branch", &GitAPI::_remove_branch);
-	register_method("_remove_remote", &GitAPI::_remove_remote);
-	register_method("_get_current_branch_name", &GitAPI::_get_current_branch_name);
-	register_method("_checkout_branch", &GitAPI::_checkout_branch);
-	register_method("_fetch", &GitAPI::_fetch);
-	register_method("_pull", &GitAPI::_pull);
-	register_method("_push", &GitAPI::_push);
-	register_method("_get_line_diff", &GitAPI::_get_line_diff);
-	register_method("_set_credentials", &GitAPI::_set_credentials);
+void GitPlugin::_bind_methods() {
+	// Doesn't seem to require binding functions for now
 }
 
-bool GitAPI::check_errors(int error, String function, String file, int line, String message, const std::vector<git_error_code> &ignores) {
+GitPlugin::GitPlugin() {
+	map_changes[GIT_STATUS_WT_NEW] = CHANGE_TYPE_NEW;
+	map_changes[GIT_STATUS_INDEX_NEW] = CHANGE_TYPE_NEW;
+	map_changes[GIT_STATUS_WT_MODIFIED] = CHANGE_TYPE_MODIFIED;
+	map_changes[GIT_STATUS_INDEX_MODIFIED] = CHANGE_TYPE_MODIFIED;
+	map_changes[GIT_STATUS_WT_RENAMED] = CHANGE_TYPE_RENAMED;
+	map_changes[GIT_STATUS_INDEX_RENAMED] = CHANGE_TYPE_RENAMED;
+	map_changes[GIT_STATUS_WT_DELETED] = CHANGE_TYPE_DELETED;
+	map_changes[GIT_STATUS_INDEX_DELETED] = CHANGE_TYPE_DELETED;
+	map_changes[GIT_STATUS_WT_TYPECHANGE] = CHANGE_TYPE_TYPECHANGE;
+	map_changes[GIT_STATUS_INDEX_TYPECHANGE] = CHANGE_TYPE_TYPECHANGE;
+	map_changes[GIT_STATUS_CONFLICTED] = CHANGE_TYPE_UNMERGED;
+}
+
+bool GitPlugin::check_errors(int error, godot::String function, godot::String file, int line, godot::String message, const std::vector<git_error_code> &ignores) {
 	const git_error *lg2err;
 
 	if (error == 0) {
@@ -63,18 +60,17 @@ bool GitAPI::check_errors(int error, String function, String file, int line, Str
 		}
 	}
 
-	message += ".";
+	message = message + ".";
 	if ((lg2err = git_error_last()) != nullptr && lg2err->message != nullptr) {
-		message += " Error " + String::num_int64(error) + ": ";
-		message += String(lg2err->message);
+		message = message + " Error " + godot::String::num_int64(error) + ": ";
+		message = message + godot::String(lg2err->message);
 	}
 
-	Godot::print_error("GitAPI: " + message, function, file, line);
-	popup_error(message);
+	godot::UtilityFunctions::push_error("GitPlugin: ", CString(message).data, " in ", CString(file).data, ":", CString(function).data, "#L", line);
 	return true;
 }
 
-void GitAPI::_set_credentials(const String username, const String password, const String ssh_public_key_path, const String ssh_private_key_path, const String ssh_passphrase) {
+void GitPlugin::_set_credentials(const godot::String &username, const godot::String &password, const godot::String &ssh_public_key_path, const godot::String &ssh_private_key_path, const godot::String &ssh_passphrase) {
 	creds.username = username;
 	creds.password = password;
 	creds.ssh_public_key_path = ssh_public_key_path;
@@ -82,7 +78,7 @@ void GitAPI::_set_credentials(const String username, const String password, cons
 	creds.ssh_passphrase = ssh_passphrase;
 }
 
-void GitAPI::_discard_file(const String file_path) {
+void GitPlugin::_discard_file(const godot::String &file_path) {
 	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
 	CString c_path(file_path);
 	char *paths[] = { c_path.data };
@@ -92,7 +88,7 @@ void GitAPI::_discard_file(const String file_path) {
 	GIT2_CALL(git_checkout_index(repo.get(), nullptr, &opts), "Could not checkout index");
 }
 
-void GitAPI::_commit(const String msg) {
+void GitPlugin::_commit(const godot::String &msg) {
 	git_index_ptr repo_index;
 	GIT2_CALL(git_repository_index(Capture(repo_index), repo.get()), "Could not get repository index");
 
@@ -152,7 +148,7 @@ void GitAPI::_commit(const String msg) {
 	}
 }
 
-void GitAPI::_stage_file(const String file_path) {
+void GitPlugin::_stage_file(const godot::String &file_path) {
 	CString c_path(file_path);
 	char *paths[] = { c_path.data };
 	git_strarray array = { paths, 1 };
@@ -163,7 +159,7 @@ void GitAPI::_stage_file(const String file_path) {
 	GIT2_CALL(git_index_write(index.get()), "Could not write changes to disk");
 }
 
-void GitAPI::_unstage_file(const String file_path) {
+void GitPlugin::_unstage_file(const godot::String &file_path) {
 	CString c_path(file_path);
 	char *paths[] = { c_path.data };
 	git_strarray array = { paths, 1 };
@@ -187,28 +183,18 @@ void GitAPI::_unstage_file(const String file_path) {
 	}
 }
 
-void GitAPI::create_gitignore_and_gitattributes() {
-	File *file = File::_new();
-
-	if (!file->file_exists("res://.gitignore")) {
-		file->open("res://.gitignore", File::ModeFlags::WRITE);
+void GitPlugin::create_gitignore_and_gitattributes() {
+	if (!godot::FileAccess::file_exists(repo_project_path + "/.gitignore")) {
+		godot::Ref<godot::FileAccess> file = godot::FileAccess::open(repo_project_path + "/.gitignore", godot::FileAccess::ModeFlags::WRITE);
+		ERR_FAIL_COND(file.is_null());
 		file->store_string(
-				"# Godot-specific ignores\n"
-				".import/\n"
-				"export.cfg\n"
-				"export_presets.cfg\n\n"
-
-				"# Imported translations (automatically generated from CSV files)\n"
-				"*.translation\n\n"
-
-				"# Mono-specific ignores\n"
-				".mono/\n"
-				"data_*/\n");
-		file->close();
+				"# Godot 4+ specific ignores\n"
+				".godot/\n");
 	}
 
-	if (!file->file_exists("res://.gitattributes")) {
-		file->open("res://.gitattributes", File::ModeFlags::WRITE);
+	if (!godot::FileAccess::file_exists(repo_project_path + "/.gitattributes")) {
+		godot::Ref<godot::FileAccess> file = godot::FileAccess::open(repo_project_path + "/.gitattributes", godot::FileAccess::ModeFlags::WRITE);
+		ERR_FAIL_COND(file.is_null());
 		file->store_string(
 				"# Set the default behavior, in case people don't have core.autocrlf set.\n"
 				"* text=auto\n\n"
@@ -227,39 +213,11 @@ void GitAPI::create_gitignore_and_gitattributes() {
 				"# Denote all files that are truly binary and should not be modified.\n"
 				"*.png binary\n"
 				"*.jpg binary\n");
-		file->close();
 	}
-
-	file->free();
 }
 
-String GitAPI::get_commit_date(const git_time *intime) {
-	char sign, out[32];
-	struct tm *intm;
-	int offset, hours, minutes;
-	time_t t;
-
-	offset = intime->offset;
-	if (offset < 0) {
-		sign = '-';
-		offset = -offset;
-	} else {
-		sign = '+';
-	}
-
-	hours = offset / 60;
-	minutes = offset % 60;
-
-	t = (time_t)intime->time + (intime->offset * 60);
-
-	intm = gmtime(&t);
-	strftime(out, sizeof(out), "%a %b %e %T %Y", intm);
-
-	return String(out) + " " + sign + (hours < 10 ? "0" : "") + String::num(hours) + ":" + (minutes < 10 ? "0" : "") + String::num(minutes);
-}
-
-Array GitAPI::_get_modified_files_data() {
-	Array stats_files;
+godot::TypedArray<godot::Dictionary> GitPlugin::_get_modified_files_data() {
+	godot::TypedArray<godot::Dictionary> stats_files;
 
 	git_status_options opts = GIT_STATUS_OPTIONS_INIT;
 	opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
@@ -267,45 +225,32 @@ Array GitAPI::_get_modified_files_data() {
 	opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED | GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX | GIT_STATUS_OPT_SORT_CASE_SENSITIVELY | GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
 
 	git_status_list_ptr statuses;
-	GIT2_CALL_R(git_status_list_new(Capture(statuses), repo.get(), &opts), "Could not get status information from repository", Array());
+	GIT2_CALL_R(git_status_list_new(Capture(statuses), repo.get(), &opts), "Could not get status information from repository", godot::TypedArray<godot::Dictionary>());
 
 	size_t count = git_status_list_entrycount(statuses.get());
 	for (size_t i = 0; i < count; ++i) {
 		const git_status_entry *entry = git_status_byindex(statuses.get(), i);
-		String path;
+		godot::String path;
 		if (entry->index_to_workdir) {
 			path = entry->index_to_workdir->new_file.path;
 		} else {
 			path = entry->head_to_index->new_file.path;
 		}
 
-		static Dictionary map_changes = Dictionary::make(
-				GIT_STATUS_WT_NEW, CHANGE_TYPE_NEW,
-				GIT_STATUS_INDEX_NEW, CHANGE_TYPE_NEW,
-				GIT_STATUS_WT_MODIFIED, CHANGE_TYPE_MODIFIED,
-				GIT_STATUS_INDEX_MODIFIED, CHANGE_TYPE_MODIFIED,
-				GIT_STATUS_WT_RENAMED, CHANGE_TYPE_RENAMED,
-				GIT_STATUS_INDEX_RENAMED, CHANGE_TYPE_RENAMED,
-				GIT_STATUS_WT_DELETED, CHANGE_TYPE_DELETED,
-				GIT_STATUS_INDEX_DELETED, CHANGE_TYPE_DELETED,
-				GIT_STATUS_WT_TYPECHANGE, CHANGE_TYPE_TYPECHANGE,
-				GIT_STATUS_INDEX_TYPECHANGE, CHANGE_TYPE_TYPECHANGE,
-				GIT_STATUS_CONFLICTED, CHANGE_TYPE_UNMERGED);
-
 		const static int git_status_wt = GIT_STATUS_WT_NEW | GIT_STATUS_WT_MODIFIED | GIT_STATUS_WT_DELETED | GIT_STATUS_WT_TYPECHANGE | GIT_STATUS_WT_RENAMED | GIT_STATUS_CONFLICTED;
 		const static int git_status_index = GIT_STATUS_INDEX_NEW | GIT_STATUS_INDEX_MODIFIED | GIT_STATUS_INDEX_DELETED | GIT_STATUS_INDEX_RENAMED | GIT_STATUS_INDEX_TYPECHANGE;
 
 		if (entry->status & git_status_wt) {
-			stats_files.push_back(create_status_file(path, map_changes[entry->status & git_status_wt], TREE_AREA_UNSTAGED));
+			stats_files.push_back(create_status_file(path, map_changes[git_status_t(entry->status & git_status_wt)], TREE_AREA_UNSTAGED));
 		}
 
 		if (entry->status & git_status_index) {
 			if (entry->status == GIT_STATUS_INDEX_RENAMED) {
-				String old_path = entry->head_to_index->old_file.path;
-				stats_files.push_back(create_status_file(old_path, map_changes[GIT_STATUS_INDEX_DELETED], TREE_AREA_STAGED));
-				stats_files.push_back(create_status_file(path, map_changes[GIT_STATUS_INDEX_NEW], TREE_AREA_STAGED));
+				godot::String old_path = entry->head_to_index->old_file.path;
+				stats_files.push_back(create_status_file(old_path, map_changes.at(GIT_STATUS_INDEX_DELETED), TREE_AREA_STAGED));
+				stats_files.push_back(create_status_file(path, map_changes.at(GIT_STATUS_INDEX_NEW), TREE_AREA_STAGED));
 			} else {
-				stats_files.push_back(create_status_file(path, map_changes[entry->status & git_status_index], TREE_AREA_STAGED));
+				stats_files.push_back(create_status_file(path, map_changes.at(git_status_t(entry->status & git_status_index)), TREE_AREA_STAGED));
 			}
 		}
 	}
@@ -313,31 +258,31 @@ Array GitAPI::_get_modified_files_data() {
 	return stats_files;
 }
 
-Array GitAPI::_get_branch_list() {
+godot::TypedArray<godot::String> GitPlugin::_get_branch_list() {
 	git_branch_iterator_ptr it;
-	GIT2_CALL_R(git_branch_iterator_new(Capture(it), repo.get(), GIT_BRANCH_LOCAL), "Could not create branch iterator", Array());
+	GIT2_CALL_R(git_branch_iterator_new(Capture(it), repo.get(), GIT_BRANCH_LOCAL), "Could not create branch iterator", godot::TypedArray<godot::Dictionary>());
 
-	Array branch_names;
+	godot::TypedArray<godot::String> branch_names;
 
 	git_reference_ptr ref;
 	git_branch_t type;
 	while (git_branch_next(Capture(ref), &type, it.get()) != GIT_ITEROVER) {
 		const char *name = nullptr;
 
-		GIT2_CALL_R(git_branch_name(&name, ref.get()), "Could not get branch name", Array());
+		GIT2_CALL_R(git_branch_name(&name, ref.get()), "Could not get branch name", godot::TypedArray<godot::String>());
 
 		if (git_branch_is_head(ref.get())) {
 			// Always send the current branch as the first branch in list
 			branch_names.push_front(name);
 		} else {
-			branch_names.push_back(String(name));
+			branch_names.push_back(godot::String(name));
 		}
 	}
 
 	return branch_names;
 }
 
-void GitAPI::_create_branch(const String branch_name) {
+void GitPlugin::_create_branch(const godot::String &branch_name) {
 	git_oid head_commit_id;
 	GIT2_CALL(git_reference_name_to_id(&head_commit_id, repo.get(), "HEAD"), "Could not get HEAD commit ID");
 
@@ -348,51 +293,51 @@ void GitAPI::_create_branch(const String branch_name) {
 	GIT2_CALL(git_branch_create(Capture(branch_ref), repo.get(), CString(branch_name).data, head_commit.get(), 0), "Could not create branch from HEAD");
 }
 
-void GitAPI::_create_remote(const String remote_name, const String remote_url) {
+void GitPlugin::_create_remote(const godot::String &remote_name, const godot::String &remote_url) {
 	git_remote_ptr remote;
 	GIT2_CALL(git_remote_create(Capture(remote), repo.get(), CString(remote_name).data, CString(remote_url).data), "Could not create remote");
 }
 
-void GitAPI::_remove_branch(const String branch_name) {
+void GitPlugin::_remove_branch(const godot::String &branch_name) {
 	git_reference_ptr branch;
 	GIT2_CALL(git_branch_lookup(Capture(branch), repo.get(), CString(branch_name).data, GIT_BRANCH_LOCAL), "Could not find branch " + branch_name);
 	GIT2_CALL(git_branch_delete(branch.get()), "Could not delete branch reference of " + branch_name);
 }
 
-void GitAPI::_remove_remote(const String remote_name) {
+void GitPlugin::_remove_remote(const godot::String &remote_name) {
 	GIT2_CALL(git_remote_delete(repo.get(), CString(remote_name).data), "Could not delete remote " + remote_name);
 }
 
-Array GitAPI::_get_line_diff(String file_path, String text) {
+godot::TypedArray<godot::Dictionary> GitPlugin::_get_line_diff(const godot::String &file_path, const godot::String &text) {
 	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
 
 	opts.context_lines = 0;
 	opts.flags = GIT_DIFF_DISABLE_PATHSPEC_MATCH | GIT_DIFF_INCLUDE_UNTRACKED;
 
 	git_index_ptr index;
-	GIT2_CALL_R(git_repository_index(Capture(index), repo.get()), "Failed to get repository index", Array());
-	GIT2_CALL_R(git_index_read(index.get(), 0), "Failed to read index", Array());
+	GIT2_CALL_R(git_repository_index(Capture(index), repo.get()), "Failed to get repository index", godot::TypedArray<godot::Dictionary>());
+	GIT2_CALL_R(git_index_read(index.get(), 0), "Failed to read index", godot::TypedArray<godot::Dictionary>());
 
 	const git_index_entry *entry = git_index_get_bypath(index.get(), CString(file_path).data, GIT_INDEX_STAGE_NORMAL);
 	if (!entry) {
-		return Array();
+		return godot::TypedArray<godot::Dictionary>();
 	}
 
 	git_reference_ptr head;
-	GIT2_CALL_R(git_repository_head(Capture(head), repo.get()), "Failed to load repository head", Array());
+	GIT2_CALL_R(git_repository_head(Capture(head), repo.get()), "Failed to load repository head", godot::TypedArray<godot::Dictionary>());
 
 	git_blob_ptr blob;
-	GIT2_CALL_R(git_blob_lookup(Capture(blob), repo.get(), &entry->id), "Failed to load head blob", Array());
+	GIT2_CALL_R(git_blob_lookup(Capture(blob), repo.get(), &entry->id), "Failed to load head blob", godot::TypedArray<godot::Dictionary>());
 
-	Array diff_contents;
+	godot::TypedArray<godot::Dictionary> diff_contents;
 
 	DiffHelper diff_helper = { &diff_contents, this };
-	GIT2_CALL_R(git_diff_blob_to_buffer(blob.get(), nullptr, CString(text).data, text.length(), nullptr, &opts, nullptr, nullptr, diff_hunk_cb, nullptr, &diff_helper), "Failed to make diff", Array());
+	GIT2_CALL_R(git_diff_blob_to_buffer(blob.get(), nullptr, CString(text).data, text.length(), nullptr, &opts, nullptr, nullptr, diff_hunk_cb, nullptr, &diff_helper), "Failed to make diff", godot::TypedArray<godot::Dictionary>());
 
 	return diff_contents;
 }
 
-String GitAPI::_get_current_branch_name() {
+godot::String GitPlugin::_get_current_branch_name() {
 	git_reference_ptr head;
 	GIT2_CALL_R_IGNORE(git_repository_head(Capture(head), repo.get()), "Could not find repository HEAD", "", { GIT_ENOTFOUND COMMA GIT_EUNBORNBRANCH });
 
@@ -410,11 +355,11 @@ String GitAPI::_get_current_branch_name() {
 	return name;
 }
 
-Array GitAPI::_get_remotes() {
+godot::TypedArray<godot::String> GitPlugin::_get_remotes() {
 	git_strarray remote_array;
-	GIT2_CALL_R(git_remote_list(&remote_array, repo.get()), "Could not get list of remotes", Array());
+	GIT2_CALL_R(git_remote_list(&remote_array, repo.get()), "Could not get list of remotes", godot::TypedArray<godot::Dictionary>());
 
-	Array remotes;
+	godot::TypedArray<godot::String> remotes;
 	for (int i = 0; i < remote_array.count; i++) {
 		remotes.push_back(remote_array.strings[i]);
 	}
@@ -422,34 +367,34 @@ Array GitAPI::_get_remotes() {
 	return remotes;
 }
 
-Array GitAPI::_get_previous_commits(const int64_t max_commits) {
+godot::TypedArray<godot::Dictionary> GitPlugin::_get_previous_commits(int32_t max_commits) {
 	git_revwalk_ptr walker;
-	GIT2_CALL_R(git_revwalk_new(Capture(walker), repo.get()), "Could not create new revwalk", Array());
-	GIT2_CALL_R(git_revwalk_sorting(walker.get(), GIT_SORT_TIME), "Could not sort revwalk by time", Array());
+	GIT2_CALL_R(git_revwalk_new(Capture(walker), repo.get()), "Could not create new revwalk", godot::TypedArray<godot::Dictionary>());
+	GIT2_CALL_R(git_revwalk_sorting(walker.get(), GIT_SORT_TIME), "Could not sort revwalk by time", godot::TypedArray<godot::Dictionary>());
 
-	GIT2_CALL_R_IGNORE(git_revwalk_push_head(walker.get()), "Could not push HEAD to revwalk", Array(), { GIT_ENOTFOUND COMMA GIT_ERROR });
+	GIT2_CALL_R_IGNORE(git_revwalk_push_head(walker.get()), "Could not push HEAD to revwalk", godot::TypedArray<godot::Dictionary>(), { GIT_ENOTFOUND COMMA GIT_ERROR });
 
 	git_oid oid;
-	Array commits;
+	godot::TypedArray<godot::Dictionary> commits;
 	char commit_id[GIT_OID_HEXSZ + 1];
 	for (int i = 0; !git_revwalk_next(&oid, walker.get()) && i <= max_commits; i++) {
 		git_commit_ptr commit;
 		GIT2_CALL_R(git_commit_lookup(Capture(commit), repo.get(), &oid), "Failed to lookup the commit", commits);
 
 		git_oid_tostr(commit_id, GIT_OID_HEXSZ + 1, git_commit_id(commit.get()));
-		String msg = git_commit_message(commit.get());
+		godot::String msg = git_commit_message(commit.get());
 
 		const git_signature *sig = git_commit_author(commit.get());
-		String author = String() + sig->name + " <" + sig->email + ">";
+		godot::String author = godot::String() + sig->name + " <" + sig->email + ">";
 
-		commits.push_back(create_commit(msg, author, commit_id, get_commit_date(&sig->when)));
+		commits.push_back(create_commit(msg, author, commit_id, sig->when.time, sig->when.offset));
 	}
 
 	return commits;
 }
 
-void GitAPI::_fetch(String remote) {
-	Godot::print("GitAPI: Performing fetch from " + remote);
+void GitPlugin::_fetch(const godot::String &remote) {
+	godot::UtilityFunctions::print("GitPlugin: Performing fetch from ", CString(remote).data);
 
 	git_remote_ptr remote_object;
 	GIT2_CALL(git_remote_lookup(Capture(remote_object), repo.get(), CString(remote).data), "Could not lookup remote \"" + remote + "\"");
@@ -469,11 +414,11 @@ void GitAPI::_fetch(String remote) {
 	opts.callbacks = remote_cbs;
 	GIT2_CALL(git_remote_fetch(remote_object.get(), nullptr, &opts, "fetch"), "Could not fetch data from remote");
 
-	Godot::print("GitAPI: Fetch ended");
+	godot::UtilityFunctions::print("GitPlugin: Fetch ended");
 }
 
-void GitAPI::_pull(String remote) {
-	Godot::print("GitAPI: Performing pull from " + remote);
+void GitPlugin::_pull(const godot::String &remote) {
+	godot::UtilityFunctions::print("GitPlugin: Performing pull from ", CString(remote).data);
 
 	git_remote_ptr remote_object;
 	GIT2_CALL(git_remote_lookup(Capture(remote_object), repo.get(), CString(remote).data), "Could not lookup remote \"" + remote + "\"");
@@ -492,7 +437,7 @@ void GitAPI::_pull(String remote) {
 	git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT;
 	fetch_opts.callbacks = remote_cbs;
 
-	String branch_name = _get_current_branch_name();
+	godot::String branch_name = _get_current_branch_name();
 
 	CString ref_spec_str("refs/heads/" + branch_name);
 
@@ -505,7 +450,7 @@ void GitAPI::_pull(String remote) {
 	GIT2_CALL(git_repository_fetchhead_foreach(repo.get(), fetchhead_foreach_cb, &pull_merge_oid), "Could not read \"FETCH_HEAD\" file");
 
 	if (git_oid_is_zero(&pull_merge_oid)) {
-		popup_error("GitAPI: Could not find remote branch HEAD for " + branch_name + ". Try pushing the branch first.");
+		godot::UtilityFunctions::push_error("GitPlugin: Could not find remote branch HEAD for " + branch_name + ". Try pushing the branch first.");
 		return;
 	}
 
@@ -526,7 +471,7 @@ void GitAPI::_pull(String remote) {
 		GIT2_CALL(git_repository_head(Capture(target_ref), repo.get()), "Failed to get HEAD reference");
 
 		git_object_ptr target;
-		GIT2_CALL(git_object_lookup(Capture(target), repo.get(), &pull_merge_oid, GIT_OBJECT_COMMIT), "Failed to lookup OID " + String(git_oid_tostr_s(&pull_merge_oid)));
+		GIT2_CALL(git_object_lookup(Capture(target), repo.get(), &pull_merge_oid, GIT_OBJECT_COMMIT), "Failed to lookup OID " + godot::String(git_oid_tostr_s(&pull_merge_oid)));
 
 		ff_checkout_options.checkout_strategy = GIT_CHECKOUT_SAFE;
 		GIT2_CALL(git_checkout_tree(repo.get(), target.get(), &ff_checkout_options), "Failed to checkout HEAD reference");
@@ -534,7 +479,7 @@ void GitAPI::_pull(String remote) {
 		git_reference_ptr new_target_ref;
 		GIT2_CALL(git_reference_set_target(Capture(new_target_ref), target_ref.get(), &pull_merge_oid, nullptr), "Failed to move HEAD reference");
 
-		Godot::print("GitAPI: Fast Forwarded");
+		godot::UtilityFunctions::print("GitPlugin: Fast Forwarded");
 		GIT2_CALL(git_repository_state_cleanup(repo.get()), "Could not clean repository state");
 
 	} else if (merge_analysis & GIT_MERGE_ANALYSIS_NORMAL) {
@@ -550,27 +495,27 @@ void GitAPI::_pull(String remote) {
 		GIT2_CALL(git_repository_index(Capture(index), repo.get()), "Could not get repository index");
 
 		if (git_index_has_conflicts(index.get())) {
-			popup_error("GitAPI: Index has conflicts, Solve conflicts and make a merge commit.");
+			godot::UtilityFunctions::push_error("GitPlugin: Index has conflicts. Solve conflicts and make a merge commit.");
 		} else {
-			popup_error("GitAPI: Change are staged, make a merge commit.");
+			godot::UtilityFunctions::push_error("GitPlugin: Changes are staged. Make a merge commit.");
 		}
 
 		has_merge = true;
 
 	} else if (merge_analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE) {
-		Godot::print("GitAPI: Already up to date");
+		godot::UtilityFunctions::print("GitPlugin: Already up to date");
 
 		GIT2_CALL(git_repository_state_cleanup(repo.get()), "Could not clean repository state");
 
 	} else {
-		Godot::print("GitAPI: Can not merge");
+		godot::UtilityFunctions::push_error("GitPlugin: Can not merge");
 	}
 
-	Godot::print("GitAPI: Pull ended");
+	godot::UtilityFunctions::print("GitPlugin: Pull ended");
 }
 
-void GitAPI::_push(const String remote, const bool force) {
-	Godot::print("GitAPI: Performing push to " + remote);
+void GitPlugin::_push(const godot::String &remote, bool force) {
+	godot::UtilityFunctions::print("GitPlugin: Performing push to ", CString(remote).data);
 
 	git_remote_ptr remote_object;
 	GIT2_CALL(git_remote_lookup(Capture(remote_object), repo.get(), CString(remote).data), "Could not lookup remote \"" + remote + "\"");
@@ -586,9 +531,9 @@ void GitAPI::_push(const String remote, const bool force) {
 
 	GIT2_CALL(git_remote_connect(remote_object.get(), GIT_DIRECTION_PUSH, &remote_cbs, nullptr, nullptr), "Could not connect to remote \"" + remote + "\". Are your credentials correct? Try using a PAT token (in case you are using Github) as your password");
 
-	String branch_name = _get_current_branch_name();
+	godot::String branch_name = _get_current_branch_name();
 
-	CString pushspec(String() + (force ? "+" : "") + "refs/heads/" + branch_name);
+	CString pushspec(godot::String() + (force ? "+" : "") + "refs/heads/" + branch_name);
 	const git_strarray refspec = { &pushspec.data, 1 };
 
 	git_push_options push_options = GIT_PUSH_OPTIONS_INIT;
@@ -596,10 +541,10 @@ void GitAPI::_push(const String remote, const bool force) {
 
 	GIT2_CALL(git_remote_push(remote_object.get(), &refspec, &push_options), "Failed to push");
 
-	Godot::print("GitAPI: Push ended");
+	godot::UtilityFunctions::print("GitPlugin: Push ended");
 }
 
-bool GitAPI::_checkout_branch(String branch_name) {
+bool GitPlugin::_checkout_branch(const godot::String &branch_name) {
 	git_reference_ptr branch;
 	GIT2_CALL_R(git_branch_lookup(Capture(branch), repo.get(), CString(branch_name).data, GIT_BRANCH_LOCAL), "Could not find branch", false);
 	const char *branch_ref_name = git_reference_name(branch.get());
@@ -615,9 +560,9 @@ bool GitAPI::_checkout_branch(String branch_name) {
 	return true;
 }
 
-Array GitAPI::_get_diff(const String identifier, const int64_t area) {
+godot::TypedArray<godot::Dictionary> GitPlugin::_get_diff(const godot::String &identifier, const int32_t area) {
 	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
-	Array diff_contents;
+	godot::TypedArray<godot::Dictionary> diff_contents;
 
 	opts.context_lines = 2;
 	opts.interhunk_lines = 0;
@@ -676,34 +621,36 @@ Array GitAPI::_get_diff(const String identifier, const int64_t area) {
 	return diff_contents;
 }
 
-Array GitAPI::_parse_diff(git_diff *diff) {
-	Array diff_contents;
+godot::TypedArray<godot::Dictionary> GitPlugin::_parse_diff(git_diff *diff) {
+	godot::TypedArray<godot::Dictionary> diff_contents;
 	for (int i = 0; i < git_diff_num_deltas(diff); i++) {
 		const git_diff_delta *delta = git_diff_get_delta(diff, i);
 
 		git_patch_ptr patch;
-		GIT2_CALL_R(git_patch_from_diff(Capture(patch), diff, i), "Could not create patch from diff", Array());
+		GIT2_CALL_R(git_patch_from_diff(Capture(patch), diff, i), "Could not create patch from diff", godot::TypedArray<godot::Dictionary>());
 
-		Dictionary diff_file = create_diff_file(delta->new_file.path, delta->old_file.path);
+		godot::Dictionary diff_file = create_diff_file(delta->new_file.path, delta->old_file.path);
 
-		Array diff_hunks;
+		godot::TypedArray<godot::Dictionary> diff_hunks;
 		for (int j = 0; j < git_patch_num_hunks(patch.get()); j++) {
 			const git_diff_hunk *git_hunk;
 			size_t line_count;
-			GIT2_CALL_R(git_patch_get_hunk(&git_hunk, &line_count, patch.get(), j), "Could not get hunk from patch", Array());
+			GIT2_CALL_R(git_patch_get_hunk(&git_hunk, &line_count, patch.get(), j), "Could not get hunk from patch", godot::TypedArray<godot::Dictionary>());
 
-			Dictionary diff_hunk = create_diff_hunk(git_hunk->old_start, git_hunk->new_start, git_hunk->old_lines, git_hunk->new_lines);
+			godot::Dictionary diff_hunk = create_diff_hunk(git_hunk->old_start, git_hunk->new_start, git_hunk->old_lines, git_hunk->new_lines);
 
-			Array diff_lines;
+			godot::TypedArray<godot::Dictionary> diff_lines;
 			for (int k = 0; k < line_count; k++) {
 				const git_diff_line *git_diff_line;
-				GIT2_CALL_R(git_patch_get_line_in_hunk(&git_diff_line, patch.get(), j, k), "Could not get line from hunk in patch", Array());
+				GIT2_CALL_R(git_patch_get_line_in_hunk(&git_diff_line, patch.get(), j, k), "Could not get line from hunk in patch", godot::TypedArray<godot::Dictionary>());
 
 				char *content = new char[git_diff_line->content_len + 1];
-				memcpy(content, git_diff_line->content, git_diff_line->content_len);
+				std::memcpy(content, git_diff_line->content, git_diff_line->content_len);
 				content[git_diff_line->content_len] = '\0';
 
-				diff_lines.push_back(create_diff_line(git_diff_line->new_lineno, git_diff_line->old_lineno, String(content), String(git_diff_line->origin)));
+				godot::String status = " "; // We reserve 1 null terminated space to fill the + or the - character at git_diff_line->origin
+				status[0] = git_diff_line->origin;
+				diff_lines.push_back(create_diff_line(git_diff_line->new_lineno, git_diff_line->old_lineno, godot::String(content), status));
 
 				delete[] content;
 			}
@@ -717,11 +664,13 @@ Array GitAPI::_parse_diff(git_diff *diff) {
 	return diff_contents;
 }
 
-String GitAPI::_get_vcs_name() {
+godot::String GitPlugin::_get_vcs_name() {
 	return "Git";
 }
 
-bool GitAPI::_initialize(String project_path) {
+bool GitPlugin::_initialize(const godot::String &project_path) {
+	using namespace godot;
+
 	ERR_FAIL_COND_V(project_path == "", false);
 
 	int init = git_libgit2_init();
@@ -729,7 +678,20 @@ bool GitAPI::_initialize(String project_path) {
 		WARN_PRINT("Multiple libgit2 instances are running");
 	}
 
-	GIT2_CALL_R(git_repository_init(Capture(repo), CString(project_path).data, 0), "Could not initialize repository", false);
+	git_buf discovered_repo_path = {};
+	if (git_repository_discover(&discovered_repo_path, CString(project_path).data, 1, nullptr) == 0) {
+		repo_project_path = godot::String(discovered_repo_path.ptr);
+
+		godot::UtilityFunctions::print("Found a repository at " + godot::String(discovered_repo_path.ptr) + ".");
+		git_buf_dispose(&discovered_repo_path);
+	} else {
+		repo_project_path = project_path;
+
+		godot::UtilityFunctions::push_warning("Could not find any higher level repositories.");
+	}
+
+	godot::UtilityFunctions::print("Selected repository path: " + godot::String(repo_project_path) + ".");
+	GIT2_CALL_R(git_repository_init(Capture(repo), CString(repo_project_path).data, 0), "Could not initialize repository", false);
 
 	git_reference_ptr head;
 	GIT2_CALL_R_IGNORE(git_repository_head(Capture(head), repo.get()), "Could not get repository HEAD", false, { GIT_EUNBORNBRANCH COMMA GIT_ENOTFOUND });
@@ -741,13 +703,8 @@ bool GitAPI::_initialize(String project_path) {
 	return true;
 }
 
-bool GitAPI::_shut_down() {
+bool GitPlugin::_shut_down() {
 	repo.reset(); // Destroy repo object before libgit2 shuts down
 	GIT2_CALL_R(git_libgit2_shutdown(), "Could not shutdown Git Plugin", false);
 	return true;
 }
-
-void GitAPI::_init() {
-}
-
-} // namespace godot

godot-git-plugin/src/git_plugin.h

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <unordered_map>
+
+#include "git_callbacks.h"
+#include "git_wrappers.h"
+
+#include "godot_cpp/classes/editor_vcs_interface.hpp"
+#include "git2.h"
+
+struct Credentials {
+	godot::String username;
+	godot::String password;
+	godot::String ssh_public_key_path;
+	godot::String ssh_private_key_path;
+	godot::String ssh_passphrase;
+};
+
+class GitPlugin : public godot::EditorVCSInterface {
+	GDCLASS(GitPlugin, godot::EditorVCSInterface);
+
+protected:
+	static void _bind_methods();
+
+public:
+	Credentials creds;
+	bool has_merge = false;
+	git_repository_ptr repo;
+	git_oid pull_merge_oid = {};
+	godot::String repo_project_path;
+	std::unordered_map<git_status_t, ChangeType> map_changes;
+
+	GitPlugin();
+
+	// Endpoints
+	bool _initialize(const godot::String &project_path) override;
+	void _set_credentials(const godot::String &username, const godot::String &password, const godot::String &ssh_public_key_path, const godot::String &ssh_private_key_path, const godot::String &ssh_passphrase) override;
+	godot::TypedArray<godot::Dictionary> _get_modified_files_data() override;
+	void _stage_file(const godot::String &file_path) override;
+	void _unstage_file(const godot::String &file_path) override;
+	void _discard_file(const godot::String &file_path) override;
+	void _commit(const godot::String &msg) override;
+	godot::TypedArray<godot::Dictionary> _get_diff(const godot::String &identifier, int32_t area) override;
+	bool _shut_down() override;
+	godot::String _get_vcs_name() override;
+	godot::TypedArray<godot::Dictionary> _get_previous_commits(int32_t max_commits) override;
+	godot::TypedArray<godot::String> _get_branch_list() override;
+	godot::TypedArray<godot::String> _get_remotes() override;
+	void _create_branch(const godot::String &branch_name) override;
+	void _remove_branch(const godot::String &branch_name) override;
+	void _create_remote(const godot::String &remote_name, const godot::String &remote_url) override;
+	void _remove_remote(const godot::String &remote_name) override;
+	godot::String _get_current_branch_name() override;
+	bool _checkout_branch(const godot::String &branch_name) override;
+	void _pull(const godot::String &remote) override;
+	void _push(const godot::String &remote, bool force) override;
+	void _fetch(const godot::String &remote) override;
+	godot::TypedArray<godot::Dictionary> _get_line_diff(const godot::String &file_path, const godot::String &text) override;
+
+	// Helpers
+	godot::TypedArray<godot::Dictionary> _parse_diff(git_diff *p_diff);
+	bool check_errors(int error, godot::String function, godot::String file, int line, godot::String message, const std::vector<git_error_code> &ignores = {});
+	void create_gitignore_and_gitattributes();
+	bool create_initial_commit();
+};

godot-git-plugin/src/git_wrappers.cpp

@@ -0,0 +1,18 @@
+#include "git_wrappers.h"
+
+#include <cstring>
+
+CString::CString(const godot::String &string) {
+	godot::CharString godot_char_str = string.utf8();
+
+	data = new char[godot_char_str.length() + 1];
+	std::memcpy(data, (void *)godot_char_str.get_data(), godot_char_str.length());
+	data[godot_char_str.length()] = '\0';
+}
+
+CString::~CString() {
+	if (data) {
+		delete[] data;
+		data = nullptr;
+	}
+}

godot-git-plugin/src/git_wrappers.h

@@ -0,0 +1,74 @@
+#pragma once
+
+#include <memory>
+
+#include "godot_cpp/variant/string.hpp"
+#include "git2.h"
+
+class GitPlugin;
+
+struct CString {
+	char *data = nullptr;
+
+	CString(const godot::String &string);
+	~CString();
+	CString() = delete;
+	CString(CString &&) = delete;
+	CString &operator=(const CString &) = delete;
+	CString &operator=(CString &&) = delete;
+};
+
+template <class T>
+class Capture {
+	T &smart_ptr = nullptr;
+
+	using Raw = decltype(smart_ptr.get());
+
+	Raw raw = nullptr;
+
+public:
+	Capture() = delete;
+	Capture(T &ptr) :
+			smart_ptr(ptr) {}
+	Capture(Capture &&) = delete;
+	Capture &operator=(const Capture &) = delete;
+	Capture &operator=(Capture &&) = delete;
+
+	operator Raw *() {
+		return &raw;
+	}
+
+	~Capture() {
+		if (raw) {
+			smart_ptr.reset(raw);
+		}
+	}
+};
+
+template <auto DeleteFn>
+struct FunctionDeleter {
+	template <class T>
+	void operator()(T *ptr) {
+		DeleteFn(ptr);
+	}
+};
+
+template <class T, auto DeleteFn>
+using unique_ptr_deleter = std::unique_ptr<T, FunctionDeleter<DeleteFn>>;
+
+using git_annotated_commit_ptr = unique_ptr_deleter<git_annotated_commit, git_annotated_commit_free>;
+using git_blob_ptr = unique_ptr_deleter<git_blob, git_blob_free>;
+using git_branch_iterator_ptr = unique_ptr_deleter<git_branch_iterator, git_branch_iterator_free>;
+using git_commit_ptr = unique_ptr_deleter<git_commit, git_commit_free>;
+using git_diff_ptr = unique_ptr_deleter<git_diff, git_diff_free>;
+using git_index_ptr = unique_ptr_deleter<git_index, git_index_free>;
+using git_object_ptr = unique_ptr_deleter<git_object, git_object_free>;
+using git_patch_ptr = unique_ptr_deleter<git_patch, git_patch_free>;
+using git_reference_ptr = unique_ptr_deleter<git_reference, git_reference_free>;
+using git_remote_ptr = unique_ptr_deleter<git_remote, git_remote_free>;
+using git_repository_ptr = unique_ptr_deleter<git_repository, git_repository_free>;
+using git_revwalk_ptr = unique_ptr_deleter<git_revwalk, git_revwalk_free>;
+using git_signature_ptr = unique_ptr_deleter<git_signature, git_signature_free>;
+using git_status_list_ptr = unique_ptr_deleter<git_status_list, git_status_list_free>;
+using git_tree_ptr = unique_ptr_deleter<git_tree, git_tree_free>;
+using git_tree_entry_ptr = unique_ptr_deleter<git_tree_entry, git_tree_entry_free>;

icon.svg

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="1024"
+   width="1024"
+   version="1.1"
+   id="svg47"
+   sodipodi:docname="icon_color.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   inkscape:export-filename="icon_color.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs51">
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask11953">
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.754231;stroke-opacity:1"
+         id="rect11955"
+         width="43.98111"
+         height="4.7610822"
+         x="490.15945"
+         y="230.63536" />
+    </mask>
+  </defs>
+  <sodipodi:namedview
+     id="namedview49"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="true"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     shape-rendering="auto"
+     inkscape:zoom="1"
+     inkscape:cx="304"
+     inkscape:cy="521"
+     inkscape:window-width="2560"
+     inkscape:window-height="1387"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg47">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2088" />
+  </sodipodi:namedview>
+  <path
+     d="m0 0s-.325 1.994-.515 1.976l-36.182-3.491c-2.879-.278-5.115-2.574-5.317-5.459l-.994-14.247-27.992-1.997-1.904 12.912c-.424 2.872-2.932 5.037-5.835 5.037h-38.188c-2.902 0-5.41-2.165-5.834-5.037l-1.905-12.912-27.992 1.997-.994 14.247c-.202 2.886-2.438 5.182-5.317 5.46l-36.2 3.49c-.187.018-.324-1.978-.511-1.978l-.049-7.83 30.658-4.944 1.004-14.374c.203-2.91 2.551-5.263 5.463-5.472l38.551-2.75c.146-.01.29-.016.434-.016 2.897 0 5.401 2.166 5.825 5.038l1.959 13.286h28.005l1.959-13.286c.423-2.871 2.93-5.037 5.831-5.037.142 0 .284.005.423.015l38.556 2.75c2.911.209 5.26 2.562 5.463 5.472l1.003 14.374 30.645 4.966z"
+     fill="#fff"
+     transform="matrix(4.162611 0 0 -4.162611 919.24059 673.152141)"
+     id="path31" />
+  <path
+     d="m0 0v-47.514-6.035-5.492c.108-.001.216-.005.323-.015l36.196-3.49c1.896-.183 3.382-1.709 3.514-3.609l1.116-15.978 31.574-2.253 2.175 14.747c.282 1.912 1.922 3.329 3.856 3.329h38.188c1.933 0 3.573-1.417 3.855-3.329l2.175-14.747 31.575 2.253 1.115 15.978c.133 1.9 1.618 3.425 3.514 3.609l36.182 3.49c.107.01.214.014.322.015v4.711l.015.005v54.325c5.09692 6.4164715 9.92323 13.494208 13.621 19.449-5.651 9.62-12.575 18.217-19.976 26.182-6.864-3.455-13.531-7.369-19.828-11.534-3.151 3.132-6.7 5.694-10.186 8.372-3.425 2.751-7.285 4.768-10.946 7.118 1.09 8.117 1.629 16.108 1.846 24.448-9.446 4.754-19.519 7.906-29.708 10.17-4.068-6.837-7.788-14.241-11.028-21.479-3.842.642-7.702.88-11.567.926v.006c-.027 0-.052-.006-.075-.006-.024 0-.049.006-.073.006v-.006c-3.872-.046-7.729-.284-11.572-.926-3.238 7.238-6.956 14.642-11.03 21.479-10.184-2.264-20.258-5.416-29.703-10.17.216-8.34.755-16.331 1.848-24.448-3.668-2.35-7.523-4.367-10.949-7.118-3.481-2.678-7.036-5.24-10.188-8.372-6.297 4.165-12.962 8.079-19.828 11.534-7.401-7.965-14.321-16.562-19.974-26.182 4.4426579-6.973692 9.2079702-13.9828876 13.621-19.449z"
+     fill="#478cbf"
+     transform="matrix(4.162611 0 0 -4.162611 104.69892 427.387251)"
+     id="path33"
+     style="fill:#ef5132;fill-opacity:1" />
+  <path
+     d="m0 0-1.121-16.063c-.135-1.936-1.675-3.477-3.611-3.616l-38.555-2.751c-.094-.007-.188-.01-.281-.01-1.916 0-3.569 1.406-3.852 3.33l-2.211 14.994h-31.459l-2.211-14.994c-.297-2.018-2.101-3.469-4.133-3.32l-38.555 2.751c-1.936.139-3.476 1.68-3.611 3.616l-1.121 16.063-32.547 3.138c.015-3.498.06-7.33.06-8.093 0-34.374 43.605-50.896 97.781-51.086h.066.067c54.176.19 97.766 16.712 97.766 51.086 0 .777.047 4.593.063 8.093z"
+     fill="#478cbf"
+     transform="matrix(4.162611 0 0 -4.162611 784.07144 718.723121)"
+     id="path35"
+     style="fill:#ef5132;fill-opacity:1" />
+  <path
+     d="m0 0c0-12.052-9.765-21.815-21.813-21.815-12.042 0-21.81 9.763-21.81 21.815 0 12.044 9.768 21.802 21.81 21.802 12.048 0 21.813-9.758 21.813-21.802"
+     fill="#fff"
+     transform="matrix(4.162611 0 0 -4.162611 389.21484 527.151321)"
+     id="path37" />
+  <path
+     d="m0 0c0-7.994-6.479-14.473-14.479-14.473-7.996 0-14.479 6.479-14.479 14.473s6.483 14.479 14.479 14.479c8 0 14.479-6.485 14.479-14.479"
+     fill="#414042"
+     transform="matrix(4.162611 0 0 -4.162611 367.36686 532.537071)"
+     id="path39" />
+  <path
+     d="m0 0c-3.878 0-7.021 2.858-7.021 6.381v20.081c0 3.52 3.143 6.381 7.021 6.381s7.028-2.861 7.028-6.381v-20.081c0-3.523-3.15-6.381-7.028-6.381"
+     fill="#fff"
+     transform="matrix(4.162611 0 0 -4.162611 511.99336 626.219821)"
+     id="path41" />
+  <path
+     d="m0 0c0-12.052 9.765-21.815 21.815-21.815 12.041 0 21.808 9.763 21.808 21.815 0 12.044-9.767 21.802-21.808 21.802-12.05 0-21.815-9.758-21.815-21.802"
+     fill="#fff"
+     transform="matrix(4.162611 0 0 -4.162611 634.78706 527.151321)"
+     id="path43" />
+  <path
+     d="m0 0c0-7.994 6.477-14.473 14.471-14.473 8.002 0 14.479 6.479 14.479 14.473s-6.477 14.479-14.479 14.479c-7.994 0-14.471-6.485-14.471-14.479"
+     fill="#414042"
+     transform="matrix(4.162611 0 0 -4.162611 656.64056 532.537071)"
+     id="path45" />
+  <path
+     style="fill:#ef5132;fill-opacity:1"
+     d="m 104.57536,667.20303 -0.15289,43.87884 145.09067,135.30584 582.80887,-29.96604 87.13745,-108.31356 -0.43243,-43.78378 -494.37838,-12.64865 z"
+     id="path265" />
+  <path
+     style="fill:#ef5132;fill-opacity:1"
+     d="m 181.01934,403.62419 666.59147,9.78483 -13.45414,250.73625 -659.25285,-11.00794 z"
+     id="path1205" />
+  <g
+     id="g6283"
+     transform="matrix(1.325853,0,0,1.325853,-167.12939,-143.97607)"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1">
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="path2034"
+       cx="511.42264"
+       cy="380.99677"
+       rx="54.428112"
+       ry="56.874317" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="path2034-8"
+       cx="512.48041"
+       cy="716.73877"
+       rx="54.428112"
+       ry="56.874317" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="path2034-8-0"
+       cx="653.41595"
+       cy="520.51215"
+       rx="54.428112"
+       ry="56.874317" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+       d="m 490.15878,667.66169 h 44.03173 V 432.76846 l 72.41241,72.41241 31.15384,-31.15384 -84.5946,-84.5946 h -63 z"
+       id="path5896" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.20357;stroke-opacity:1"
+       d="m 490.16216,232.8165 h 44 V 336 h -44 z"
+       id="path6276" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.754231;stroke-opacity:1"
+       d="m 475.66408,234.00582 h 73.09797 c 0,0 -32.71498,-6.71602 -73.09797,0 z"
+       id="path11529"
+       sodipodi:nodetypes="ccc"
+       mask="url(#mask11953)" />
+  </g>
+</svg>

release.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# This script is used to create releases for this plugin. This is mostly a helper script for the maintainer.
+
+echo "Enter the new version number (e.g. 1.2.1):"
+read version
+
+echo "Enter the Windows x64 release ZIP URL:"
+read windowsZIPURL
+
+echo "Enter the Linux x64 release ZIP URL:"
+read linuxZIPURL
+
+echo "Enter the MacOS universal release ZIP URL:"
+read macZIPURL
+
+# wget-ing the github.com URL gives a 404, so we use the method proposed here - https://github.com/actions/upload-artifact/issues/51#issuecomment-735989475
+windowsZIPURL=${windowsZIPURL/github.com/nightly.link}
+linuxZIPURL=${linuxZIPURL/github.com/nightly.link}
+macZIPURL=${macZIPURL/github.com/nightly.link}
+
+wget -O windows.zip $windowsZIPURL
+wget -O linux.zip $linuxZIPURL
+wget -O mac.zip $macZIPURL
+
+unzip windows.zip -d windows/
+unzip linux.zip -d linux/
+unzip mac.zip -d mac/
+
+releasePath=godot-git-plugin-v$version
+mkdir $releasePath
+
+cp -r windows/addons/ $releasePath
+addonsPath=$releasePath/addons
+pluginPath=$addonsPath/godot-git-plugin
+
+mkdir $pluginPath/linux
+mkdir $pluginPath/macos
+cp -r linux/addons/godot-git-plugin/linux/ $pluginPath/
+cp -r mac/addons/godot-git-plugin/macos/ $pluginPath/
+
+sed -i "s/version=\"[^\"]*\"/version=\"v${version}\"/g" $pluginPath/plugin.cfg
+cp LICENSE $pluginPath/LICENSE
+cp THIRDPARTY.md $pluginPath/THIRDPARTY.md
+
+zip -r $releasePath.zip $addonsPath 
+
+rm -rf $releasePath
+rm -rf windows
+rm -rf linux
+rm -rf mac
+rm windows.zip
+rm linux.zip
+rm mac.zip

thirdparty/SCsub

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
 
+Import("env")
+
 SConscript("ssh2/SCsub")
 SConscript("git2/SCsub")

thirdparty/git2/SCsub

@@ -23,10 +23,10 @@ libgit2_sources += Glob("libgit2/deps/http-parser/" + "*.c")
 libgit2_sources += Glob("libgit2/deps/pcre/" + "*.c")
 libgit2_sources += Glob("libgit2/deps/zlib/" + "*.c")
 
-if env_git["bits"] == 64:
-    env_git.Prepend(CPPDEFINES=["GIT_ARCH_64"])
-elif env_git["bits"] == 32:
+if "32" in env["arch"]:
     env_git.Prepend(CPPDEFINES=["GIT_ARCH_32"])
+else:
+    env_git.Prepend(CPPDEFINES=["GIT_ARCH_64"])
 
 env_git.Prepend(
     CPPPATH=[
@@ -85,7 +85,7 @@ if env_git["platform"] == "windows":
         ]
     )
 
-if env_git["platform"] in ["linux", "osx"]:
+if env_git["platform"] in ["linux", "macos"]:
     env_git.Append(CCFLAGS="-fPIC")
     libgit2_sources += Glob("libgit2/src/unix/" + "*.c")
     libgit2_sources += [
@@ -126,7 +126,7 @@ if env_git["platform"] in ["linux", "osx"]:
         ]
     )
 
-if env_git["platform"] == "osx":
+if env_git["platform"] == "macos":
     env_git.Prepend(CPPPATH=[env_git["macos_openssl"] + "include/"])
     static_ssl = File(env_git["macos_openssl_static_ssl"])
     static_crypto = File(env_git["macos_openssl_static_crypto"])

thirdparty/ssh2/SCsub

@@ -31,6 +31,7 @@ libssh2_sources = [
     "libssh2/src/misc.c",
     "libssh2/src/pem.c",
     "libssh2/src/session.c",
+    "libssh2/src/userauth_kbd_packet.c",
     "libssh2/src/userauth.c",
 ]
 
@@ -57,7 +58,7 @@ if env_ssh2["platform"] == "windows":
     )
     env_ssh2.Append(LIBS=["crypt32", "user32"])
 
-if env_ssh2["platform"] in ["linux", "osx"]:
+if env_ssh2["platform"] in ["linux", "macos"]:
     env_ssh2.Append(CCFLAGS="-fPIC")
     env_ssh2.Append(
         CPPPATH=[
@@ -104,7 +105,7 @@ if env_ssh2["platform"] in ["linux", "osx"]:
         ]
     )
 
-if env_ssh2["platform"] == "osx":
+if env_ssh2["platform"] == "macos":
     env_ssh2.Append(CPPPATH=[env_ssh2["macos_openssl"] + "include/"])
     static_ssl = File(env_ssh2["macos_openssl_static_ssl"])
     static_crypto = File(env_ssh2["macos_openssl_static_crypto"])