From 0854e0bcfbf5a70acb082958201d7faa22baa6ce Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 9 Apr 2017 10:58:42 -0400 Subject: [PATCH] Changes sha terminology to commit id --- package.json | 4 ++-- src/commands/copyShaToClipboard.ts | 4 ++-- src/quickPicks/branchHistory.ts | 6 +++--- src/quickPicks/commitDetails.ts | 2 +- src/quickPicks/commitFileDetails.ts | 2 +- src/quickPicks/stashList.ts | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 856f3fe..c0c8280 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "gitlens.blame.annotation.sha": { "type": "boolean", "default": true, - "description": "Specifies whether the commit sha will be shown in the blame annotations. Applies only to the `expanded` & `trailing` annotation styles" + "description": "Specifies whether the commit id (sha) will be shown in the blame annotations. Applies only to the `expanded` & `trailing` annotation styles" }, "gitlens.blame.annotation.author": { "type": "boolean", @@ -470,7 +470,7 @@ }, { "command": "gitlens.copyShaToClipboard", - "title": "Copy Commit Sha to Clipboard", + "title": "Copy Commit ID to Clipboard", "category": "GitLens" }, { diff --git a/src/commands/copyShaToClipboard.ts b/src/commands/copyShaToClipboard.ts index 69c662f..e6de0e6 100644 --- a/src/commands/copyShaToClipboard.ts +++ b/src/commands/copyShaToClipboard.ts @@ -47,7 +47,7 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand { } catch (ex) { Logger.error(ex, 'CopyShaToClipboardCommand', `getBlameForLine(${blameline})`); - return window.showErrorMessage(`Unable to copy sha. See output channel for more details`); + return window.showErrorMessage(`Unable to copy commit id. See output channel for more details`); } } @@ -56,7 +56,7 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand { } catch (ex) { Logger.error(ex, 'CopyShaToClipboardCommand'); - return window.showErrorMessage(`Unable to copy sha. See output channel for more details`); + return window.showErrorMessage(`Unable to copy commit id. See output channel for more details`); } } } \ No newline at end of file diff --git a/src/quickPicks/branchHistory.ts b/src/quickPicks/branchHistory.ts index b16fc4d..e80ea54 100644 --- a/src/quickPicks/branchHistory.ts +++ b/src/quickPicks/branchHistory.ts @@ -9,7 +9,7 @@ import { OpenRemotesCommandQuickPickItem } from './remotes'; export class BranchHistoryQuickPick { static showProgress(branch: string) { - return showQuickPickProgress(`${branch} history \u2014 search by commit message, filename, or sha`, + return showQuickPickProgress(`${branch} history \u2014 search by commit message, filename, or commit id`, { left: KeyNoopCommand, ',': KeyNoopCommand, @@ -27,7 +27,7 @@ export class BranchHistoryQuickPick { items.splice(0, 0, new CommandQuickPickItem({ label: `$(search) Show Commit Search`, - description: `\u00a0 \u2014 \u00a0\u00a0 search for commits by message, author, files, or sha` + description: `\u00a0 \u2014 \u00a0\u00a0 search for commits by message, author, files, or commit id` }, Commands.ShowCommitSearch, [new GitUri(Uri.file(log.repoPath), { fileName: '', repoPath: log.repoPath }), undefined, undefined, currentCommand])); const remotes = Arrays.uniqueBy(await git.getRemotes((uri && uri.repoPath) || git.repoPath), _ => _.url, _ => !!_.provider); @@ -99,7 +99,7 @@ export class BranchHistoryQuickPick { const pick = await window.showQuickPick(items, { matchOnDescription: true, matchOnDetail: true, - placeHolder: `${branch} history \u2014 search by commit message, filename, or sha`, + placeHolder: `${branch} history \u2014 search by commit message, filename, or commit id`, ignoreFocusOut: getQuickPickIgnoreFocusOut() // onDidSelectItem: (item: QuickPickItem) => { // scope.setKeyCommand('right', item); diff --git a/src/quickPicks/commitDetails.ts b/src/quickPicks/commitDetails.ts index d01da98..3cb2be0 100644 --- a/src/quickPicks/commitDetails.ts +++ b/src/quickPicks/commitDetails.ts @@ -90,7 +90,7 @@ export class CommitDetailsQuickPick { if (!stash) { items.splice(index++, 0, new CommandQuickPickItem({ - label: `$(clippy) Copy Commit Sha to Clipboard`, + label: `$(clippy) Copy Commit ID to Clipboard`, description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.shortSha}` }, Commands.CopyShaToClipboard, [uri, commit.sha])); } diff --git a/src/quickPicks/commitFileDetails.ts b/src/quickPicks/commitFileDetails.ts index c3ef29a..453d6c7 100644 --- a/src/quickPicks/commitFileDetails.ts +++ b/src/quickPicks/commitFileDetails.ts @@ -69,7 +69,7 @@ export class CommitFileDetailsQuickPick { if (!stash) { items.push(new CommandQuickPickItem({ - label: `$(clippy) Copy Commit Sha to Clipboard`, + label: `$(clippy) Copy Commit ID to Clipboard`, description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.shortSha}` }, Commands.CopyShaToClipboard, [uri, commit.sha])); diff --git a/src/quickPicks/stashList.ts b/src/quickPicks/stashList.ts index 111d4e4..aff739c 100644 --- a/src/quickPicks/stashList.ts +++ b/src/quickPicks/stashList.ts @@ -32,7 +32,7 @@ export class StashListQuickPick { matchOnDescription: true, placeHolder: mode === 'apply' ? `Apply stashed changes to your working tree\u2026` - : `stashed changes \u2014 search by message, filename, or sha`, + : `stashed changes \u2014 search by message, filename, or commit id`, ignoreFocusOut: getQuickPickIgnoreFocusOut() // onDidSelectItem: (item: QuickPickItem) => { // scope.setKeyCommand('right', item);