From 14eebbba1565f92747fa72bca02f3829d513ad2f Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Sun, 19 Mar 2017 00:23:05 -0400 Subject: [PATCH] Changes Repository History to Branch History --- src/blameActiveLineController.ts | 2 +- src/commands/copyMessageToClipboard.ts | 2 +- src/commands/copyShaToClipboard.ts | 2 +- src/commands/showQuickCommitDetails.ts | 4 ++-- src/commands/showQuickRepoHistory.ts | 4 ++-- src/quickPicks/fileHistory.ts | 4 ++-- src/quickPicks/repoHistory.ts | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/blameActiveLineController.ts b/src/blameActiveLineController.ts index 04a5e57..54feebc 100644 --- a/src/blameActiveLineController.ts +++ b/src/blameActiveLineController.ts @@ -273,7 +273,7 @@ export class BlameActiveLineController extends Disposable { this._statusBarItem.tooltip = 'Show File History'; break; case StatusBarCommand.ShowQuickFileHistory: - this._statusBarItem.tooltip = 'Show Repository History'; + this._statusBarItem.tooltip = 'Show Branch History'; break; } diff --git a/src/commands/copyMessageToClipboard.ts b/src/commands/copyMessageToClipboard.ts index 52c5c58..8b06e2a 100644 --- a/src/commands/copyMessageToClipboard.ts +++ b/src/commands/copyMessageToClipboard.ts @@ -18,7 +18,7 @@ export class CopyMessageToClipboardCommand extends ActiveEditorCommand { } try { - // If we don't have an editor then get the message of the last commit to the repository + // If we don't have an editor then get the message of the last commit to the branch if (!uri) { const log = await this.git.getLogForRepo(this.repoPath, undefined, 1); if (!log) return undefined; diff --git a/src/commands/copyShaToClipboard.ts b/src/commands/copyShaToClipboard.ts index 57eb6aa..30f0566 100644 --- a/src/commands/copyShaToClipboard.ts +++ b/src/commands/copyShaToClipboard.ts @@ -18,7 +18,7 @@ export class CopyShaToClipboardCommand extends ActiveEditorCommand { } try { - // If we don't have an editor then get the sha of the last commit to the repository + // If we don't have an editor then get the sha of the last commit to the branch if (!uri) { const log = await this.git.getLogForRepo(this.repoPath, undefined, 1); if (!log) return undefined; diff --git a/src/commands/showQuickCommitDetails.ts b/src/commands/showQuickCommitDetails.ts index 19560e3..97bb2e6 100644 --- a/src/commands/showQuickCommitDetails.ts +++ b/src/commands/showQuickCommitDetails.ts @@ -61,10 +61,10 @@ export class ShowQuickCommitDetailsCommand extends ActiveEditorCommand { } if (!goBackCommand) { - // Create a command to get back to the repository history + // Create a command to get back to the branch history goBackCommand = new CommandQuickPickItem({ label: `go back \u21A9`, - description: `\u00a0 \u2014 \u00a0\u00a0 to repository history` + description: `\u00a0 \u2014 \u00a0\u00a0 to branch history` }, Commands.ShowQuickRepoHistory, [new GitUri(commit.uri, commit)]); } diff --git a/src/commands/showQuickRepoHistory.ts b/src/commands/showQuickRepoHistory.ts index f89d21d..8e92525 100644 --- a/src/commands/showQuickRepoHistory.ts +++ b/src/commands/showQuickRepoHistory.ts @@ -46,13 +46,13 @@ export class ShowQuickRepoHistoryCommand extends ActiveEditorCommand { return commands.executeCommand(Commands.ShowQuickCommitDetails, new GitUri(pick.commit.uri, pick.commit), pick.commit.sha, pick.commit, new CommandQuickPickItem({ label: `go back \u21A9`, - description: `\u00a0 \u2014 \u00a0\u00a0 to repository history` + description: `\u00a0 \u2014 \u00a0\u00a0 to branch history` }, Commands.ShowQuickRepoHistory, [uri, maxCount, goBackCommand, log]), log); } catch (ex) { Logger.error('[GitLens.ShowQuickRepoHistoryCommand]', ex); - return window.showErrorMessage(`Unable to show repository history. See output channel for more details`); + return window.showErrorMessage(`Unable to show history. See output channel for more details`); } finally { progressCancellation.dispose(); diff --git a/src/quickPicks/fileHistory.ts b/src/quickPicks/fileHistory.ts index 599edcf..9bdbe65 100644 --- a/src/quickPicks/fileHistory.ts +++ b/src/quickPicks/fileHistory.ts @@ -57,8 +57,8 @@ export class FileHistoryQuickPick { // Only show the full repo option if we are the root if (!goBackCommand) { items.splice(index, 0, new CommandQuickPickItem({ - label: `$(repo) Show Repository History`, - description: `\u00a0 \u2014 \u00a0\u00a0 shows the repository commit history` + label: `$(history) Show Branch History`, + description: `\u00a0 \u2014 \u00a0\u00a0 shows the current branch history` }, Commands.ShowQuickRepoHistory, [ undefined, diff --git a/src/quickPicks/repoHistory.ts b/src/quickPicks/repoHistory.ts index 78b7a1a..21a6ca1 100644 --- a/src/quickPicks/repoHistory.ts +++ b/src/quickPicks/repoHistory.ts @@ -66,7 +66,7 @@ export class RepoHistoryQuickPick { const pick = await window.showQuickPick(items, { matchOnDescription: true, matchOnDetail: true, - placeHolder: 'Repository history \u2014 search by commit message, filename, or sha', + placeHolder: `Branch history \u2014 search by commit message, filename, or sha`, ignoreFocusOut: getQuickPickIgnoreFocusOut() // onDidSelectItem: (item: QuickPickItem) => { // scope.setKeyCommand('right', item);