Source Control Settings #1926

austincondiff · 2024-10-29T03:36:11Z

Description

Our source control settings currently do not work. This PR enables many of these settings. Some of these settings use the users git config so we are introducing functionality to get and set based on config keys. As the user types, we want to debounce the set function, so we are also introducing Limiter which has debounce and throttle methods.

Related Issues

🐞 Most of the Source Control settings do not work #1872

Checklist

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

Screen.Recording.2024-10-28.at.10.30.31.PM.mov

Screen.Recording.2024-10-28.at.10.50.04.PM.mov

Screen.Recording.2024-10-28.at.10.58.13.PM.mov

…ttings.

…we disable file events on the .git folder. Enabling git settings by default.

…n Settings by clearing the current branch stored in the source control manager.

…isabled automatic fetching is disabled.

…e the users global git config instead of CodeEdit settings. Introduced Limiter.debounce and Limiter.throttle.

…deEdit settings.

…abled, if disabled no merge commits are displayed.

CodeEdit/WorkspaceView.swift

CodeEdit/Features/SourceControl/Client/GitConfigClient.swift

CodeEdit/Utils/Limiter.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift

…h excluded files list and ignored files list to use new shared glob list view.

tom-ludwig

Some improvements are needed before merging.

CodeEdit/Features/InspectorArea/Views/InspectorAreaView.swift

CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/Models/IgnorePatternModel.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/Models/SourceControlSettings.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGeneralView.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift

CodeEdit/Features/SourceControl/Client/GitConfigClient.swift

CodeEdit/Utils/Limiter.swift

CodeEdit/WorkspaceView.swift

…mentation and TODO.

…e in the users .gitignore_global file. Users can now reorder ignored files. Buttons were added in settings to open .gitconfig and .gitignore_global in an editor.

…w for reuse.

CodeEdit/Features/Settings/Pages/SearchSettings/Models/SearchSettingsModel.swift

CodeEdit/WorkspaceView.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift

thecoolwinter

~~I'm partially through my review but I remember we talked about gitignore saving but it seems like it's wiping all whitespace and comments when I save.~~

Disregard, I somehow managed to not pull changes from the most recent version of this branch 🤦.

thecoolwinter

Fetch server status automatically seems to be ignored, I can't quite figure out why but when I have the setting off my git status is still pulled. Maybe I'm minsunderstanding the setting?

Screen.Recording.2024-12-04.at.10.23.22.PM.mov

CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift

CodeEdit/Features/InspectorArea/Views/InspectorAreaView.swift

CodeEdit/Features/Settings/Models/GlobPattern.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/Models/IgnorePatternModel.swift

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift

CodeEdit/Features/SourceControl/Views/SourceControlPullView.swift

CodeEdit/Features/WindowCommands/CodeEditCommands.swift

CodeEdit/Utils/Limiter.swift

…ored Limiter to use Timer API and removed unused throttle method.

thecoolwinter

Just one thing answering your comment

thecoolwinter · 2024-12-11T22:56:45Z

Also looks like the issue I mentioned before was a misunderstanding. The ahead/behind status is available locally after it's been fetched so it was working correctly 👍.

…a PR issue

tom-ludwig

One final note: To ensure our code is as readable as possible, we should aim to name functions and variables clearly enough that comments become unnecessary

CodeEdit/Features/Settings/Models/GlobPattern.swift

Resolved PR issues and got two other approvals.

austincondiff added 10 commits October 28, 2024 22:33

Hiding source control navigator when source control is disabled in Se…

89ccc14

…ttings.

Hiding History Inspector when source control is disabled in Settings.

78b8184

Hiding Source Control menu when source control is disabled in Settings.

e58ab76

If enableSourceControl or refreshStatusLocally setting is false then …

7adc787

…we disable file events on the .git folder. Enabling git settings by default.

Hiding branch picker in the toolbar when source control is disabled i…

5eb0f7f

…n Settings by clearing the current branch stored in the source control manager.

Enabled fetch and refresh server status automatically setting. When d…

b7c9797

…isabled automatic fetching is disabled.

Author name, author email, and prefer rebase when pulling settings us…

409c4ce

…e the users global git config instead of CodeEdit settings. Introduced Limiter.debounce and Limiter.throttle.

Default branch setting uses the users global git config instead of Co…

7ddb5e8

…deEdit settings.

Show merge commits per file log setting now shows merge commits if en…

ae6ba40

…abled, if disabled no merge commits are displayed.

Fixed swiftlint error

241ebbd

austincondiff marked this pull request as ready for review November 1, 2024 20:44

austincondiff requested review from 0xWDG, bombardier200, FastestMolasses, EstebanBorai, thecoolwinter, Wouter01 and tom-ludwig November 1, 2024 20:44

FastestMolasses requested changes Nov 2, 2024

View reviewed changes

austincondiff added 4 commits November 2, 2024 01:23

Added Ignored Files list in source control settings. Refactored searc…

996be19

…h excluded files list and ignored files list to use new shared glob list view.

Fixed a small race condition

52b03ef

Merge branch 'main' into source-control-settings

528fe57

Added type to hasAppeared variable in SourceControlGitView.

90934f2

tom-ludwig requested changes Nov 7, 2024

View reviewed changes

austincondiff added 6 commits November 16, 2024 01:26

Renamed enableSourceControl to sourceControlIsEnabled. Added docu…

9635fe5

…mentation and TODO.

Ignored files can be changed while preserving comments and white spac…

71ee6c6

…e in the users .gitignore_global file. Users can now reorder ignored files. Buttons were added in settings to open .gitconfig and .gitignore_global in an editor.

Merge branch 'main' into source-control-settings

dbf88a9

Fixed SwiftLint errors

23148b3

Ignore pattern reorder fixes

eab7301

Writing relative url to gitconfig upon adding first pattern

b31e07d

austincondiff added 5 commits November 26, 2024 02:44

Cleaned up unecessary function

284df2e

Trying to fix test

dbf0929

Dynamically resolve gitignore file path.

0565305

Fixing test

93b0be5

Added source control settings header. Moved feature icon into new vie…

464bdea

…w for reuse.

austincondiff requested review from FastestMolasses and tom-ludwig December 2, 2024 19:26

austincondiff changed the title ~~Enabled Source Control Settings~~ Source Control Settings Dec 2, 2024

Moved tabs below source control toggle

24658a2

FastestMolasses previously requested changes Dec 4, 2024

View reviewed changes

CodeEdit/Features/Settings/Pages/SearchSettings/Models/SearchSettingsModel.swift Show resolved Hide resolved

CodeEdit/WorkspaceView.swift Outdated Show resolved Hide resolved

CodeEdit/Features/Settings/Pages/SourceControlSettings/SourceControlGitView.swift Show resolved Hide resolved

Fixed PR issue

38cd1f0

thecoolwinter requested changes Dec 5, 2024

View reviewed changes

austincondiff added 2 commits December 7, 2024 23:21

PR issues, added documentation

35be9a9

Marked IgnorePatternModel with @mainactor. More documentation. Refact…

97bbefb

…ored Limiter to use Timer API and removed unused throttle method.

thecoolwinter requested changes Dec 11, 2024

View reviewed changes

Adding main actor to savePatterns function in IgnorePatternModel per …

a446a18

…a PR issue

austincondiff requested review from thecoolwinter and FastestMolasses December 13, 2024 16:23

tom-ludwig requested changes Dec 13, 2024

View reviewed changes

CodeEdit/Features/Settings/Models/GlobPattern.swift Show resolved Hide resolved

tom-ludwig approved these changes Dec 13, 2024

View reviewed changes

thecoolwinter approved these changes Dec 14, 2024

View reviewed changes

austincondiff merged commit 148cd24 into CodeEditApp:main Dec 14, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Source Control Settings #1926

Source Control Settings #1926

austincondiff commented Oct 29, 2024 •

edited

Loading

tom-ludwig left a comment

thecoolwinter left a comment •

edited

Loading

thecoolwinter left a comment

thecoolwinter left a comment

thecoolwinter commented Dec 11, 2024

tom-ludwig left a comment

Source Control Settings #1926

Source Control Settings #1926

Conversation

austincondiff commented Oct 29, 2024 • edited Loading

Description

Related Issues

Checklist

Screenshots

tom-ludwig left a comment

Choose a reason for hiding this comment

thecoolwinter left a comment • edited Loading

Choose a reason for hiding this comment

thecoolwinter left a comment

Choose a reason for hiding this comment

thecoolwinter left a comment

Choose a reason for hiding this comment

thecoolwinter commented Dec 11, 2024

tom-ludwig left a comment

Choose a reason for hiding this comment

austincondiff commented Oct 29, 2024 •

edited

Loading

thecoolwinter left a comment •

edited

Loading