wlxsp
/
test1
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Renames some git commands for consistency 

Updates vsls git whitelist
main
Eric Amodio 5 years ago
parent
818242c6c6
commit
3f9da33f2d
3 changed files with 96 additions and 94 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +61
    -61
      src/git/git.ts
  2. +32
    -32
      src/git/gitService.ts
  3. +3
    -1
      src/vsls/host.ts

+ 61
- 61
src/git/git.ts View File

@ -358,7 +358,7 @@ export class Git {
return git<string>({ cwd: root, stdin: stdin }, ...params, '--', file); return git<string>({ cwd: root, stdin: stdin }, ...params, '--', file);
} }
static blame_contents(
static blame__contents(
repoPath: string | undefined, repoPath: string | undefined,
fileName: string, fileName: string,
contents: string, contents: string,
@ -395,16 +395,7 @@ export class Git {
); );
} }
static branch(repoPath: string, options: { all: boolean } = { all: false }) {
const params = ['for-each-ref', `--format=${GitBranchParser.defaultFormat}`, 'refs/heads'];
if (options.all) {
params.push('refs/remotes');
}
return git<string>({ cwd: repoPath }, ...params);
}
static branch_contains(repoPath: string, ref: string, options: { remote: boolean } = { remote: false }) {
static branch__contains(repoPath: string, ref: string, options: { remote: boolean } = { remote: false }) {
const params = ['branch', '--contains']; const params = ['branch', '--contains'];
if (options.remote) { if (options.remote) {
params.push('-r'); params.push('-r');
@ -413,19 +404,7 @@ export class Git {
return git<string>({ cwd: repoPath, configs: ['-c', 'color.branch=false'] }, ...params, ref); return git<string>({ cwd: repoPath, configs: ['-c', 'color.branch=false'] }, ...params, ref);
} }
static async cat_validate(repoPath: string, ref: string) {
if (Git.isUncommitted(ref)) return true;
try {
await git<string>({ cwd: repoPath, errors: GitErrorHandling.Throw }, 'cat-file', '-t', ref);
return true;
}
catch (ex) {
return false;
}
}
static async cat_file_validate(repoPath: string, fileName: string, ref: string) {
static async cat_file__resolve(repoPath: string, fileName: string, ref: string) {
if (Git.isUncommitted(ref)) return ref; if (Git.isUncommitted(ref)) return ref;
try { try {
@ -447,6 +426,18 @@ export class Git {
} }
} }
static async cat_file__validate(repoPath: string, ref: string) {
if (Git.isUncommitted(ref)) return true;
try {
await git<string>({ cwd: repoPath, errors: GitErrorHandling.Throw }, 'cat-file', '-t', ref);
return true;
}
catch (ex) {
return false;
}
}
static check_mailmap(repoPath: string, author: string) { static check_mailmap(repoPath: string, author: string) {
return git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore, local: true }, 'check-mailmap', author); return git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore, local: true }, 'check-mailmap', author);
} }
@ -462,7 +453,7 @@ export class Git {
return git<string>({ cwd: repoPath }, ...params); return git<string>({ cwd: repoPath }, ...params);
} }
static async config_get(key: string, repoPath?: string, options: { local?: boolean } = {}) {
static async config__get(key: string, repoPath?: string, options: { local?: boolean } = {}) {
const data = await git<string>( const data = await git<string>(
{ cwd: repoPath || emptyStr, errors: GitErrorHandling.Ignore, local: options.local }, { cwd: repoPath || emptyStr, errors: GitErrorHandling.Ignore, local: options.local },
'config', 'config',
@ -472,7 +463,7 @@ export class Git {
return data.length === 0 ? undefined : data.trim(); return data.length === 0 ? undefined : data.trim();
} }
static async config_getRegex(pattern: string, repoPath?: string, options: { local?: boolean } = {}) {
static async config__get_regex(pattern: string, repoPath?: string, options: { local?: boolean } = {}) {
const data = await git<string>( const data = await git<string>(
{ cwd: repoPath || emptyStr, errors: GitErrorHandling.Ignore, local: options.local }, { cwd: repoPath || emptyStr, errors: GitErrorHandling.Ignore, local: options.local },
'config', 'config',
@ -536,7 +527,7 @@ export class Git {
} }
} }
static diff_nameStatus(
static diff__name_status(
repoPath: string, repoPath: string,
ref1?: string, ref1?: string,
ref2?: string, ref2?: string,
@ -561,7 +552,7 @@ export class Git {
return git<string>({ cwd: repoPath, configs: ['-c', 'color.diff=false'] }, ...params); return git<string>({ cwd: repoPath, configs: ['-c', 'color.diff=false'] }, ...params);
} }
static diff_shortstat(repoPath: string, ref?: string) {
static diff__shortstat(repoPath: string, ref?: string) {
const params = ['diff', '--shortstat', '--no-ext-diff']; const params = ['diff', '--shortstat', '--no-ext-diff'];
if (ref) { if (ref) {
params.push(ref); params.push(ref);
@ -570,16 +561,7 @@ export class Git {
return git<string>({ cwd: repoPath, configs: ['-c', 'color.diff=false'] }, ...params); return git<string>({ cwd: repoPath, configs: ['-c', 'color.diff=false'] }, ...params);
} }
static difftool_dirDiff(repoPath: string, tool: string, ref1: string, ref2?: string) {
const params = ['difftool', '--dir-diff', `--tool=${tool}`, ref1];
if (ref2) {
params.push(ref2);
}
return git<string>({ cwd: repoPath }, ...params);
}
static difftool_fileDiff(
static difftool(
repoPath: string, repoPath: string,
fileName: string, fileName: string,
tool: string, tool: string,
@ -599,6 +581,15 @@ export class Git {
return git<string>({ cwd: repoPath }, ...params, '--', fileName); return git<string>({ cwd: repoPath }, ...params, '--', fileName);
} }
static difftool__dir_diff(repoPath: string, tool: string, ref1: string, ref2?: string) {
const params = ['difftool', '--dir-diff', `--tool=${tool}`, ref1];
if (ref2) {
params.push(ref2);
}
return git<string>({ cwd: repoPath }, ...params);
}
static fetch(repoPath: string, options: { all?: boolean; remote?: string } = {}) { static fetch(repoPath: string, options: { all?: boolean; remote?: string } = {}) {
const params = ['fetch']; const params = ['fetch'];
if (options.remote) { if (options.remote) {
@ -611,6 +602,15 @@ export class Git {
return git<string>({ cwd: repoPath }, ...params); return git<string>({ cwd: repoPath }, ...params);
} }
static for_each_ref__branch(repoPath: string, options: { all: boolean } = { all: false }) {
const params = ['for-each-ref', `--format=${GitBranchParser.defaultFormat}`, 'refs/heads'];
if (options.all) {
params.push('refs/remotes');
}
return git<string>({ cwd: repoPath }, ...params);
}
static log( static log(
repoPath: string, repoPath: string,
ref: string | undefined, ref: string | undefined,
@ -654,7 +654,7 @@ export class Git {
); );
} }
static log_file(
static log__file(
repoPath: string, repoPath: string,
fileName: string, fileName: string,
ref: string | undefined, ref: string | undefined,
@ -715,7 +715,7 @@ export class Git {
return git<string>({ cwd: root, configs: ['-c', 'log.showSignature=false'] }, ...params); return git<string>({ cwd: root, configs: ['-c', 'log.showSignature=false'] }, ...params);
} }
static async log_recent(
static async log__file_recent(
repoPath: string, repoPath: string,
fileName: string, fileName: string,
{ similarityThreshold }: { similarityThreshold?: number } = {} { similarityThreshold }: { similarityThreshold?: number } = {}
@ -732,7 +732,7 @@ export class Git {
return data.length === 0 ? undefined : data.trim(); return data.length === 0 ? undefined : data.trim();
} }
static log_search(repoPath: string, search: string[] = emptyArray, { maxCount }: { maxCount?: number } = {}) {
static log__search(repoPath: string, search: string[] = emptyArray, { maxCount }: { maxCount?: number } = {}) {
const params = ['log', '--name-status', `--format=${GitLogParser.defaultFormat}`]; const params = ['log', '--name-status', `--format=${GitLogParser.defaultFormat}`];
if (maxCount) { if (maxCount) {
params.push(`-n${maxCount}`); params.push(`-n${maxCount}`);
@ -741,13 +741,13 @@ export class Git {
return git<string>({ cwd: repoPath }, ...params, ...search); return git<string>({ cwd: repoPath }, ...params, ...search);
} }
static log_shortstat(repoPath: string, options: { ref?: string }) {
const params = ['log', '--shortstat', '--oneline'];
if (options.ref && !Git.isStagedUncommitted(options.ref)) {
params.push(options.ref);
}
return git<string>({ cwd: repoPath }, ...params, '--');
}
// static log__shortstat(repoPath: string, options: { ref?: string }) {
// const params = ['log', '--shortstat', '--oneline'];
// if (options.ref && !Git.isStagedUncommitted(options.ref)) {
// params.push(options.ref);
// }
// return git<string>({ cwd: repoPath }, ...params, '--');
// }
static async ls_files( static async ls_files(
repoPath: string, repoPath: string,
@ -788,7 +788,7 @@ export class Git {
return git<string>({ cwd: repoPath }, 'remote', '-v'); return git<string>({ cwd: repoPath }, 'remote', '-v');
} }
static remote_url(repoPath: string, remote: string): Promise<string> {
static remote__get_url(repoPath: string, remote: string): Promise<string> {
return git<string>({ cwd: repoPath }, 'remote', 'get-url', remote); return git<string>({ cwd: repoPath }, 'remote', 'get-url', remote);
} }
@ -796,12 +796,12 @@ export class Git {
return git<string>({ cwd: repoPath }, 'reset', '-q', '--', fileName); return git<string>({ cwd: repoPath }, 'reset', '-q', '--', fileName);
} }
static async revparse(repoPath: string, ref: string): Promise<string | undefined> {
static async rev_parse(repoPath: string, ref: string): Promise<string | undefined> {
const data = await git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore }, 'rev-parse', ref); const data = await git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore }, 'rev-parse', ref);
return data.length === 0 ? undefined : data.trim(); return data.length === 0 ? undefined : data.trim();
} }
static async revparse_currentBranch(repoPath: string): Promise<[string, string | undefined] | undefined> {
static async rev_parse__currentBranch(repoPath: string): Promise<[string, string | undefined] | undefined> {
const params = ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@', '@{u}']; const params = ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@', '@{u}'];
const opts: GitCommandOptions = { const opts: GitCommandOptions = {
@ -849,7 +849,7 @@ export class Git {
} }
} }
static async revparse_toplevel(cwd: string): Promise<string | undefined> {
static async rev_parse__show_toplevel(cwd: string): Promise<string | undefined> {
const data = await git<string>({ cwd: cwd, errors: GitErrorHandling.Ignore }, 'rev-parse', '--show-toplevel'); const data = await git<string>({ cwd: cwd, errors: GitErrorHandling.Ignore }, 'rev-parse', '--show-toplevel');
return data.length === 0 ? undefined : data.trim(); return data.length === 0 ? undefined : data.trim();
} }
@ -903,7 +903,7 @@ export class Git {
} }
} }
static show_diff(
static show__diff(
repoPath: string, repoPath: string,
fileName: string, fileName: string,
ref: string, ref: string,
@ -927,25 +927,25 @@ export class Git {
return git<string>({ cwd: repoPath }, ...params); return git<string>({ cwd: repoPath }, ...params);
} }
static show_status(repoPath: string, fileName: string, ref: string) {
static show__name_status(repoPath: string, fileName: string, ref: string) {
return git<string>({ cwd: repoPath }, 'show', '--name-status', '--format=', ref, '--', fileName); return git<string>({ cwd: repoPath }, 'show', '--name-status', '--format=', ref, '--', fileName);
} }
static showref_tag(repoPath: string) {
static show_ref__tags(repoPath: string) {
return git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore }, 'show-ref', '--tags'); return git<string>({ cwd: repoPath, errors: GitErrorHandling.Ignore }, 'show-ref', '--tags');
} }
static stash_apply(repoPath: string, stashName: string, deleteAfter: boolean) {
static stash__apply(repoPath: string, stashName: string, deleteAfter: boolean) {
if (!stashName) return undefined; if (!stashName) return undefined;
return git<string>({ cwd: repoPath }, 'stash', deleteAfter ? 'pop' : 'apply', stashName); return git<string>({ cwd: repoPath }, 'stash', deleteAfter ? 'pop' : 'apply', stashName);
} }
static stash_delete(repoPath: string, stashName: string) {
static stash__delete(repoPath: string, stashName: string) {
if (!stashName) return undefined; if (!stashName) return undefined;
return git<string>({ cwd: repoPath }, 'stash', 'drop', stashName); return git<string>({ cwd: repoPath }, 'stash', 'drop', stashName);
} }
static stash_list(
static stash__list(
repoPath: string, repoPath: string,
{ {
format = GitStashParser.defaultFormat, format = GitStashParser.defaultFormat,
@ -962,7 +962,7 @@ export class Git {
); );
} }
static stash_push(repoPath: string, pathspecs: string[], message?: string) {
static stash__push(repoPath: string, pathspecs: string[], message?: string) {
const params = ['stash', 'push', '-u']; const params = ['stash', 'push', '-u'];
if (message) { if (message) {
params.push('-m', message); params.push('-m', message);
@ -970,7 +970,7 @@ export class Git {
return git<string>({ cwd: repoPath }, ...params, '--', ...pathspecs); return git<string>({ cwd: repoPath }, ...params, '--', ...pathspecs);
} }
static stash_save(repoPath: string, message?: string) {
static stash__save(repoPath: string, message?: string) {
const params = ['stash', 'save', '-u']; const params = ['stash', 'save', '-u'];
if (message) { if (message) {
params.push(message); params.push(message);
@ -989,7 +989,7 @@ export class Git {
); );
} }
static status_file(repoPath: string, fileName: string, porcelainVersion: number = 1): Promise<string> {
static status__file(repoPath: string, fileName: string, porcelainVersion: number = 1): Promise<string> {
const [file, root] = Git.splitPath(fileName, repoPath); const [file, root] = Git.splitPath(fileName, repoPath);
const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain'; const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';

+ 32
- 32
src/git/gitService.ts View File

@ -762,7 +762,7 @@ export class GitService implements Disposable {
const [file, root] = Git.splitPath(uri.fsPath, uri.repoPath, false); const [file, root] = Git.splitPath(uri.fsPath, uri.repoPath, false);
try { try {
const data = await Git.blame_contents(root, file, contents, {
const data = await Git.blame__contents(root, file, contents, {
args: Container.config.advanced.blame.customArguments, args: Container.config.advanced.blame.customArguments,
correlationKey: `:${key}`, correlationKey: `:${key}`,
ignoreWhitespace: Container.config.blame.ignoreWhitespace ignoreWhitespace: Container.config.blame.ignoreWhitespace
@ -877,7 +877,7 @@ export class GitService implements Disposable {
const fileName = uri.fsPath; const fileName = uri.fsPath;
try { try {
const data = await Git.blame_contents(uri.repoPath, fileName, contents, {
const data = await Git.blame__contents(uri.repoPath, fileName, contents, {
args: Container.config.advanced.blame.customArguments, args: Container.config.advanced.blame.customArguments,
ignoreWhitespace: Container.config.blame.ignoreWhitespace, ignoreWhitespace: Container.config.blame.ignoreWhitespace,
startLine: lineToBlame, startLine: lineToBlame,
@ -968,7 +968,7 @@ export class GitService implements Disposable {
async getBranch(repoPath: string | undefined): Promise<GitBranch | undefined> { async getBranch(repoPath: string | undefined): Promise<GitBranch | undefined> {
if (repoPath === undefined) return undefined; if (repoPath === undefined) return undefined;
const data = await Git.revparse_currentBranch(repoPath);
const data = await Git.rev_parse__currentBranch(repoPath);
if (data === undefined) return undefined; if (data === undefined) return undefined;
const branch = data[0].split('\n'); const branch = data[0].split('\n');
@ -985,7 +985,7 @@ export class GitService implements Disposable {
if (branches !== undefined) return branches; if (branches !== undefined) return branches;
} }
const data = await Git.branch(repoPath, { all: true });
const data = await Git.for_each_ref__branch(repoPath, { all: true });
// If we don't get any data, assume the repo doesn't have any commits yet so check if we have a current branch // If we don't get any data, assume the repo doesn't have any commits yet so check if we have a current branch
if (data == null || data.length === 0) { if (data == null || data.length === 0) {
const current = await this.getBranch(repoPath); const current = await this.getBranch(repoPath);
@ -1006,7 +1006,7 @@ export class GitService implements Disposable {
@log() @log()
async getChangedFilesCount(repoPath: string, ref?: string): Promise<GitDiffShortStat | undefined> { async getChangedFilesCount(repoPath: string, ref?: string): Promise<GitDiffShortStat | undefined> {
const data = await Git.diff_shortstat(repoPath, ref);
const data = await Git.diff__shortstat(repoPath, ref);
return GitDiffParser.parseShortStat(data); return GitDiffParser.parseShortStat(data);
} }
@ -1042,7 +1042,7 @@ export class GitService implements Disposable {
@log() @log()
getConfig(key: string, repoPath?: string): Promise<string | undefined> { getConfig(key: string, repoPath?: string): Promise<string | undefined> {
return Git.config_get(key, repoPath);
return Git.config__get(key, repoPath);
} }
@log() @log()
@ -1061,7 +1061,7 @@ export class GitService implements Disposable {
// If we found the repo, but no user data was found just return // If we found the repo, but no user data was found just return
if (user === null) return undefined; if (user === null) return undefined;
const data = await Git.config_getRegex('user.(name|email)', repoPath, { local: true });
const data = await Git.config__get_regex('user.(name|email)', repoPath, { local: true });
if (!data) { if (!data) {
// If we found no user data, mark it so we won't bother trying again // If we found no user data, mark it so we won't bother trying again
this._userMapCache.set(repoPath, null); this._userMapCache.set(repoPath, null);
@ -1170,7 +1170,7 @@ export class GitService implements Disposable {
try { try {
let data; let data;
if (ref1 !== undefined && ref2 === undefined && !GitService.isStagedUncommitted(ref1)) { if (ref1 !== undefined && ref2 === undefined && !GitService.isStagedUncommitted(ref1)) {
data = await Git.show_diff(root, file, ref1, originalFileName, {
data = await Git.show__diff(root, file, ref1, originalFileName, {
similarityThreshold: Container.config.advanced.similarityThreshold similarityThreshold: Container.config.advanced.similarityThreshold
}); });
} }
@ -1240,7 +1240,7 @@ export class GitService implements Disposable {
options: { filter?: string; similarityThreshold?: number } = {} options: { filter?: string; similarityThreshold?: number } = {}
): Promise<GitFile[] | undefined> { ): Promise<GitFile[] | undefined> {
try { try {
const data = await Git.diff_nameStatus(repoPath, ref1, ref2, {
const data = await Git.diff__name_status(repoPath, ref1, ref2, {
similarityThreshold: Container.config.advanced.similarityThreshold, similarityThreshold: Container.config.advanced.similarityThreshold,
...options ...options
}); });
@ -1256,7 +1256,7 @@ export class GitService implements Disposable {
async getFileStatusForCommit(repoPath: string, fileName: string, ref: string): Promise<GitFile | undefined> { async getFileStatusForCommit(repoPath: string, fileName: string, ref: string): Promise<GitFile | undefined> {
if (ref === GitService.deletedOrMissingSha || GitService.isUncommitted(ref)) return undefined; if (ref === GitService.deletedOrMissingSha || GitService.isUncommitted(ref)) return undefined;
const data = await Git.show_status(repoPath, fileName, ref);
const data = await Git.show__name_status(repoPath, fileName, ref);
if (!data) return undefined; if (!data) return undefined;
const files = GitDiffParser.parseNameStatus(data, repoPath); const files = GitDiffParser.parseNameStatus(data, repoPath);
@ -1378,7 +1378,7 @@ export class GitService implements Disposable {
} }
try { try {
const data = await Git.log_search(repoPath, searchArgs, { maxCount: maxCount });
const data = await Git.log__search(repoPath, searchArgs, { maxCount: maxCount });
const log = GitLogParser.parse( const log = GitLogParser.parse(
data, data,
GitCommitType.Log, GitCommitType.Log,
@ -1549,7 +1549,7 @@ export class GitService implements Disposable {
const maxCount = options.maxCount == null ? Container.config.advanced.maxListItems || 0 : options.maxCount; const maxCount = options.maxCount == null ? Container.config.advanced.maxListItems || 0 : options.maxCount;
const data = await Git.log_file(root, file, ref, {
const data = await Git.log__file(root, file, ref, {
...options, ...options,
maxCount: maxCount, maxCount: maxCount,
startLine: range === undefined ? undefined : range.start.line + 1, startLine: range === undefined ? undefined : range.start.line + 1,
@ -1692,7 +1692,7 @@ export class GitService implements Disposable {
} }
const fileName = GitUri.getRelativePath(uri, repoPath); const fileName = GitUri.getRelativePath(uri, repoPath);
let data = await Git.log_file(repoPath, fileName, ref, {
let data = await Git.log__file(repoPath, fileName, ref, {
filters: filters, filters: filters,
format: GitLogParser.simpleFormat, format: GitLogParser.simpleFormat,
maxCount: skip + 1, maxCount: skip + 1,
@ -1704,7 +1704,7 @@ export class GitService implements Disposable {
const [nextRef, file, status] = GitLogParser.parseSimple(data, skip); const [nextRef, file, status] = GitLogParser.parseSimple(data, skip);
// If the file was deleted, check for a possible rename // If the file was deleted, check for a possible rename
if (status === 'D') { if (status === 'D') {
data = await Git.log_file(repoPath, '.', nextRef, {
data = await Git.log__file(repoPath, '.', nextRef, {
filters: ['R'], filters: ['R'],
format: GitLogParser.simpleFormat, format: GitLogParser.simpleFormat,
maxCount: 1 maxCount: 1
@ -1797,7 +1797,7 @@ export class GitService implements Disposable {
} }
const fileName = GitUri.getRelativePath(uri, repoPath); const fileName = GitUri.getRelativePath(uri, repoPath);
const data = await Git.log_file(repoPath, fileName, ref, {
const data = await Git.log__file(repoPath, fileName, ref, {
format: GitLogParser.simpleFormat, format: GitLogParser.simpleFormat,
maxCount: skip + 1, maxCount: skip + 1,
startLine: editorLine !== undefined ? editorLine + 1 : undefined startLine: editorLine !== undefined ? editorLine + 1 : undefined
@ -1909,7 +1909,7 @@ export class GitService implements Disposable {
private async getRepoPathCore(filePath: string, isDirectory: boolean): Promise<string | undefined> { private async getRepoPathCore(filePath: string, isDirectory: boolean): Promise<string | undefined> {
try { try {
return await Git.revparse_toplevel(isDirectory ? filePath : paths.dirname(filePath));
return await Git.rev_parse__show_toplevel(isDirectory ? filePath : paths.dirname(filePath));
} }
catch (ex) { catch (ex) {
Logger.error(ex); Logger.error(ex);
@ -2033,7 +2033,7 @@ export class GitService implements Disposable {
async getStashList(repoPath: string | undefined): Promise<GitStash | undefined> { async getStashList(repoPath: string | undefined): Promise<GitStash | undefined> {
if (repoPath === undefined) return undefined; if (repoPath === undefined) return undefined;
const data = await Git.stash_list(repoPath, {
const data = await Git.stash__list(repoPath, {
similarityThreshold: Container.config.advanced.similarityThreshold similarityThreshold: Container.config.advanced.similarityThreshold
}); });
const stash = GitStashParser.parse(data, repoPath); const stash = GitStashParser.parse(data, repoPath);
@ -2044,7 +2044,7 @@ export class GitService implements Disposable {
async getStatusForFile(repoPath: string, fileName: string): Promise<GitStatusFile | undefined> { async getStatusForFile(repoPath: string, fileName: string): Promise<GitStatusFile | undefined> {
const porcelainVersion = Git.validateVersion(2, 11) ? 2 : 1; const porcelainVersion = Git.validateVersion(2, 11) ? 2 : 1;
const data = await Git.status_file(repoPath, fileName, porcelainVersion);
const data = await Git.status__file(repoPath, fileName, porcelainVersion);
const status = GitStatusParser.parse(data, repoPath, porcelainVersion); const status = GitStatusParser.parse(data, repoPath, porcelainVersion);
if (status === undefined || !status.files.length) return undefined; if (status === undefined || !status.files.length) return undefined;
@ -2071,7 +2071,7 @@ export class GitService implements Disposable {
tags = this._tagsWithRefsCache.get(repoPath); tags = this._tagsWithRefsCache.get(repoPath);
if (tags !== undefined) return tags; if (tags !== undefined) return tags;
const data = await Git.showref_tag(repoPath);
const data = await Git.show_ref__tags(repoPath);
tags = GitTagParser.parseWithRef(data, repoPath) || []; tags = GitTagParser.parseWithRef(data, repoPath) || [];
const repo = await this.getRepository(repoPath); const repo = await this.getRepository(repoPath);
@ -2153,13 +2153,13 @@ export class GitService implements Disposable {
} }
// Get the most recent commit for this file name // Get the most recent commit for this file name
ref = await Git.log_recent(repoPath, fileName, {
ref = await Git.log__file_recent(repoPath, fileName, {
similarityThreshold: Container.config.advanced.similarityThreshold similarityThreshold: Container.config.advanced.similarityThreshold
}); });
if (ref === undefined) return undefined; if (ref === undefined) return undefined;
// Now check if that commit had any renames // Now check if that commit had any renames
data = await Git.log_file(repoPath, '.', ref, {
data = await Git.log__file(repoPath, '.', ref, {
filters: ['R'], filters: ['R'],
format: GitLogParser.simpleFormat, format: GitLogParser.simpleFormat,
maxCount: 1 maxCount: 1
@ -2278,8 +2278,8 @@ export class GitService implements Disposable {
@log() @log()
async getDiffTool(repoPath?: string) { async getDiffTool(repoPath?: string) {
return ( return (
(await Git.config_get('diff.guitool', repoPath, { local: true })) ||
Git.config_get('diff.tool', repoPath, { local: true })
(await Git.config__get('diff.guitool', repoPath, { local: true })) ||
Git.config__get('diff.tool', repoPath, { local: true })
); );
} }
@ -2299,7 +2299,7 @@ export class GitService implements Disposable {
} }
const { tool, ...opts } = options; const { tool, ...opts } = options;
return Git.difftool_fileDiff(repoPath, uri.fsPath, tool, opts);
return Git.difftool(repoPath, uri.fsPath, tool, opts);
} }
@log() @log()
@ -2313,15 +2313,15 @@ export class GitService implements Disposable {
Logger.log(cc, `Using tool=${tool}`); Logger.log(cc, `Using tool=${tool}`);
} }
return Git.difftool_dirDiff(repoPath, tool, ref1, ref2);
return Git.difftool__dir_diff(repoPath, tool, ref1, ref2);
} }
@log() @log()
async resolveReference(repoPath: string, ref: string, uri?: Uri) { async resolveReference(repoPath: string, ref: string, uri?: Uri) {
const resolved = Git.isSha(ref) || !Git.isShaLike(ref) || ref.endsWith('^3'); const resolved = Git.isSha(ref) || !Git.isShaLike(ref) || ref.endsWith('^3');
if (uri == null) return resolved ? ref : (await Git.revparse(repoPath, ref)) || ref;
if (uri == null) return resolved ? ref : (await Git.rev_parse(repoPath, ref)) || ref;
const ensuredRef = await Git.cat_file_validate(
const ensuredRef = await Git.cat_file__resolve(
repoPath, repoPath,
Strings.normalizePath(paths.relative(repoPath, uri.fsPath)), Strings.normalizePath(paths.relative(repoPath, uri.fsPath)),
ref ref
@ -2333,7 +2333,7 @@ export class GitService implements Disposable {
@log() @log()
validateReference(repoPath: string, ref: string) { validateReference(repoPath: string, ref: string) {
return Git.cat_validate(repoPath, ref);
return Git.cat_file__validate(repoPath, ref);
} }
stageFile(repoPath: string, fileName: string): Promise<string>; stageFile(repoPath: string, fileName: string): Promise<string>;
@ -2378,22 +2378,22 @@ export class GitService implements Disposable {
@log() @log()
stashApply(repoPath: string, stashName: string, deleteAfter: boolean = false) { stashApply(repoPath: string, stashName: string, deleteAfter: boolean = false) {
return Git.stash_apply(repoPath, stashName, deleteAfter);
return Git.stash__apply(repoPath, stashName, deleteAfter);
} }
@log() @log()
stashDelete(repoPath: string, stashName: string) { stashDelete(repoPath: string, stashName: string) {
return Git.stash_delete(repoPath, stashName);
return Git.stash__delete(repoPath, stashName);
} }
@log() @log()
stashSave(repoPath: string, message?: string, uris?: Uri[]) { stashSave(repoPath: string, message?: string, uris?: Uri[]) {
if (uris === undefined) return Git.stash_save(repoPath, message);
if (uris === undefined) return Git.stash__save(repoPath, message);
GitService.ensureGitVersion('2.13.2', 'Stashing individual files'); GitService.ensureGitVersion('2.13.2', 'Stashing individual files');
const pathspecs = uris.map(u => Git.splitPath(u.fsPath, repoPath)[0]); const pathspecs = uris.map(u => Git.splitPath(u.fsPath, repoPath)[0]);
return Git.stash_push(repoPath, pathspecs, message);
return Git.stash__push(repoPath, pathspecs, message);
} }
static compareGitVersion(version: string) { static compareGitVersion(version: string) {

+ 3
- 1
src/vsls/host.ts View File

@ -20,11 +20,13 @@ import { vslsUriRootRegex } from './vsls';
const defaultWhitelistFn = () => true; const defaultWhitelistFn = () => true;
const gitWhitelist = new Map<string, (args: any[]) => boolean>([ const gitWhitelist = new Map<string, (args: any[]) => boolean>([
['blame', defaultWhitelistFn], ['blame', defaultWhitelistFn],
['branch', args => args[1] === '-vv' || args[1] === '--contains'],
['branch', args => args[1] === '--contains'],
['cat-file', defaultWhitelistFn], ['cat-file', defaultWhitelistFn],
['check-mailmap', defaultWhitelistFn],
['config', args => args[1] === '--get' || args[1] === '--get-regex'], ['config', args => args[1] === '--get' || args[1] === '--get-regex'],
['diff', defaultWhitelistFn], ['diff', defaultWhitelistFn],
['difftool', defaultWhitelistFn], ['difftool', defaultWhitelistFn],
['for-each-ref', defaultWhitelistFn],
['log', defaultWhitelistFn], ['log', defaultWhitelistFn],
['ls-files', defaultWhitelistFn], ['ls-files', defaultWhitelistFn],
['ls-tree', defaultWhitelistFn], ['ls-tree', defaultWhitelistFn],

Write Preview
Loading…
Cancel
Save