Browse Source

Changes Repository History to Branch History

main
Eric Amodio 7 years ago
parent
commit
14eebbba15
7 changed files with 10 additions and 10 deletions
  1. +1
    -1
      src/blameActiveLineController.ts
  2. +1
    -1
      src/commands/copyMessageToClipboard.ts
  3. +1
    -1
      src/commands/copyShaToClipboard.ts
  4. +2
    -2
      src/commands/showQuickCommitDetails.ts
  5. +2
    -2
      src/commands/showQuickRepoHistory.ts
  6. +2
    -2
      src/quickPicks/fileHistory.ts
  7. +1
    -1
      src/quickPicks/repoHistory.ts

+ 1
- 1
src/blameActiveLineController.ts View File

@ -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;
}

+ 1
- 1
src/commands/copyMessageToClipboard.ts View File

@ -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;

+ 1
- 1
src/commands/copyShaToClipboard.ts View File

@ -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;

+ 2
- 2
src/commands/showQuickCommitDetails.ts View File

@ -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)]);
}

+ 2
- 2
src/commands/showQuickRepoHistory.ts View File

@ -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();

+ 2
- 2
src/quickPicks/fileHistory.ts View File

@ -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,

+ 1
- 1
src/quickPicks/repoHistory.ts View File

@ -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);

Loading…
Cancel
Save