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

Git askpass (#25953)

Browse source 
Supersedes #25848

Release Notes:

- git: Supporting push/pull/fetch when remote requires auth

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
This commit is contained in:
Conrad Irwin 2025-03-05 22:20:06 -07:00 • committed by GitHub
parent 6fdb666bb7
commit c34357e2ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 864 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/recent_projects/src/ssh_connections.rs
View file

@ -131,7 +131,7 @@ pub struct SshPrompt {
connection_string: SharedString,
nickname: Option<SharedString>,
status_message: Option<SharedString>,
prompt: Option<(Entity<Markdown>, oneshot::Sender<Result<String>>)>,
prompt: Option<(Entity<Markdown>, oneshot::Sender<String>)>,
cancellation: Option<oneshot::Sender<()>>,
editor: Entity<Editor>,
}
@ -176,7 +176,7 @@ impl SshPrompt {
pub fn set_prompt(
&mut self,
prompt: String,
tx: oneshot::Sender<Result<String>>,
tx: oneshot::Sender<String>,
window: &mut Window,
cx: &mut Context<Self>,
) {
@ -223,7 +223,7 @@ impl SshPrompt {
if let Some((_, tx)) = self.prompt.take() {
self.status_message = Some("Connecting".into());
self.editor.update(cx, |editor, cx| {
tx.send(Ok(editor.text(cx))).ok();
tx.send(editor.text(cx)).ok();
editor.clear(window, cx);
});
}
@ -429,11 +429,10 @@ pub struct SshClientDelegate {
}
impl remote::SshClientDelegate for SshClientDelegate {
fn ask_password(&self, prompt: String, cx: &mut AsyncApp) -> oneshot::Receiver<Result<String>> {
let (tx, rx) = oneshot::channel();
fn ask_password(&self, prompt: String, tx: oneshot::Sender<String>, cx: &mut AsyncApp) {
let mut known_password = self.known_password.clone();
if let Some(password) = known_password.take() {
tx.send(Ok(password)).ok();
tx.send(password).ok();
} else {
self.window
.update(cx, |_, window, cx| {
@ -443,7 +442,6 @@ impl remote::SshClientDelegate for SshClientDelegate {
})
.ok();
}
rx
}
fn set_status(&self, status: Option<&str>, cx: &mut AsyncApp) {