Renames number to stashNumber

Author: eamodio

src/commands/git/stash.ts

@@ -348,7 +348,7 @@ export class StashGitCommand extends QuickCommand<State> {
 			try {
 				await state.repo.git.stash()?.applyStash(
 					// pop can only take a stash index, e.g. `stash@{1}`
-					state.subcommand === 'pop' ? `stash@{${state.reference.number}}` : state.reference.ref,
+					state.subcommand === 'pop' ? `stash@{${state.reference.stashNumber}}` : state.reference.ref,
 					{ deleteAfter: state.subcommand === 'pop' },
 				);
 
@@ -449,16 +449,16 @@ export class StashGitCommand extends QuickCommand<State> {
 
 			endSteps(state);
 
-			state.references.sort((a, b) => parseInt(b.number, 10) - parseInt(a.number, 10));
+			state.references.sort((a, b) => parseInt(b.stashNumber, 10) - parseInt(a.stashNumber, 10));
 			for (const ref of state.references) {
 				try {
 					// drop can only take a stash index, e.g. `stash@{1}`
-					await state.repo.git.stash()?.deleteStash(`stash@{${ref.number}}`, ref.ref);
+					await state.repo.git.stash()?.deleteStash(`stash@{${ref.stashNumber}}`, ref.ref);
 				} catch (ex) {
 					Logger.error(ex, context.title);
 
 					void showGenericErrorMessage(
-						`Unable to delete stash@{${ref.number}}${ref.message ? `: ${ref.message}` : ''}`,
+						`Unable to delete stash@{${ref.stashNumber}}${ref.message ? `: ${ref.message}` : ''}`,
 					);
 				}
 			}

src/env/node/git/sub-providers/graph.ts

@@ -508,7 +508,7 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 								refType: 'stash',
 								name: stash.name,
 								message: stash.message,
-								number: stash.number,
+								number: stash.stashNumber,
 							}),
 						},
 					});

src/git/formatters/commitFormatter.ts

@@ -661,7 +661,7 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 		if (isStash(this._item)) {
 			icon = 'archive';
 			label = this._padOrTruncate(
-				`Stash${this._item.number ? ` #${this._item.number}` : ''}`,
+				`Stash${this._item.stashNumber ? ` #${this._item.stashNumber}` : ''}`,
 				this._options.tokenOptions.link,
 			);
 		} else {
@@ -856,7 +856,7 @@ export class CommitFormatter extends Formatter<GitCommit, CommitFormatOptions> {
 	}
 
 	get stashNumber(): string {
-		return this._padOrTruncate(this._item.number ?? '', this._options.tokenOptions.stashNumber);
+		return this._padOrTruncate(this._item.stashNumber ?? '', this._options.tokenOptions.stashNumber);
 	}
 
 	get stashOnRef(): string {

src/git/models/commit.ts

@@ -52,8 +52,7 @@ export class GitCommit implements GitRevisionReference {
 	readonly refType: GitRevisionReference['refType'];
 	readonly shortSha: string;
 	readonly stashName: string | undefined;
-	// TODO@eamodio rename to stashNumber
-	readonly number: string | undefined;
+	readonly stashNumber: string | undefined;
 	readonly stashOnRef: string | undefined;
 	readonly tips: string[] | undefined;
 
@@ -81,7 +80,7 @@ export class GitCommit implements GitRevisionReference {
 			this.refType = 'stash';
 			this.stashName = stashName || undefined;
 			this.stashOnRef = stashOnRef || undefined;
-			this.number = stashNumberRegex.exec(stashName)?.[1];
+			this.stashNumber = stashNumberRegex.exec(stashName)?.[1];
 		} else {
 			this.refType = 'revision';
 		}
@@ -740,7 +739,7 @@ export interface GitCommitStats<Files extends number | GitDiffFileStats = number
 export interface GitStashCommit extends GitCommit {
 	readonly refType: GitStashReference['refType'];
 	readonly stashName: string;
-	readonly number: string;
+	readonly stashNumber: string;
 }
 
 export type GitCommitWithFullDetails = GitCommit & SomeNonNullable<GitCommit, 'message' | 'fileset'>;

src/git/models/reference.ts

@@ -17,7 +17,7 @@ export interface GitRevisionReference {
 	sha: string;
 	repoPath: string;
 
-	number?: string | undefined;
+	stashNumber?: string | undefined;
 	message?: string | undefined;
 }
 
@@ -28,7 +28,7 @@ export interface GitStashReference {
 	ref: string;
 	sha: string;
 	repoPath: string;
-	number: string;
+	stashNumber: string;
 
 	message?: string | undefined;
 	stashOnRef?: string | undefined;

src/git/utils/-webview/reference.utils.ts

@@ -23,7 +23,7 @@ export function getReferenceFromRevision(
 		return createReference(revision.ref, revision.repoPath, {
 			refType: revision.refType,
 			name: revision.name,
-			number: revision.number,
+			number: revision.stashNumber,
 			message: options?.excludeMessage ? undefined : revision.message,
 		});
 	}

src/git/utils/reference.utils.ts

@@ -76,7 +76,7 @@ export function createReference(
 				ref: ref,
 				sha: ref,
 				name: options.name,
-				number: options.number,
+				stashNumber: options.number,
 				message: options.message,
 				stashOnRef: options.stashOnRef,
 			};
@@ -146,7 +146,7 @@ export function getReferenceLabel(
 				if (isStashReference(ref)) {
 					let message;
 					if (options.expand && ref.message) {
-						message = `${ref.number != null ? `#${ref.number}: ` : ''}${
+						message = `${ref.stashNumber != null ? `#${ref.stashNumber}: ` : ''}${
 							ref.message.length > 20
 								? `${ref.message.substring(0, 20).trimEnd()}${GlyphChars.Ellipsis}`
 								: ref.message
@@ -156,7 +156,7 @@ export function getReferenceLabel(
 					result = `${options.label ? 'stash ' : ''}${
 						options.icon
 							? `$(archive)${GlyphChars.Space}${message ?? ref.name}`
-							: message ?? (ref.number ? `#${ref.number}` : ref.name)
+							: message ?? (ref.stashNumber ? `#${ref.stashNumber}` : ref.name)
 					}`;
 				} else if (isRevisionRange(ref.ref)) {
 					result = refName;

src/quickpicks/items/gitWizard.ts

@@ -214,7 +214,7 @@ export function createStashQuickPickItem(
 	picked?: boolean,
 	options?: { alwaysShow?: boolean; buttons?: QuickInputButton[]; compact?: boolean; icon?: boolean },
 ): CommitQuickPickItem<GitStashCommit> {
-	const number = stash.number == null ? '' : `${stash.number}: `;
+	const number = stash.stashNumber == null ? '' : `${stash.stashNumber}: `;
 
 	if (options?.compact) {
 		const item: CommitQuickPickItem<GitStashCommit> = {

src/webviews/apps/shared/git-utils.ts

@@ -95,7 +95,7 @@ export function getReferenceLabel(
 			if (isStashReference(ref)) {
 				let message;
 				if (options.expand && ref.message) {
-					message = `${ref.number != null ? `#${ref.number}: ` : ''}${
+					message = `${ref.stashNumber != null ? `#${ref.stashNumber}: ` : ''}${
 						ref.message.length > 20
 							? `${ref.message.substring(0, 20).trimEnd()}${GlyphChars.Ellipsis}`
 							: ref.message
@@ -105,7 +105,7 @@ export function getReferenceLabel(
 				result = `${options.label ? 'stash ' : ''}${
 					options.icon
 						? `$(archive)${GlyphChars.Space}${message ?? ref.name}`
-						: message ?? (ref.number ? `#${ref.number}` : ref.name)
+						: message ?? (ref.stashNumber ? `#${ref.stashNumber}` : ref.name)
 				}`;
 			} else if (isRevisionRange(ref.ref)) {
 				result = refName;

src/webviews/commitDetails/commitDetailsWebview.ts

@@ -1792,7 +1792,7 @@ export class CommitDetailsWebviewProvider
 			// committer: { ...commit.committer, avatar: committerAvatar?.toString(true) },
 			message: formattedMessage,
 			parents: commit.parents,
-			stashNumber: commit.refType === 'stash' ? commit.number : undefined,
+			stashNumber: commit.refType === 'stash' ? commit.stashNumber : undefined,
 			files: commit.fileset?.files,
 			stats: commit.stats,
 			autolinks: autolinks != null ? [...map(autolinks.values(), serializeAutolink)] : undefined,