Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

isolate RawGitServiceWrapper

Browse Source
This commit is contained in:
Joao Moreno
2015-11-26 15:45:57 +01:00
parent a629490719
commit b0e69a968f
2 changed files with 124 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/vs/workbench/parts/git/electron-browser/electronGitService.ts
View File

@@ -17,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { IMessageService } from 'vs/platform/message/common/message';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { Client } from 'vs/base/node/service.cp';
import { RawGitService } from 'vs/workbench/parts/git/node/rawGitService';
import { RawGitService, RawGitServiceWrapper } from 'vs/workbench/parts/git/node/rawGitService';
import URI from 'vs/base/common/uri';
import { spawn, exec } from 'child_process';
import { join } from 'path';
@@ -102,14 +102,14 @@ class DisabledRawGitService extends RawGitService {
}
}
export function createNativeRawGitService(basePath: string, gitPath: string, defaultEncoding: string): Promise {
export function createNativeRawGitService(workspaceRoot: string, gitPath: string, defaultEncoding: string): Promise {
return findGit(gitPath).then(gitPath => {
const client = new Client(
URI.parse(require.toUrl('bootstrap')).fsPath,
{
serverName: 'Git',
timeout: 1000 * 60,
args: [gitPath, basePath, defaultEncoding, remote.process.execPath],
args: [gitPath, workspaceRoot, defaultEncoding, remote.process.execPath],
env: {
ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
PIPE_LOGGING: 'true',
@@ -122,12 +122,9 @@ export function createNativeRawGitService(basePath: string, gitPath: string, def
}, () => new UnavailableRawGitService());
}
class ElectronRawGitService implements IRawGitService {
private raw: TPromise<IRawGitService>;
constructor(basePath: string, @IConfigurationService configurationService: IConfigurationService) {
this.raw = configurationService.loadConfiguration().then(conf => {
class ElectronRawGitService extends RawGitServiceWrapper {
constructor(workspaceRoot: string, @IConfigurationService configurationService: IConfigurationService) {
super(configurationService.loadConfiguration().then(conf => {
var enabled = conf.git ? conf.git.enabled : true;
if (!enabled) {
@@ -137,89 +134,12 @@ class ElectronRawGitService implements IRawGitService {
var gitPath = (conf.git && conf.git.path) || null;
var encoding = (conf.files && conf.files.encoding) || 'utf8';
return createNativeRawGitService(basePath, gitPath, encoding);
});
}
public serviceState(): TPromise<RawServiceState> {
return this.raw.then(raw => raw.serviceState());
}
public status(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.status());
}
public init(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.init());
}
public add(filesPaths?: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.add(filesPaths));
}
public stage(filePath: string, content: string): TPromise<IRawStatus> {
return this.raw.then(raw => raw.stage(filePath, content));
}
public branch(name: string, checkout?: boolean): TPromise<IRawStatus> {
return this.raw.then(raw => raw.branch(name, checkout));
}
public checkout(treeish?: string, filePaths?: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.checkout(treeish, filePaths));
}
public clean(filePaths: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.clean(filePaths));
}
public undo(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.undo());
}
public reset(treeish: string, hard?: boolean): TPromise<IRawStatus> {
return this.raw.then(raw => raw.reset(treeish, hard));
}
public revertFiles(treeish: string, filePaths?: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.revertFiles(treeish, filePaths));
}
public fetch(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.fetch());
}
public pull(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.pull());
}
public push(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.push());
}
public sync(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.sync());
}
public commit(message: string, amend?: boolean, stage?: boolean): TPromise<IRawStatus> {
return this.raw.then(raw => raw.commit(message, amend, stage));
}
public detectMimetypes(path: string, treeish?: string): TPromise<string[]> {
return this.raw.then(raw => raw.detectMimetypes(path, treeish));
}
public show(path: string, treeish?: string): TPromise<string> {
return this.raw.then(raw => raw.show(path, treeish));
}
public onOutput(): Promise {
return this.raw.then(raw => raw.onOutput());
return createNativeRawGitService(workspaceRoot, gitPath, encoding);
}));
}
}
export class ElectronGitService extends GitService {
constructor(
@IInstantiationService instantiationService: IInstantiationService,
@IEventService eventService: IEventService,

151
src/vs/workbench/parts/git/node/rawGitService.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import path = require('path');
import winjs = require('vs/base/common/winjs.base');
import { TPromise, Promise } from 'vs/base/common/winjs.base';
import mime = require('vs/base/node/mime');
import pfs = require('vs/base/node/pfs');
import { Repository, GitError } from 'vs/workbench/parts/git/node/git.lib';
@@ -23,21 +23,21 @@ function pathsAreEqual(p1: string, p2: string): boolean {
export class RawGitService implements IRawGitService {
private repo: Repository;
private repoRealRootPath: winjs.TPromise<string>;
private repoRealRootPath: TPromise<string>;
constructor(repo: Repository) {
this.repo = repo;
this.repoRealRootPath = null;
}
public serviceState(): winjs.TPromise<RawServiceState> {
return winjs.TPromise.as<RawServiceState>(this.repo
public serviceState(): TPromise<RawServiceState> {
return TPromise.as<RawServiceState>(this.repo
? RawServiceState.OK
: RawServiceState.GitNotFound
);
}
public status(): winjs.TPromise<IRawStatus> {
public status(): TPromise<IRawStatus> {
return this.checkRoot()
.then(() => this.repo.getStatus())
.then(status => this.repo.getHEAD()
@@ -48,7 +48,7 @@ export class RawGitService implements IRawGitService {
return HEAD;
}
}, (): IHead => null)
.then(HEAD => winjs.Promise.join([this.repo.getHeads(), this.repo.getTags()]).then(r => {
.then(HEAD => Promise.join([this.repo.getHeads(), this.repo.getTags()]).then(r => {
return {
status: status,
HEAD: HEAD,
@@ -58,75 +58,75 @@ export class RawGitService implements IRawGitService {
})))
.then(null, (err) => {
if (err.gitErrorCode === GitErrorCodes.BadConfigFile) {
return winjs.Promise.wrapError(err);
return Promise.wrapError(err);
} else if (err.gitErrorCode === GitErrorCodes.NotAtRepositoryRoot) {
return winjs.Promise.wrapError(err);
return Promise.wrapError(err);
}
return null;
});
}
public init(): winjs.TPromise<IRawStatus> {
public init(): TPromise<IRawStatus> {
return this.repo.init().then(() => this.status());
}
public add(filePaths?: string[]): winjs.TPromise<IRawStatus> {
public add(filePaths?: string[]): TPromise<IRawStatus> {
return this.repo.add(filePaths).then(() => this.status());
}
public stage(filePath: string, content: string): winjs.TPromise<IRawStatus> {
public stage(filePath: string, content: string): TPromise<IRawStatus> {
return this.repo.stage(filePath, content).then(() => this.status());
}
public branch(name: string, checkout?: boolean): winjs.TPromise<IRawStatus> {
public branch(name: string, checkout?: boolean): TPromise<IRawStatus> {
return this.repo.branch(name, checkout).then(() => this.status());
}
public checkout(treeish?: string, filePaths?: string[]): winjs.TPromise<IRawStatus> {
public checkout(treeish?: string, filePaths?: string[]): TPromise<IRawStatus> {
return this.repo.checkout(treeish, filePaths).then(() => this.status());
}
public clean(filePaths: string[]): winjs.TPromise<IRawStatus> {
public clean(filePaths: string[]): TPromise<IRawStatus> {
return this.repo.clean(filePaths).then(() => this.status());
}
public undo(): winjs.TPromise<IRawStatus> {
public undo(): TPromise<IRawStatus> {
return this.repo.undo().then(() => this.status());
}
public reset(treeish: string, hard?: boolean): winjs.TPromise<IRawStatus> {
public reset(treeish: string, hard?: boolean): TPromise<IRawStatus> {
return this.repo.reset(treeish, hard).then(() => this.status());
}
public revertFiles(treeish: string, filePaths?: string[]): winjs.TPromise<IRawStatus> {
public revertFiles(treeish: string, filePaths?: string[]): TPromise<IRawStatus> {
return this.repo.revertFiles(treeish, filePaths).then(() => this.status());
}
public fetch(): winjs.TPromise<IRawStatus> {
public fetch(): TPromise<IRawStatus> {
return this.repo.fetch().then(null, (err) => {
if (err.gitErrorCode === GitErrorCodes.NoRemoteRepositorySpecified) {
return winjs.Promise.as(null);
return Promise.as(null);
}
return winjs.Promise.wrapError(err);
return Promise.wrapError(err);
}).then(() => this.status());
}
public pull(): winjs.TPromise<IRawStatus> {
public pull(): TPromise<IRawStatus> {
return this.repo.pull().then(() => this.status());
}
public push(): winjs.TPromise<IRawStatus> {
public push(): TPromise<IRawStatus> {
return this.repo.push().then(() => this.status());
}
public sync(): winjs.TPromise<IRawStatus> {
public sync(): TPromise<IRawStatus> {
return this.repo.sync().then(() => this.status());
}
public commit(message:string, amend?: boolean, stage?: boolean): winjs.TPromise<IRawStatus> {
var promise: winjs.Promise = winjs.Promise.as(null);
public commit(message:string, amend?: boolean, stage?: boolean): TPromise<IRawStatus> {
var promise: Promise = Promise.as(null);
if (stage) {
promise = this.repo.add(null);
@@ -137,10 +137,10 @@ export class RawGitService implements IRawGitService {
.then(() => this.status());
}
public detectMimetypes(filePath: string, treeish?: string): winjs.TPromise<string[]> {
public detectMimetypes(filePath: string, treeish?: string): TPromise<string[]> {
return pfs.exists(path.join(this.repo.path, filePath)).then((exists) => {
if (exists) {
return new winjs.TPromise<string[]>((c, e) => {
return new TPromise<string[]>((c, e) => {
mime.detectMimesFromFile(path.join(this.repo.path, filePath), (err, result) => {
if (err) { e(err); }
else { c(result.mimes); }
@@ -150,7 +150,7 @@ export class RawGitService implements IRawGitService {
var child = this.repo.show(treeish + ':' + filePath);
return new winjs.TPromise<string[]>((c, e) => {
return new TPromise<string[]>((c, e) => {
mime.detectMimesFromStream(child.stdout, filePath, (err, result) => {
if (err) { e(err); }
else { c(result.mimes); }
@@ -160,37 +160,37 @@ export class RawGitService implements IRawGitService {
}
// careful, this buffers the whole object into memory
public show(filePath: string, treeish?: string): winjs.TPromise<string> {
public show(filePath: string, treeish?: string): TPromise<string> {
treeish = treeish === '~' ? '' : treeish;
return this.repo.buffer(treeish + ':' + filePath).then(null, e => {
if (e instanceof GitError) {
return ''; // mostly untracked files end up in a git error
}
return winjs.TPromise.wrapError<string>(e);
return TPromise.wrapError<string>(e);
});
}
public onOutput(): winjs.Promise {
public onOutput(): Promise {
var cancel: () => void;
return new winjs.Promise((c, e, p) => {
return new Promise((c, e, p) => {
cancel = this.repo.onOutput(p);
}, () => cancel());
}
private checkRoot(): winjs.Promise {
private checkRoot(): Promise {
if (!this.repoRealRootPath) {
this.repoRealRootPath = pfs.realpath(this.repo.path);
}
return this.repo.getRoot().then(root => {
return winjs.Promise.join([
return Promise.join([
this.repoRealRootPath,
pfs.realpath(root)
]).then(paths => {
if (!pathsAreEqual(paths[0], paths[1])) {
return winjs.Promise.wrapError(new GitError({
return Promise.wrapError(new GitError({
message: 'Not at the repository root',
gitErrorCode: GitErrorCodes.NotAtRepositoryRoot
}));
@@ -199,3 +199,84 @@ export class RawGitService implements IRawGitService {
});
}
}
export class RawGitServiceWrapper implements IRawGitService {
constructor(private raw: TPromise<IRawGitService>) { }
public serviceState(): TPromise<RawServiceState> {
return this.raw.then(raw => raw.serviceState());
}
public status(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.status());
}
public init(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.init());
}
public add(filesPaths?: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.add(filesPaths));
}
public stage(filePath: string, content: string): TPromise<IRawStatus> {
return this.raw.then(raw => raw.stage(filePath, content));
}
public branch(name: string, checkout?: boolean): TPromise<IRawStatus> {
return this.raw.then(raw => raw.branch(name, checkout));
}
public checkout(treeish?: string, filePaths?: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.checkout(treeish, filePaths));
}
public clean(filePaths: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.clean(filePaths));
}
public undo(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.undo());
}
public reset(treeish: string, hard?: boolean): TPromise<IRawStatus> {
return this.raw.then(raw => raw.reset(treeish, hard));
}
public revertFiles(treeish: string, filePaths?: string[]): TPromise<IRawStatus> {
return this.raw.then(raw => raw.revertFiles(treeish, filePaths));
}
public fetch(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.fetch());
}
public pull(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.pull());
}
public push(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.push());
}
public sync(): TPromise<IRawStatus> {
return this.raw.then(raw => raw.sync());
}
public commit(message: string, amend?: boolean, stage?: boolean): TPromise<IRawStatus> {
return this.raw.then(raw => raw.commit(message, amend, stage));
}
public detectMimetypes(path: string, treeish?: string): TPromise<string[]> {
return this.raw.then(raw => raw.detectMimetypes(path, treeish));
}
public show(path: string, treeish?: string): TPromise<string> {
return this.raw.then(raw => raw.show(path, treeish));
}
public onOutput(): Promise {
return this.raw.then(raw => raw.onOutput());
}
}