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

Fixes #7 - missing lodash dependency

Browse Source
This commit is contained in:
Eric Amodio
2016-09-20 10:16:33 -04:00
parent 30b1fba8d4
commit 20df7732be
12 changed files with 341 additions and 18585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/git/git.ts
View File

@@ -2,14 +2,15 @@
import * as fs from 'fs';
import * as path from 'path';
import * as tmp from 'tmp';
import {spawnPromise} from 'spawn-rx';
//import {spawnPromise} from 'spawn-rx';
const spawnRx = require('./spawn-rx');
export * from './gitEnrichment';
//export * from './enrichers/blameRegExpEnricher';
export * from './enrichers/blameParserEnricher';
function gitCommand(cwd: string, ...args) {
return spawnPromise('git', args, { cwd: cwd })
return spawnRx.spawnPromise('git', args, { cwd: cwd })
.then(s => {
console.log('[GitLens]', 'git', ...args);
return s;
@@ -37,7 +38,7 @@ export default class Git {
return fileName.replace(/\\/g, '/');
}
static splitPath(fileName: string, repoPath?: string) {
static splitPath(fileName: string, repoPath?: string): [string, string] {
// if (!path.isAbsolute(fileName)) {
// console.error('[GitLens]', `Git.splitPath(${fileName}) is not an absolute path!`);
// debugger;
@@ -54,7 +55,7 @@ export default class Git {
}
static blame(format: GitBlameFormat, fileName: string, repoPath?: string, sha?: string) {
const [file, root] = Git.splitPath(Git.normalizePath(fileName), repoPath);
const [file, root]: [string, string] = Git.splitPath(Git.normalizePath(fileName), repoPath);
if (sha) {
return gitCommand(root, 'blame', format, '--root', `${sha}^`, '--', file);