Skip to content

Commit

Permalink
fix: Removed use of origional fs to allow extension to work remotely
Browse files Browse the repository at this point in the history
fixes #561
  • Loading branch information
JohnstonCode committed May 13, 2019
1 parent 80743dd commit 5c71067
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 3,022 deletions.
3 changes: 3 additions & 0 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ export async function activate(context: ExtensionContext) {
new Disposable(() => Disposable.from(...disposables).dispose())
);

//See https://github.com/JohnstonCode/svn-scm/issues/561
(process as any).noAsar = true;

await _activate(context, disposables).catch(err => console.error(err));
}

Expand Down
2 changes: 1 addition & 1 deletion src/fs/exists.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { access } from "original-fs";
import { access } from "fs";

export function exists(path: string): Promise<boolean> {
return new Promise((resolve, reject) => {
Expand Down
2 changes: 1 addition & 1 deletion src/fs/lstat.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { lstat as fsLstat } from "original-fs";
import { lstat as fsLstat } from "fs";
import { promisify } from "util";

export const lstat = promisify(fsLstat);
2 changes: 1 addition & 1 deletion src/fs/mkdir.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mkdir as fsMkdir } from "original-fs";
import { mkdir as fsMkdir } from "fs";
import { promisify } from "util";

export const mkdir = promisify(fsMkdir);
2 changes: 1 addition & 1 deletion src/fs/read_file.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { readFile as fsReadFile } from "original-fs";
import { readFile as fsReadFile } from "fs";
import { promisify } from "util";

export const readFile = promisify(fsReadFile);
2 changes: 1 addition & 1 deletion src/fs/readdir.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { readdir as fsReaddir } from "original-fs";
import { readdir as fsReaddir } from "fs";
import { promisify } from "util";

export const readdir = promisify(fsReaddir);
2 changes: 1 addition & 1 deletion src/fs/rmdir.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { rmdir as fsRmdir } from "original-fs";
import { rmdir as fsRmdir } from "fs";
import { promisify } from "util";

export const rmdir = promisify(fsRmdir);
2 changes: 1 addition & 1 deletion src/fs/stat.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { stat as fsStat } from "original-fs";
import { stat as fsStat } from "fs";
import { promisify } from "util";

export const stat = promisify(fsStat);
2 changes: 1 addition & 1 deletion src/fs/unlink.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { unlink as fsUnlink } from "original-fs";
import { unlink as fsUnlink } from "fs";
import { promisify } from "util";

export const unlink = promisify(fsUnlink);
2 changes: 1 addition & 1 deletion src/fs/write_file.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { writeFile as fsWriteFile } from "original-fs";
import { writeFile as fsWriteFile } from "fs";
import { promisify } from "util";

export const writeFile = promisify(fsWriteFile);
2 changes: 1 addition & 1 deletion src/model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Stats } from "original-fs";
import { Stats } from "fs";
import * as path from "path";
import {
commands,
Expand Down
2 changes: 1 addition & 1 deletion src/test/commands.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as assert from "assert";

// You can import and use all API from the 'vscode' module
// as well as import your extension to test it
import * as fs from "original-fs";
import * as fs from "fs";
import * as path from "path";
import { commands, Uri } from "vscode";
import { ISvnResourceGroup } from "../common/types";
Expand Down
2 changes: 1 addition & 1 deletion src/test/istanbultestrunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*--------------------------------------------------------*/

"use strict";
import * as fs from "original-fs";
import * as fs from "fs";
import * as glob from "glob";
import * as istanbul from "istanbul";
import * as Mocha from "mocha";
Expand Down
2 changes: 1 addition & 1 deletion src/test/repository.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as assert from "assert";

// You can import and use all API from the 'vscode' module
// as well as import your extension to test it
import * as fs from "original-fs";
import * as fs from "fs";
import * as path from "path";
import { commands, Uri, window, workspace } from "vscode";
import { Model } from "../model";
Expand Down
2 changes: 1 addition & 1 deletion src/test/testUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import * as cp from "child_process";
import { ChildProcess, SpawnOptions } from "child_process";
import * as fs from "original-fs";
import * as fs from "fs";
import * as os from "os";
import { type } from "os";
import * as path from "path";
Expand Down
2 changes: 1 addition & 1 deletion src/tools/generateConfigSectionForReadme.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { readFileSync } from "original-fs";
import { readFileSync } from "fs";
import { join } from "path";
import { cwd } from "process";

Expand Down
1 change: 0 additions & 1 deletion src/treeView/nodes/incomingChangeNode.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as fs from "original-fs";
import * as path from "path";
import { TreeItem, TreeItemCollapsibleState, Uri } from "vscode";
import { Repository } from "../../repository";
Expand Down
Loading

0 comments on commit 5c71067

Please sign in to comment.