Add support for git remotes by bnjjj · Pull Request #42819 · zed-industries/zed

bnjjj · 2025-11-15T21:46:45Z

Follow up of #42486
Closes #26559

Enregistrement.de.l.ecran.2025-11-15.a.22.43.44.mov

Release Notes:

Added support for git remotes

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

…26559

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

…26559

Anthony-Eid · 2025-11-20T16:51:28Z

crates/git_ui/src/branch_picker.rs

+        cx.spawn(async move |_, cx| {
+            repo.update(cx, |repo, _| repo.create_remote(remote_name, remote_url))?
+                .await??;
+
+            Ok(())
+        })
+        .detach_and_prompt_err("Failed to create remote", window, cx, |e, _, _| {
+            Some(e.to_string())
+        });


If this task can ever run for more than a second (e.g. poor internet) we should put a loading icon in the status bar. I'll be happy to help with this

If you have examples in your codebase I would be interested

Ok I added a loader

Anthony-Eid · 2025-11-20T16:53:09Z

crates/git_ui/src/branch_picker.rs

+                                format!("refs/heads/{query}").into()
+                            } else {
+                                format!("refs/remotes/{query}").into()
+                            }


Are these paths correct on non-unix systems (Windows)?

Yes git references work the same on Windows

Anthony-Eid · 2025-11-20T16:54:54Z

crates/project/src/git_store.rs

+                        unimplemented!();
+                        // client
+                        //     .request(proto::GitCreateBranch {
+                        //         project_id: project_id.0,
+                        //         repository_id: id.to_proto(),
+                        //         branch_name,
+                        //     })
+                        //     .await?;
+


If you need help with creating the proto messages and handlers I'll be happy to pair with you on it

I think I did it

Anthony-Eid · 2025-11-20T16:59:45Z

crates/git/src/repository.rs

+                let remote_names: HashSet<Remote> = String::from_utf8_lossy(&output.stdout)
+                    .lines()
+                    .filter(|line| !line.is_empty())
+                    .filter_map(|line| {
+                        let mut splitted_line = line.split_whitespace();
+                        let remote_name = splitted_line.next()?;
+                        let remote_url = splitted_line.next()?;
+
+                        Some(remote::Remote {
+                            name: remote_name.trim().to_string().into(),
+                            url: RemoteUrl::from_str(remote_url).ok()?,
+                        })
                    })
                    .collect();
-                Ok(remote_names)
+
+                Ok(remote_names.into_iter().collect())


Nit: Seems like you're calling collect twice here. The first in when creating remote_names and the second when returning remote_names.into_iter().collect()

you should be able to get away with only one call to collect

Not really because I just convert from an hashset to a vec

Anthony-Eid · 2025-11-20T17:02:37Z

crates/git/src/repository.rs

+    fn remove_remote(&self, name: String) -> BoxFuture<'_, Result<()>> {
+        let repo = self.repository.clone();
+        self.executor
+            .spawn(async move {
+                let repo = repo.lock();
+                repo.remote_delete(&name)?;


Nit: remove_remote and repo.remote_delete should have the same names IMO.

I personally prefer remove_remote/delete_remote because it's consistent with the naming pattern for the rest of the repository functions. Where it's verb_noun

I completely agree with you but remote_delete comes from the external crate git2 https://docs.rs/git2/latest/git2/struct.Repository.html#method.remote_delete

…26559

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

bnjjj · 2025-11-26T20:57:32Z

I think I need guidance on how to write tests for this kind of feature @Anthony-Eid if you're available

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

bnjjj · 2025-11-27T18:50:34Z

I added some tests to also test the previous behavior with the branch and the new one with remote. Let me know if you want me to add other tests.

bnjjj · 2025-11-27T18:55:03Z

crates/git_ui/src/branch_picker.rs

+                    .border_color(cx.theme().colors().border_variant)
+                    .child(
+                        h_flex().gap_0p5().child(
+                            ToggleButtonGroup::single_row(


I don't know why but since ToggleButton no longer exists it looks like the style doesn't change when it's selected or not. When debugging I can see the Boolean being updated properly but maybe the style when a toggle button is selected is incorrect... I don't know

…26559

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

…26559

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

crates/git_ui/src/git_panel.rs

yara-blue · 2025-12-01T16:34:03Z

crates/project/src/git_store.rs

        client.add_entity_request_handler(Self::handle_change_branch);
        client.add_entity_request_handler(Self::handle_create_branch);
        client.add_entity_request_handler(Self::handle_rename_branch);
+        client.add_entity_request_handler(Self::handle_create_remote);


@dvdsk need to test this with test server or just cross fingers :)

look over the remote stuff in more detail and fix anything needed. (I should do this)

yara-blue

Amazing, I want this now. Some minor refactoring and we will check that collab works!

🥳 🥳 🥇

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

…26559

bnjjj · 2025-12-02T19:19:14Z

cc @dvdsk It should be ready to review again :)

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

yara-blue · 2025-12-04T13:14:55Z

cc @dvdsk It should be ready to review again :)

sorry GitHub did not notify me for some reason.....
thanks for reaching out on discord!

I'll review it right now.

yara-blue

Looks great! Tests are super readable now. Like the is_new_branch solution too btw!

LGTM

* main: (155 commits) Add support for git remotes (zed-industries#42819) python: Improve sorting order of toolchains to give higher precedence to project-local virtual environments that are within current subproject (zed-industries#44141) Use buffer language when formatting with Prettier (zed-industries#43368) search: Fix sort order not being maintained in presence of open buffers (zed-industries#44135) bedrock: Support global endpoints and new regional endpoints (zed-industries#44103) linux: Spawn at least two background threads (zed-industries#44110) macos: Add missing file access entitlements (zed-industries#43609) Re-colorize the brackets when the theme changes (zed-industries#44130) Reduce priority of Windows thread pool work items (zed-industries#44121) Update fancy-regex (zed-industries#44120) Prefer to disable options over hiding (git panel entry context menu) (zed-industries#44102) tab_switcher: Subscribe to workspace events instead of pane events (zed-industries#44101) editor: Add active match highlight for buffer and project search (zed-industries#44098) Add more preview tab settings and fix janky behavior (zed-industries#43921) ai: Add an eval for the inline assistant (zed-industries#43291) Fix circular reference issue around PopoverMenu again (zed-industries#44084) Run `git2::Repository::find_remote` in the background (zed-industries#44092) Improve support for multiple registrations of `textDocument/diagnostic` (zed-industries#43703) Revert "http_client: Add integrity checks for GitHub binaries using digest checks (zed-industries#43737)" (zed-industries#44086) editor: Fix blame hover not working when inline git blame is disabled (zed-industries#42992) ...

… on the branch name (#44206) The bug was introduced in this recent PR: #42819. Since it's still in nightly, there is no need for release notes. I also polished the feature a bit by: - Ensuring branch names are always a single line so the branch picker's uniform list uses the correct element height. - Adding tooltip text for the filter remotes button. - Fixing the create branch from default icon showing up for non-new branch entries. Release Notes: - N/A

Follow up of zed-industries#42486 Closes zed-industries#26559 https://github.com/user-attachments/assets/e2f54dda-a78b-4d9b-a910-16d51f98a111 Release Notes: - Added support for git remotes --------- Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

… on the branch name (zed-industries#44206) The bug was introduced in this recent PR: zed-industries#42819. Since it's still in nightly, there is no need for release notes. I also polished the feature a bit by: - Ensuring branch names are always a single line so the branch picker's uniform list uses the correct element height. - Adding tooltip text for the filter remotes button. - Fixing the create branch from default icon showing up for non-new branch entries. Release Notes: - N/A

Follow up to #42819 and #44206. - Make this picker feel more consistent with other similar pickers (namely, the project picker) - Move actions to the footer and toggle them conditionally - Only show the "Create" and "Create New From: {default}" when we're selecting the "Create" list item _or_ when that item is the only visible. This means I'm changing here the state transition to only change to `NewBranch/NewRemote` if we only have those items available. - Reuse more UI code and use components when available (e.g., `ListHeader`) - Remove secondary actions from the list item Next step (in another PR), will be refine the same picker in the smaller, panel version. https://github.com/user-attachments/assets/fe72ac06-c1df-4829-a8a4-df8a9222672f Release Notes: - N/A

Follow up of zed-industries#42486 Closes zed-industries#26559 https://github.com/user-attachments/assets/e2f54dda-a78b-4d9b-a910-16d51f98a111 Release Notes: - Added support for git remotes --------- Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

… on the branch name (zed-industries#44206) The bug was introduced in this recent PR: zed-industries#42819. Since it's still in nightly, there is no need for release notes. I also polished the feature a bit by: - Ensuring branch names are always a single line so the branch picker's uniform list uses the correct element height. - Adding tooltip text for the filter remotes button. - Fixing the create branch from default icon showing up for non-new branch entries. Release Notes: - N/A

Follow up to zed-industries#42819 and zed-industries#44206. - Make this picker feel more consistent with other similar pickers (namely, the project picker) - Move actions to the footer and toggle them conditionally - Only show the "Create" and "Create New From: {default}" when we're selecting the "Create" list item _or_ when that item is the only visible. This means I'm changing here the state transition to only change to `NewBranch/NewRemote` if we only have those items available. - Reuse more UI code and use components when available (e.g., `ListHeader`) - Remove secondary actions from the list item Next step (in another PR), will be refine the same picker in the smaller, panel version. https://github.com/user-attachments/assets/fe72ac06-c1df-4829-a8a4-df8a9222672f Release Notes: - N/A

Follow up of zed-industries#42486 Closes zed-industries#26559 https://github.com/user-attachments/assets/e2f54dda-a78b-4d9b-a910-16d51f98a111 Release Notes: - Added support for git remotes --------- Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

… on the branch name (zed-industries#44206) The bug was introduced in this recent PR: zed-industries#42819. Since it's still in nightly, there is no need for release notes. I also polished the feature a bit by: - Ensuring branch names are always a single line so the branch picker's uniform list uses the correct element height. - Adding tooltip text for the filter remotes button. - Fixing the create branch from default icon showing up for non-new branch entries. Release Notes: - N/A

Follow up to zed-industries#42819 and zed-industries#44206. - Make this picker feel more consistent with other similar pickers (namely, the project picker) - Move actions to the footer and toggle them conditionally - Only show the "Create" and "Create New From: {default}" when we're selecting the "Create" list item _or_ when that item is the only visible. This means I'm changing here the state transition to only change to `NewBranch/NewRemote` if we only have those items available. - Reuse more UI code and use components when available (e.g., `ListHeader`) - Remove secondary actions from the list item Next step (in another PR), will be refine the same picker in the smaller, panel version. https://github.com/user-attachments/assets/fe72ac06-c1df-4829-a8a4-df8a9222672f Release Notes: - N/A

bnjjj added 6 commits November 10, 2025 17:23

wip

739e06b

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

wip

a3fd7f5

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

Merge branch 'main' of github.com:zed-industries/zed into bnjjj/feat_…

3f12b4d

…26559

wip

4d58f1b

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

add create remote

dbabf69

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

support create remote

f7f8129

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Nov 15, 2025

bnjjj changed the title ~~Bnjjj/feat 26559~~ Add support for git remotes Nov 15, 2025

bnjjj mentioned this pull request Nov 15, 2025

Add UI for managing the configured remotes on a repository #42486

Closed

SomeoneToIgnore assigned cole-miller Nov 15, 2025

Merge branch 'main' of github.com:zed-industries/zed into bnjjj/feat_…

0a0d0f8

…26559

Anthony-Eid reviewed Nov 20, 2025

View reviewed changes

bnjjj added 5 commits November 25, 2025 17:16

Merge branch 'main' of github.com:zed-industries/zed into bnjjj/feat_…

4292115

…26559

add proto files

893e632

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

add loader and get rid of lints

cb46083

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

remove useless changes

80ae4cb

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

fix typo

b2f640c

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

zelenenka added this to Quality Week – December 2025 Nov 27, 2025

github-project-automation bot moved this to Community PRs in Quality Week – December 2025 Nov 27, 2025

add tests for branch picker

f167ec7

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

bnjjj commented Nov 27, 2025

View reviewed changes

bnjjj added 3 commits November 28, 2025 10:45

Merge branch 'main' of github.com:zed-industries/zed into bnjjj/feat_…

c3576ba

…26559

add tests for branch picker

e566eef

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

Merge branch 'main' of github.com:zed-industries/zed into bnjjj/feat_…

880a086

…26559

bnjjj mentioned this pull request Nov 29, 2025

ui: Do not selected an index for the ToggleButtonGroup by default #43751

Closed

reuse rotate animation

4b50916

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

yara-blue reviewed Dec 1, 2025

View reviewed changes

crates/git_ui/src/git_panel.rs Outdated Show resolved Hide resolved

yara-blue reviewed Dec 1, 2025

View reviewed changes

yara-blue requested changes Dec 1, 2025

View reviewed changes

yara-blue assigned yara-blue and unassigned cole-miller Dec 1, 2025

bnjjj added 2 commits December 2, 2025 20:17

address review comments

664f333

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

Merge branch 'main' of github.com:zed-industries/zed into bnjjj/feat_…

20c9b91

…26559

bnjjj requested a review from yara-blue December 2, 2025 19:19

fix conflict

97eac5a

Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com>

yara-blue approved these changes Dec 4, 2025

View reviewed changes

yara-blue merged commit 4c51fff into zed-industries:main Dec 4, 2025
23 checks passed

Anthony-Eid mentioned this pull request Dec 5, 2025

git: Fix branch picker creating new branches with refs/head/ prefixed on the branch name #44206

Merged

danilo-leal mentioned this pull request Dec 5, 2025

git_ui: Improve the branch picker UI #44217

Merged

esthertrapadoux added this to Git board Dec 9, 2025

esthertrapadoux moved this to 🚢 Shipped by Community in Git board Dec 9, 2025

esthertrapadoux moved this from Community PRs to Shipped by Community in Quality Week – December 2025 Dec 9, 2025

amtoaer mentioned this pull request Feb 4, 2026

git_ui: Fix branch picker deleting remote instead of remote branch #48338

Open

Uh oh!

Conversation

bnjjj commented Nov 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bnjjj commented Nov 26, 2025

Uh oh!

bnjjj commented Nov 27, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yara-blue left a comment

Choose a reason for hiding this comment

Uh oh!

bnjjj commented Dec 2, 2025

Uh oh!

yara-blue commented Dec 4, 2025

Uh oh!

yara-blue left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bnjjj commented Nov 15, 2025 •

edited

Loading