kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00
Code Issues Projects Releases Wiki Activity

fix(core): path to git executation (ref git.path)

Browse Source 
Signed-off-by: Shuguang Sun <shuguang79@qq.com>
This commit is contained in:
Shuguang Sun 2023-04-02 17:06:50 +08:00 committed by kahole
parent a677b26fcc
commit 2ef9bb5a1e
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -424,10 +424,14 @@
"default": false,
"description": "Enable automatic confirm for switch menu after enabling a switch (e.g. --force)"
},
"magit.win-git-path": {
"type": "string",
"magit.git-path": {
"type": [
"string",
"null",
"array"
],
"default": "",
"description": "Specify path to windows git installation (parent folder to the 'Git' folder). Necesarry if git is installed in a custom path on windows"
"description": "Like `git.path`. Path and filename of the git executable, e.g. C:\\Program Files\\Git\\bin\\git.exe' (Windows). This can also be an array of string values containing multiple paths to look up."
}
}
},

4
src/extension.ts
View File

@ -48,7 +48,7 @@ export const processLog: MagitProcessLogEntry[] = [];
export let gitApi: API;
export let logPath: string;
export let magitConfig: { displayBufferSameColumn?: boolean, forgeEnabled?: boolean, hiddenStatusSections: Set<string>, quickSwitchEnabled?: boolean, winGitPath?: string };
export let magitConfig: { displayBufferSameColumn?: boolean, forgeEnabled?: boolean, hiddenStatusSections: Set<string>, quickSwitchEnabled?: boolean, gitPath?: string };
function loadConfig() {
let workspaceConfig = workspace.getConfiguration('magit');
@ -58,7 +58,7 @@ function loadConfig() {
forgeEnabled: workspaceConfig.get('forge-enabled'),
hiddenStatusSections: readHiddenStatusSections(workspaceConfig.get('hide-status-sections')),
quickSwitchEnabled: workspaceConfig.get('quick-switch-enabled'),
winGitPath: workspaceConfig.get('win-git-path')
gitPath: workspaceConfig.get('git-path')
};
let configCodePath: string | undefined = workspaceConfig.get('code-path');

11
src/utils/commandRunner/command.ts
View File

@ -1,8 +1,10 @@
import * as cp from 'child_process';
import { CancellationToken, Disposable, Event, Uri } from 'vscode';
import * as path from 'path';
import { findGit } from './findGit';
import * as iconv from '@vscode/iconv-lite-umd';
import { dispose, IDisposable, toDisposable } from './disposable';
import { magitConfig } from '../../extension';
const canceledName = 'Canceled';
class CancellationError extends Error {
@ -171,7 +173,12 @@ async function exec(child: cp.ChildProcess, cancellationToken?: CancellationToke
async function _exec(args: string[], options: SpawnOptions = {}): Promise<IExecutionResult<string>> {
const git = await findGit([], () => true);
let pathHints = Array.isArray(magitConfig.gitPath) ? magitConfig.gitPath : magitConfig.gitPath ? [magitConfig.gitPath] : [];
if (pathHints.length !== 0) {
pathHints = pathHints.filter(p => path.isAbsolute(p));
}
const git = await findGit(pathHints, () => true);
const child = spawn(git.path, args, options);
// options.onSpawn?.(child);
@ -370,4 +377,4 @@ function getGitErrorCode(stderr: string): string | undefined {
}
return undefined;
}
}

2
src/utils/commandRunner/findGit.ts
View File

@ -2,7 +2,6 @@ import * as cp from 'child_process';
import { cpErrorHandler } from './command';
import path = require('path');
import * as which from 'which';
import { magitConfig } from '../../extension';
export interface IGit {
path: string;
@ -86,7 +85,6 @@ function findGitWin32InPath(onValidate: (path: string) => boolean): Promise<IGit
function findGitWin32(onValidate: (path: string) => boolean): Promise<IGit> {
return findSystemGitWin32(process.env['ProgramW6432'] as string, onValidate)
.then(undefined, () => findSystemGitWin32(magitConfig.winGitPath || '', onValidate))
.then(undefined, () => findSystemGitWin32(process.env['ProgramFiles(x86)'] as string, onValidate))
.then(undefined, () => findSystemGitWin32(process.env['ProgramFiles'] as string, onValidate))
.then(undefined, () => findSystemGitWin32(path.join(process.env['LocalAppData'] as string, 'Programs'), onValidate))