You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
return{error: vscode.l10n.t('Could not \'git commit\' pending changes. If GPG signing or git hooks are enabled, please first commit or stash your changes and try again. ({0})',e.message),state: 'error'};
310
+
}
309
311
}
310
312
awaitrepository.push(remote,asyncBranch,true);
311
313
ref=asyncBranch;
312
314
}catch(e){
313
-
return{error: vscode.l10n.t(`Could not auto-commit pending changes. Please disable GPG signing, or manually commit/stash your changes before starting the remote agent. Error: ${e.message}`),state: 'error'};
315
+
return{error: vscode.l10n.t('Could not auto-push pending changes. Manually commit or stash your changes and try again. ({0})',e.message),state: 'error'};
314
316
}finally{
315
317
// Swap back to the original branch without your pending changes
316
318
// TODO: Better if we show a confirmation dialog in chat
317
319
if(repository.state.HEAD?.name!==baseRef){
318
320
// show notification asking the user if they want to switch back to the original branch
319
321
constSWAP_BACK_TO_ORIGINAL_BRANCH=vscode.l10n.t(`Swap back to '{0}'`,baseRef);
320
322
vscode.window.showInformationMessage(
321
-
vscode.l10n.t(`Your pending changes have been pushed to remote branch '{0}.`,ref),
323
+
vscode.l10n.t(`Pending changes pushed to remote branch '{0}'.`,ref),
322
324
SWAP_BACK_TO_ORIGINAL_BRANCH,
323
325
).then(async(selection)=>{
324
326
if(selection===SWAP_BACK_TO_ORIGINAL_BRANCH){
@@ -345,16 +347,21 @@ export class CopilotRemoteAgentManager extends Disposable {
constprLlmString=`The remote agent has begun work. The user can track progress by visiting ${pull_request.html_url} or from the PR extension. Format this VS Code webview link so the user can click it to also track progress: ${webviewUri.toString()}`;
351
-
return{
352
-
state: 'success',
353
-
number: pull_request.number,
354
-
link: pull_request.html_url,
355
-
webviewUri,
356
-
llmDetails: hasChanges ? `The pending changes have been pushed to branch '${ref}'. ${prLlmString}` : prLlmString
constprLlmString=`The remote agent has begun work. The user can track progress by visiting ${pull_request.html_url} or from the PR extension. Format this VS Code webview link so the user can click it to also track progress: ${webviewUri.toString()}`;
355
+
return{
356
+
state: 'success',
357
+
number: pull_request.number,
358
+
link: pull_request.html_url,
359
+
webviewUri,
360
+
llmDetails: hasChanges ? `The pending changes have been pushed to branch '${ref}'. ${prLlmString}` : prLlmString
0 commit comments