ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 10:58:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adds fromFileStatus to GitUri

Browse Source
This commit is contained in:
Eric Amodio
2017-03-30 00:56:48 -04:00
parent aff8aff011
commit 276c24ac24
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/commands/closeUnchangedFiles.ts
View File

@@ -5,7 +5,6 @@ import { ActiveEditorCommand, Commands } from './common';
import { TextEditorComparer, UriComparer } from '../comparers'; import { TextEditorComparer, UriComparer } from '../comparers';
import { GitService } from '../gitService'; import { GitService } from '../gitService';
import { Logger } from '../logger'; import { Logger } from '../logger';
import * as path from 'path';
export class CloseUnchangedFilesCommand extends ActiveEditorCommand { export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
@@ -26,7 +25,7 @@ export class CloseUnchangedFilesCommand extends ActiveEditorCommand {
const status = await this.git.getStatusForRepo(repoPath); const status = await this.git.getStatusForRepo(repoPath);
if (!status) return window.showWarningMessage(`Unable to close unchanged files`); if (!status) return window.showWarningMessage(`Unable to close unchanged files`);
uris = status.files.map(_ => Uri.file(path.resolve(repoPath, _.fileName))); uris = status.files.map(_ => _.Uri);
} }
const editorTracker = new ActiveEditorTracker(); const editorTracker = new ActiveEditorTracker();

3
src/commands/openChangedFiles.ts
View File

@@ -3,7 +3,6 @@ import { TextEditor, Uri, window } from 'vscode';
import { ActiveEditorCommand, Commands, openEditor } from './common'; import { ActiveEditorCommand, Commands, openEditor } from './common';
import { GitService } from '../gitService'; import { GitService } from '../gitService';
import { Logger } from '../logger'; import { Logger } from '../logger';
import * as path from 'path';
export class OpenChangedFilesCommand extends ActiveEditorCommand { export class OpenChangedFilesCommand extends ActiveEditorCommand {
@@ -24,7 +23,7 @@ export class OpenChangedFilesCommand extends ActiveEditorCommand {
const status = await this.git.getStatusForRepo(repoPath); const status = await this.git.getStatusForRepo(repoPath);
if (!status) return window.showWarningMessage(`Unable to open changed files`); if (!status) return window.showWarningMessage(`Unable to open changed files`);
uris = status.files.filter(_ => _.status !== 'D').map(_ => Uri.file(path.resolve(repoPath, _.fileName))); uris = status.files.filter(_ => _.status !== 'D').map(_ => _.Uri);
} }
for (const uri of uris) { for (const uri of uris) {

11
src/git/gitUri.ts
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
import { Uri } from 'vscode'; import { Uri } from 'vscode';
import { DocumentSchemes } from '../constants'; import { DocumentSchemes } from '../constants';
import { Git, GitService } from '../gitService'; import { Git, GitCommit, GitService, IGitStatusFile } from '../gitService';
import * as path from 'path'; import * as path from 'path';
export class GitUri extends Uri { export class GitUri extends Uri {
@@ -12,6 +12,7 @@ export class GitUri extends Uri {
constructor(uri?: Uri, commit?: IGitCommitInfo); constructor(uri?: Uri, commit?: IGitCommitInfo);
constructor(uri?: Uri, repoPath?: string); constructor(uri?: Uri, repoPath?: string);
constructor(uri?: Uri, commitOrRepoPath?: IGitCommitInfo | string);
constructor(uri?: Uri, commitOrRepoPath?: IGitCommitInfo | string) { constructor(uri?: Uri, commitOrRepoPath?: IGitCommitInfo | string) {
super(); super();
if (!uri) return; if (!uri) return;
@@ -88,6 +89,14 @@ export class GitUri extends Uri {
return new GitUri(uri, git && git.repoPath); return new GitUri(uri, git && git.repoPath);
} }
static fromFileStatus(status: IGitStatusFile, repoPath: string, original?: boolean): GitUri;
static fromFileStatus(status: IGitStatusFile, commit: GitCommit, original?: boolean): GitUri;
static fromFileStatus(status: IGitStatusFile, repoPathOrCommit: string | GitCommit, original: boolean = false): GitUri {
const repoPath = repoPathOrCommit instanceof GitCommit ? repoPathOrCommit.repoPath : repoPathOrCommit;
const uri = Uri.file(path.resolve(repoPath, original ? status.originalFileName || status.fileName : status.fileName));
return new GitUri(uri, repoPathOrCommit);
}
} }
export interface IGitCommitInfo { export interface IGitCommitInfo {

4
src/quickPicks/commitDetails.ts
View File

@@ -34,7 +34,7 @@ export class CommitWithFileStatusQuickPickItem extends OpenFileCommandQuickPickI
}); });
this.fileName = status.fileName; this.fileName = status.fileName;
this.gitUri = new GitUri(Uri.file(path.resolve(commit.repoPath, status.fileName))); this.gitUri = GitUri.fromFileStatus(status, commit.repoPath);
this.sha = commit.sha; this.sha = commit.sha;
this.shortSha = commit.shortSha; this.shortSha = commit.shortSha;
this.status = status.status; this.status = status.status;
@@ -58,7 +58,7 @@ export class OpenCommitWorkingTreeFilesCommandQuickPickItem extends OpenFilesCom
constructor(commit: GitLogCommit, versioned: boolean = false, item?: QuickPickItem) { constructor(commit: GitLogCommit, versioned: boolean = false, item?: QuickPickItem) {
const repoPath = commit.repoPath; const repoPath = commit.repoPath;
const uris = commit.fileStatuses.map(_ => Uri.file(path.resolve(repoPath, _.fileName))); const uris = commit.fileStatuses.map(_ => GitUri.fromFileStatus(_, repoPath));
super(uris, item || { super(uris, item || {
label: `$(file-symlink-file) Open Changed Working Files`, label: `$(file-symlink-file) Open Changed Working Files`,
description: undefined description: undefined