Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Git Beta: Fix a few cases of empty toasts showing up (#25985)

Browse source 
Improve parsing of git remote outputs

Release Notes:

- N/A
This commit is contained in:
Mikayla Maki 2025-03-03 18:16:50 -08:00 • committed by GitHub
parent 2a7a4a80c6
commit 74fc52d5ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/git_ui/src/remote_output_toast.rs
View file

@ -71,7 +71,7 @@ impl RemoteOutputToast {
}
});
let message;
let mut message: SharedString;
let remote;
match action {
@ -86,19 +86,32 @@ impl RemoteOutputToast {
RemoteAction::Push(remote_ref) => {
message = output.stdout.trim().to_string().into();
let remote_message = get_remote_lines(&output.stderr);
let finder = LinkFinder::new();
let links = finder
.links(&remote_message)
.filter(|link| *link.kind() == LinkKind::Url)
.map(|link| link.start()..link.end())
.collect_vec();
if message.is_empty() {
message = output.stderr.trim().to_string().into();
if message.is_empty() {
message = "Push Successful".into();
}
remote = None;
} else {
let remote_message = get_remote_lines(&output.stderr);
remote = Some(InfoFromRemote {
name: remote_ref.name,
remote_text: remote_message.into(),
links,
});
remote = if remote_message.is_empty() {
None
} else {
let finder = LinkFinder::new();
let links = finder
.links(&remote_message)
.filter(|link| *link.kind() == LinkKind::Url)
.map(|link| link.start()..link.end())
.collect_vec();
Some(InfoFromRemote {
name: remote_ref.name,
remote_text: remote_message.into(),
links,
})
}
}
}
}