Additional source control functionality

[austincondiff]

Description

We are improving upon existing source control functionality by doing the following...

• Added push functionality and sheet.
• Added pull functionality and sheet.
• Added manual fetch functionality and fetching sheet.
• Reorganized source control files in project
  • Renamed Features/Git to Features/SourceControl
  • Moved sheet views into it from the Source Control Navigator
  • Moved models out of Client
• Moved the sync view above commit form in source control changes navigator.
• Refreshing remotes cache after adding a remote.
• Moved push and pull state variables into the source control manager.
• Added a confirm branch switch sheet.
• Stashing changes if changes exist when attempting to pull or switch branches.
• Setting remote for push and pull after adding a remote.
• Added warning alerts if uncommitted changes are not present
• It is now possible to switch to a remote branch and create a new branch from a remote branch.
• Disabling rename branch for remote branches.

Testing

Note to reviewers... Please pull down and test this in addition to reviewing the code. Once you have this pulled down...

In a terminal run...

mkdir test.git
cd test.git
git init --bare

Then add the remote in CodeEdit by

1. going to the Source Control Navigator
2. If not already click Initiate to start a git repo
3. go to the Repositories tab
4. Right click Remotes and click Add existing remote...
5. Give the remote a name like "test" (the first remote will be "origin") and enter the path to test.git
6. You can now make changes, commit, and push via the Changes tab in the Source Control Navigator
7. You can set up additional projects by repeating steps 1-5 so you can make changes elsewhere and test pull functionality.
8. You can create additional remotes as well to test managing a project with multiple remotes, pushing and pulling from them, etc.

Checklist

• Add push logic
• Add pull logic
• Add push sheet
• Add pull sheet
• Add centralized sheets view
• Rename Features/Git to Features/SourceControl
• Move sheet views into Features/SourceControl
• Add "Source Control" menu
• Add remote from push and pull sheets
• Set new remote in push or pull sheet after one is added
• Stash changes if attempting to pull or switch branches and changes exist
• Add fetch to the menu and display fetching sheet while fetching
• Add confirm branch switch sheet
• Add warning alerts if uncommitted changes are not present

---

• I read and understood the contributing guide as well as the code of conduct
• The issues this PR addresses are related to each other
• My changes generate no new warnings
• My code builds and runs on my machine
• My changes are all related to the related issue above
• I documented my code

Screenshots

Todos discovered

• Reload source editor contents when file is changed externally
• Handle source control errors better and show necessary errors to user
• Handle rebase and merge conflict flow in UI
• Display loading indicator when pushing or pulling Be able to cancel push or pull while in progress
• Display loading indicator when pulling from stash sheet
• Write tests for source control features

[austincondiff]

I am struggling to get the "Source Control" menu working here, specifically trying to gain access to the focused windows SourceControlManager. The commands view can't find it so we are not showing those items as a result. Anyone know why? I tried placing .focusedObject(sourceControlManager) at the end of WorkspaceView but that wasn't working.

Edit: Fixed, thanks Khan!

[FastestMolasses]

LGTM, just small changes

[matthijseikelenboom]

Looks good, but no tests are present

[austincondiff]

@matthijseikelenboom We need a separate issue to add tests to not just what I did in this PR but everything source control related.

[tom-ludwig]

Great work! One thing that's bothering me is that I don't see the push button until I commit all my changes. Once everything is committed, the button appears.

1. No new commits

2. One new commit

3. Two new commits

[tom-ludwig]

Amazing work! Source control in CE is really shaping up. I just have a few small comments 😁

[austincondiff]

Great work! One thing that's bothering me is that I don't see the push button until I commit all my changes. Once everything is committed, the button appears.

1. No new commits

2. One new commit 3. Two new commits

@activcoding The sync bar now shows even if you have changes.

[thecoolwinter]

Should this state be possible? This is an empty git repository with no remotes. I think it shouldn't show the no upstream branch if there's no tracking remote.

Not quite done with the full review, I'll finish it when I have some time.

[thecoolwinter]

Continuing my last review.

It looks like theres a way to make the default selected branch in this menu be incorrect. This was after making a new branch, switching to it, and pressing the push button. It should default to the selected branch but it seems the operationBranch wasn't updated correctly from the repository outline view.

Also, I seem to be able to break the push mechanism on my machine:

Screen.Recording.2024-07-11.at.10.14.16.PM.mov

For more details:

• I created a branch, switched to it, pushed it to the remote, and switched back w/o closing the window
• After switching back, the push mechanism was broken.

Last thing: Could you provide more details on how you tested pulling changes? I can't figure how you did it with a local git repository.