Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update UEGitPlugin to be compatible with UE5.1 #1

Open
wants to merge 47 commits into
base: master
Choose a base branch
from

Conversation

Louspirit
Copy link

@Louspirit Louspirit commented Dec 30, 2022

See SRombauts#161
It crashes on diff...

sinbad and others added 29 commits July 31, 2020 16:57
I found that in practice too often there was an "unlinking" error which was down to
git lfs not being able to replace files UE had open, which left the repo mid-rebase
which is nasty for people not familiar how to resolve. Best to be safe & avoid.
However this now displays a dialog to assist with the process.
Instead of trying to unload all the packages and reload, since this can crash Unreal in some cases, a more sensible is presented on this commit.

First we do a fetch, afterwards we read the changed files on index, and also check which files we have unstaged.
Grab the packages for those files and unload the packages.
Then the normal workflow carries on, doing the pull --rebase, and reloading the unloaded packages.

The only missing point right now is not unloading files on any local commit not yet on remote, but this should a lesser evil then unloading all the files.
…it work robustly with LFS, and battle test.

See [ProjectBorealis GitPlugin v3](https://github.com/ProjectBorealis/UEGitPlugin)

#169 Maybe archive this repo and link to an updated fork?
Run Git Command Line Interface commands directly from the Unreal Editor Console, BLueprints of C++ code.
Add a 'git' Unreal Editor Console command.
Stop auto-pulling when git push fails, ask user to resolve externally
Add the option to NOT push after commit on Submit when using LFS
This is required to prevent it from showing in all projects even when source control is not enabled.
Keep compatibility with Unreal Engine 4
It has always be a pain
And now that I want to support both UE4 & UE5 that have different dll names

Fix #119 Why is UE4Editor-GitSourceControl.dll added to source control?
Make the git console command register dynamically
Build Script enc_temp_folder .vsconfig .ignore *.code-workspace
Provide default implementations in FGitSourceControlProvider for

 - UsesFileRevisions() returns false since partial 'Sync' doesn't make sense for Git, only for Perforce
 - IsAtLatestRevision() return an empty TOptional since the feature is only experimental and hidden under an undocumented settings DisplaySourceControlSyncStatus
 - GetNumLocalChanges() return an empty TOptional since the feature is only experimental and hidden under an undocumented settings DisplaySourceControlCheckInStatus
@Louspirit Louspirit changed the title test Update UEGitPlugin to be compatible with UE5.1 Dec 30, 2022
@Louspirit Louspirit marked this pull request as ready for review December 30, 2022 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants