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

Fixes issues with missing repoPath

Browse Source 
Allows commit search without an active editor
This commit is contained in:
Eric Amodio
2017-05-22 16:04:46 -04:00
parent ec6ca8188c
commit 49fa9b5078
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/closeUnchangedFiles.ts
View File

@@ -22,7 +22,7 @@ export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
try {
if (args.uris === undefined) {
const repoPath = await this.git.getRepoPathFromUri(uri);
if (repoPath === undefined) return window.showWarningMessage(`Unable to close unchanged files`);
if (!repoPath) return window.showWarningMessage(`Unable to close unchanged files`);
const status = await this.git.getStatusForRepo(repoPath);
if (status === undefined) return window.showWarningMessage(`Unable to close unchanged files`);

4
src/commands/diffWithBranch.ts
View File

@@ -27,7 +27,7 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
args.line = args.line || (editor === undefined ? 0 : editor.selection.active.line);
const gitUri = await GitUri.fromUri(uri, this.git);
if (gitUri.repoPath === undefined) return undefined;
if (!gitUri.repoPath) return window.showWarningMessage(`Unable to open branch compare`);
const branches = await this.git.getBranches(gitUri.repoPath);
const pick = await BranchesQuickPick.show(branches, `Compare ${path.basename(gitUri.fsPath)} to \u2026`, args.goBackCommand);
@@ -52,7 +52,7 @@ export class DiffWithBranchCommand extends ActiveEditorCommand {
}
catch (ex) {
Logger.error(ex, 'DiffWithBranchCommand', 'getVersionedFile');
return window.showErrorMessage(`Unable to open compare. See output channel for more details`);
return window.showErrorMessage(`Unable to open branch compare. See output channel for more details`);
}
}
}

2
src/commands/openChangedFiles.ts
View File

@@ -20,7 +20,7 @@ export class OpenChangedFilesCommand extends ActiveEditorCommand {
try {
if (args.uris === undefined) {
const repoPath = await this.git.getRepoPathFromUri(uri);
if (repoPath === undefined) return window.showWarningMessage(`Unable to open changed files`);
if (!repoPath) return window.showWarningMessage(`Unable to open changed files`);
const status = await this.git.getStatusForRepo(repoPath);
if (status === undefined) return window.showWarningMessage(`Unable to open changed files`);

14
src/commands/showCommitSearch.ts
View File

@@ -29,10 +29,11 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
async execute(editor: TextEditor, uri?: Uri, args: ShowCommitSearchCommandArgs = {}) {
uri = getCommandUri(uri, editor);
if (uri === undefined) return undefined;
const gitUri = await GitUri.fromUri(uri, this.git);
if (gitUri.repoPath === undefined) return undefined;
const gitUri = uri === undefined ? undefined : await GitUri.fromUri(uri, this.git);
const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
if (!repoPath) return window.showWarningMessage(`Unable to show commit search`);
if (!args.search || args.searchBy == null) {
if (!args.search) {
@@ -40,6 +41,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
paste((err: Error, content: string) => resolve(err ? '' : content));
});
}
args.search = await window.showInputBox({
value: args.search,
prompt: `Please enter a search string`,
@@ -65,7 +67,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
args.searchBy = GitRepoSearchBy.Message;
}
const log = await this.git.getLogForRepoSearch(gitUri.repoPath, args.search, args.searchBy);
const log = await this.git.getLogForRepoSearch(repoPath, args.search, args.searchBy);
if (log === undefined) return undefined;
let originalSearch: string | undefined = undefined;
@@ -94,7 +96,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
label: `go back \u21A9`,
description: `\u00a0 \u2014 \u00a0\u00a0 to commit search`
}, Commands.ShowCommitSearch, [
gitUri,
uri,
{
search: originalSearch,
goBackCommand: args.goBackCommand
@@ -115,7 +117,7 @@ export class ShowCommitSearchCommand extends ActiveEditorCachedCommand {
label: `go back \u21A9`,
description: `\u00a0 \u2014 \u00a0\u00a0 to search for ${placeHolder}`
}, Commands.ShowCommitSearch, [
gitUri,
uri,
args
])
} as ShowQuickCommitDetailsCommandArgs);

4
src/commands/showQuickBranchHistory.ts
View File

@@ -32,8 +32,8 @@ export class ShowQuickBranchHistoryCommand extends ActiveEditorCachedCommand {
let progressCancellation = args.branch === undefined ? undefined : BranchHistoryQuickPick.showProgress(args.branch);
try {
const repoPath = (gitUri && gitUri.repoPath) || this.git.repoPath;
if (repoPath === undefined) return window.showWarningMessage(`Unable to show branch history`);
const repoPath = gitUri === undefined ? this.git.repoPath : gitUri.repoPath;
if (!repoPath) return window.showWarningMessage(`Unable to show branch history`);
if (args.branch === undefined) {
const branches = await this.git.getBranches(repoPath);

5
src/git/gitUri.ts
View File

@@ -43,9 +43,12 @@ export class GitUri extends Uri {
const commit = commitOrRepoPath;
base._fsPath = path.resolve(commit.repoPath, commit.originalFileName || commit.fileName);
if (commit.repoPath !== undefined) {
this.repoPath = commit.repoPath;
}
if (commit.sha !== undefined && !GitService.isUncommitted(commit.sha)) {
this.sha = commit.sha;
this.repoPath = commit.repoPath;
}
}
}