Feature: Git integration

[yaira2]

What feature or improvement do you think would benefit Files?

Integration with git is something that may add value for developers. We're inviting the open-source community to share feedback on which git features they would find useful in a file manager and how it would enhance their workflow. Design concepts are welcome as well.

Requirements

Phase 1 (implemented)

• Display the branch name in the status bar, this will let the user know which branch is active.

Phase 2 (implemented)

• Support for switching between local branches (this can be a simple flyout with a list view)
  • Display content dialog if there are uncommitted changes and ask user if they want to take the changes.
  • Display content dialog if there are uncommitted changes that can't be taken to the other branch and ask the user if they want to stash them.

Phase 3 (implemented)

• Support for checking out remote branches.
• Support for creating new branches, the button is already implemented in the UI. Clicking the new branch button should open a content dialog that allows the user to enter the branch name.

Phase 4 (implemented)

• Support for pulling remote changes
• Indicate on the status bar when there are remote commits

Future planning

• Indicate on the status bar when there are uncommitted changes
• Support for committing and pushing changes (what's the best way to display the list of changes?)
• Support for searching local branches

Files Version

v2.4.21

Windows Version

Windows 11

Comments

No response

[yaira2]

Fyi @onein528

[yaira2]

I think the bare minimum would be support for switching branches. This can be achieved by adding a button/flyout to the status bar.

[0x5bfa]

You mean if you open the repository in Files, you will be able to perform Git operations, such as change branch, commit, push, sync?

Here's my thought

Minimum

• Switch Branch Functionality

Could

• Push uncommitted changes
• Pull
• Sync
• Git commit tree viewing in preview pane or something

[yaira2]

Push uncommitted changes

This requires UI for a commit message, not impossible but would require a lot of thought.

Git commit tree viewing in preview pane or something

A possibility but curious how it would fit into users workflow and how the UI could be integrated.

Pull
Sync

I might add these to the minimum

[0x5bfa]

I'll look what I can do and try to find what can be implemented.

[Josh65-2201]

Could show the changes of a file in the preview pane when selected. If it isn't too much having a separate "changes" pane to show them all would properly be good too. Ideally it would look like GitHub with the addition and removals of each line.

[hecksmosis]

This would be very useful

[hecksmosis]

We should probably enable/disable this in settings to not clog the app for non-devs

[Josh65-2201]

Properly wont need a setting since outside of a directory with a GitHub link it shouldn't be shown

[0x5bfa]

[yaira2]

Is it possible to use the one already installed on the system?