@gitkraken/core-gitlens 0.7.1 → 0.8.0

package/dist/git/errors.d.ts

@@ -1,4 +1,5 @@
 import { GitPausedOperationStatus } from "./models/pausedOperationStatus.js";
+import { Provider } from "./models/remoteProvider.js";
 import * as l10n from "@vscode/l10n";
 //#region ../git/src/errors.d.ts
 /** The `t` surface a message builder renders through — the real `l10n` for `localizedMessage`, `english` for `message`. */
@@ -207,7 +208,7 @@ export declare class PausedOperationContinueError extends GitCommandError<Paused
   };
   protected buildErrorMessage(details: PausedOperationContinueErrorDetails, l10n: Translator): string;
 }
-export type PullErrorReason = 'conflict' | 'gitIdentity' | 'rebaseMultipleBranches' | 'refLocked' | 'remoteConnectionFailed' | 'tagConflict' | 'uncommittedChanges' | 'unmergedFiles' | 'unstagedChanges' | 'wouldOverwriteChanges' | 'other';
+export type PullErrorReason = 'conflict' | 'gitIdentity' | 'noFastForward' | 'noUpstream' | 'rebaseMultipleBranches' | 'refLocked' | 'remoteConnectionFailed' | 'tagConflict' | 'uncommittedChanges' | 'unmergedFiles' | 'unstagedChanges' | 'wouldOverwriteChanges' | 'other';
 interface PullErrorDetails {
   reason?: PullErrorReason;
   gitCommand?: GitCommandContext;
@@ -342,6 +343,23 @@ export declare class TagError extends GitCommandError<TagErrorDetails> {
   };
   protected buildErrorMessage(details: TagErrorDetails, l10n: Translator): string;
 }
+export type ReferenceUpdateErrorReason = 'checkedOut' | 'conflict' | 'invalidObject' | 'invalidRef' | 'notFound';
+interface ReferenceUpdateErrorDetails {
+  reason?: ReferenceUpdateErrorReason;
+  action: 'update' | 'delete';
+  /** The full ref name the operation targeted */
+  ref: string;
+  gitCommand?: GitCommandContext;
+}
+export declare class ReferenceUpdateError extends GitCommandError<ReferenceUpdateErrorDetails> {
+  static is(ex: unknown): ex is ReferenceUpdateError;
+  static is<R extends ReferenceUpdateErrorReason>(ex: unknown, reason: R): ex is ReferenceUpdateError & {
+    details: {
+      reason: R;
+    };
+  };
+  protected buildErrorMessage(details: ReferenceUpdateErrorDetails, l10n: Translator): string;
+}
 export declare class WorkspaceUntrustedError extends Error {
   static is(ex: unknown): ex is WorkspaceUntrustedError;
   constructor();
@@ -421,6 +439,15 @@ export declare class RequestRateLimitError extends Error {
   static is(ex: unknown): ex is RequestRateLimitError;
   constructor(original: Error, token: string | undefined, resetAt: number | undefined);
 }
+/**
+ * Spends `provider`'s strike toward disconnecting for a request that failed with a server error or timed out, and
+ * shows `notify`'s notice; or, with `defer`, leaves both to the batch read that made the request, which counts its
+ * failed requests once for the whole call (see {@link getDeferredRequestFailure}). A batch fans out into a request
+ * per target, so one outage would otherwise disconnect the integration in the middle of a batch.
+ */
+export declare function reportRequestFailure(provider: Provider | undefined, ex: Error, notify: () => void, defer: boolean | undefined): void;
+/** The notice a failed request left to its batch read (see {@link reportRequestFailure}), if it left one. */
+export declare function getDeferredRequestFailure(ex: unknown): (() => void) | undefined;
 export type SigningErrorReason = 'noKey' | 'gpgNotFound' | 'sshNotFound' | 'passphraseFailed' | 'unknown';
 interface SigningErrorDetails {
   reason?: SigningErrorReason;

package/dist/git/errors.js

@@ -514,6 +514,8 @@ var PullError = class PullError extends GitCommandError {
 		switch (details.reason) {
 			case "conflict": return l10n.t("Unable to complete pull due to conflicts which must be resolved.");
 			case "gitIdentity": return l10n.t("Unable to pull because you have not yet set up your Git identity.");
+			case "noFastForward": return l10n.t("Unable to pull because the branch cannot be fast-forwarded.");
+			case "noUpstream": return l10n.t("Unable to pull because the branch has no upstream.");
 			case "rebaseMultipleBranches": return l10n.t("Unable to pull because you are trying to rebase onto multiple branches.");
 			case "refLocked": return l10n.t("Unable to pull because a local ref could not be updated.");
 			case "remoteConnectionFailed": return l10n.t("Unable to pull because the remote repository could not be reached.");
@@ -796,6 +798,29 @@ function getGenericTagErrorMessage(tag, reason, l10n) {
 		default: return l10n.t("Unable to perform action with tag '{0}'", tag);
 	}
 }
+var ReferenceUpdateError = class ReferenceUpdateError extends GitCommandError {
+	static is(ex, reason) {
+		return ex instanceof ReferenceUpdateError && (reason == null || ex.details.reason === reason);
+	}
+	buildErrorMessage(details, l10n) {
+		const ref = details.ref;
+		if (details.action === "delete") switch (details.reason) {
+			case "checkedOut": return l10n.t("Unable to delete reference '{0}' because it is checked out in a worktree", ref);
+			case "conflict": return l10n.t("Unable to delete reference '{0}' because it changed unexpectedly", ref);
+			case "invalidObject": return l10n.t("Unable to delete reference '{0}' because the target object does not exist", ref);
+			case "invalidRef": return l10n.t("Unable to delete reference '{0}' because the name is not a valid reference", ref);
+			case "notFound": return l10n.t("Unable to delete reference '{0}' because it does not exist", ref);
+			default: return l10n.t("Unable to delete reference '{0}'", ref);
+		}
+		switch (details.reason) {
+			case "conflict": return l10n.t("Unable to update reference '{0}' because it changed unexpectedly", ref);
+			case "invalidObject": return l10n.t("Unable to update reference '{0}' because the target object does not exist", ref);
+			case "invalidRef": return l10n.t("Unable to update reference '{0}' because the name is not a valid reference", ref);
+			case "notFound": return l10n.t("Unable to update reference '{0}' because it does not exist", ref);
+			default: return l10n.t("Unable to update reference '{0}'", ref);
+		}
+	}
+};
 var WorkspaceUntrustedError = class WorkspaceUntrustedError extends Error {
 	static is(ex) {
 		return ex instanceof WorkspaceUntrustedError;
@@ -920,6 +945,25 @@ var RequestRateLimitError = class RequestRateLimitError extends Error {
 		Error.captureStackTrace?.(this, new.target);
 	}
 };
+const deferredRequestFailures = /* @__PURE__ */ new WeakMap();
+/**
+* Spends `provider`'s strike toward disconnecting for a request that failed with a server error or timed out, and
+* shows `notify`'s notice; or, with `defer`, leaves both to the batch read that made the request, which counts its
+* failed requests once for the whole call (see {@link getDeferredRequestFailure}). A batch fans out into a request
+* per target, so one outage would otherwise disconnect the integration in the middle of a batch.
+*/
+function reportRequestFailure(provider, ex, notify, defer) {
+	if (defer) {
+		deferredRequestFailures.set(ex, notify);
+		return;
+	}
+	provider?.trackRequestException();
+	notify();
+}
+/** The notice a failed request left to its batch read (see {@link reportRequestFailure}), if it left one. */
+function getDeferredRequestFailure(ex) {
+	return ex instanceof Error ? deferredRequestFailures.get(ex) : void 0;
+}
 var SigningError = class SigningError extends GitCommandError {
 	static is(ex, reason) {
 		return ex instanceof SigningError && (reason == null || ex.details.reason === reason);
@@ -935,6 +979,6 @@ var SigningError = class SigningError extends GitCommandError {
 	}
 };
 //#endregion
-export { ApplyPatchCommitError, AuthenticationError, AuthenticationErrorReason, BlameIgnoreRevsFileBadRevisionError, BlameIgnoreRevsFileError, BranchError, CheckoutError, CherryPickError, CommitError, FetchError, GitCommandError, GitSearchError, GitWarnings, MergeError, PausedOperationAbortError, PausedOperationContinueError, PullError, PushError, RebaseError, RequestClientError, RequestNotFoundError, RequestRateLimitError, ResetError, RevertError, ShowError, SigningError, StashApplyError, StashPushError, TagError, WorkspaceUntrustedError, WorktreeCreateError, WorktreeDeleteError };
+export { ApplyPatchCommitError, AuthenticationError, AuthenticationErrorReason, BlameIgnoreRevsFileBadRevisionError, BlameIgnoreRevsFileError, BranchError, CheckoutError, CherryPickError, CommitError, FetchError, GitCommandError, GitSearchError, GitWarnings, MergeError, PausedOperationAbortError, PausedOperationContinueError, PullError, PushError, RebaseError, ReferenceUpdateError, RequestClientError, RequestNotFoundError, RequestRateLimitError, ResetError, RevertError, ShowError, SigningError, StashApplyError, StashPushError, TagError, WorkspaceUntrustedError, WorktreeCreateError, WorktreeDeleteError, getDeferredRequestFailure, reportRequestFailure };
 
 //# sourceMappingURL=errors.js.map