ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-01-29 17:25:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changes sha terminology to commit id

Browse Source
This commit is contained in:
Eric Amodio
2017-04-09 10:58:42 -04:00
parent 2a9b274920
commit 0854e0bcfb
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -66,7 +66,7 @@
"gitlens.blame.annotation.sha": { "gitlens.blame.annotation.sha": {
"type": "boolean", "type": "boolean",
"default": true, "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": { "gitlens.blame.annotation.author": {
"type": "boolean", "type": "boolean",
@@ -470,7 +470,7 @@
}, },
{ {
"command": "gitlens.copyShaToClipboard", "command": "gitlens.copyShaToClipboard",
"title": "Copy Commit Sha to Clipboard", "title": "Copy Commit ID to Clipboard",
"category": "GitLens" "category": "GitLens"
}, },
{ {

4
src/commands/copyShaToClipboard.ts
View File

@@ -47,7 +47,7 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand {
} }
catch (ex) { catch (ex) {
Logger.error(ex, 'CopyShaToClipboardCommand', `getBlameForLine(${blameline})`); 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) { catch (ex) {
Logger.error(ex, 'CopyShaToClipboardCommand'); 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`);
} }
} }
} }

6
src/quickPicks/branchHistory.ts
View File

@@ -9,7 +9,7 @@ import { OpenRemotesCommandQuickPickItem } from './remotes';
export class BranchHistoryQuickPick { export class BranchHistoryQuickPick {
static showProgress(branch: string) { 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, left: KeyNoopCommand,
',': KeyNoopCommand, ',': KeyNoopCommand,
@@ -27,7 +27,7 @@ export class BranchHistoryQuickPick {
items.splice(0, 0, new CommandQuickPickItem({ items.splice(0, 0, new CommandQuickPickItem({
label: `$(search) Show Commit Search`, 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])); }, 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); 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, { const pick = await window.showQuickPick(items, {
matchOnDescription: true, matchOnDescription: true,
matchOnDetail: 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() ignoreFocusOut: getQuickPickIgnoreFocusOut()
// onDidSelectItem: (item: QuickPickItem) => { // onDidSelectItem: (item: QuickPickItem) => {
// scope.setKeyCommand('right', item); // scope.setKeyCommand('right', item);

2
src/quickPicks/commitDetails.ts
View File

@@ -90,7 +90,7 @@ export class CommitDetailsQuickPick {
if (!stash) { if (!stash) {
items.splice(index++, 0, new CommandQuickPickItem({ 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}` description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.shortSha}`
}, Commands.CopyShaToClipboard, [uri, commit.sha])); }, Commands.CopyShaToClipboard, [uri, commit.sha]));
} }

2
src/quickPicks/commitFileDetails.ts
View File

@@ -69,7 +69,7 @@ export class CommitFileDetailsQuickPick {
if (!stash) { if (!stash) {
items.push(new CommandQuickPickItem({ 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}` description: `\u00a0 \u2014 \u00a0\u00a0 ${commit.shortSha}`
}, Commands.CopyShaToClipboard, [uri, commit.sha])); }, Commands.CopyShaToClipboard, [uri, commit.sha]));

2
src/quickPicks/stashList.ts
View File

@@ -32,7 +32,7 @@ export class StashListQuickPick {
matchOnDescription: true, matchOnDescription: true,
placeHolder: mode === 'apply' placeHolder: mode === 'apply'
? `Apply stashed changes to your working tree\u2026` ? `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() ignoreFocusOut: getQuickPickIgnoreFocusOut()
// onDidSelectItem: (item: QuickPickItem) => { // onDidSelectItem: (item: QuickPickItem) => {
// scope.setKeyCommand('right', item); // scope.setKeyCommand('right', item);