Browse Source

Shortens refs

main
Eric Amodio 6 years ago
parent
commit
8a87713d68
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/commands/diffWithBranch.ts

+ 3
- 3
src/commands/diffWithBranch.ts View File

@ -3,7 +3,7 @@ import * as paths from 'path';
import { commands, TextDocumentShowOptions, TextEditor, Uri } from 'vscode'; import { commands, TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
import { GlyphChars } from '../constants'; import { GlyphChars } from '../constants';
import { Container } from '../container'; import { Container } from '../container';
import { GitUri } from '../git/gitService';
import { GitService, GitUri } from '../git/gitService';
import { Messages } from '../messages'; import { Messages } from '../messages';
import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickpicks'; import { BranchesAndTagsQuickPick, CommandQuickPickItem } from '../quickpicks';
import { Strings } from '../system'; import { Strings } from '../system';
@ -59,7 +59,7 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
const rename = files.find(s => s.fileName === fileName); const rename = files.find(s => s.fileName === fileName);
if (rename !== undefined && rename.originalFileName !== undefined) { if (rename !== undefined && rename.originalFileName !== undefined) {
renamedUri = GitUri.resolveToUri(rename.originalFileName, gitUri.repoPath); renamedUri = GitUri.resolveToUri(rename.originalFileName, gitUri.repoPath);
renamedTitle = `${paths.basename(rename.originalFileName)} (${ref})`;
renamedTitle = `${paths.basename(rename.originalFileName)} (${GitService.shortenSha(ref)})`;
} }
} }
@ -68,7 +68,7 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
lhs: { lhs: {
sha: pick.remote ? `remotes/${ref}` : ref, sha: pick.remote ? `remotes/${ref}` : ref,
uri: renamedUri || (gitUri as Uri), uri: renamedUri || (gitUri as Uri),
title: renamedTitle || `${paths.basename(gitUri.fsPath)} (${ref})`
title: renamedTitle || `${paths.basename(gitUri.fsPath)} (${GitService.shortenSha(ref)})`
}, },
rhs: { rhs: {
sha: '', sha: '',

Loading…
Cancel
Save