Przeglądaj źródła

Removes unused flag

main
Eric Amodio 1 rok temu
rodzic
commit
d2fc1c1e7d
4 zmienionych plików z 7 dodań i 13 usunięć
  1. +6
    -9
      src/env/node/git/localGitProvider.ts
  2. +0
    -1
      src/git/gitProvider.ts
  3. +1
    -2
      src/git/gitProviderService.ts
  4. +0
    -1
      src/plus/github/githubGitProvider.ts

+ 6
- 9
src/env/node/git/localGitProvider.ts Wyświetl plik

@ -3856,7 +3856,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
uri: Uri,
ref: string | undefined,
skip: number = 0,
firstParent: boolean = false,
): Promise<PreviousComparisonUrisResult | undefined> {
if (ref === deletedOrMissing) return undefined;
@ -3886,13 +3885,13 @@ export class LocalGitProvider implements GitProvider, Disposable {
return {
// Diff staged with HEAD (or prior if more skips)
current: GitUri.fromFile(relativePath, repoPath, uncommittedStaged),
previous: await this.getPreviousUri(repoPath, uri, ref, skip - 1, undefined, firstParent),
previous: await this.getPreviousUri(repoPath, uri, ref, skip - 1),
};
} else if (status.workingTreeStatus != null) {
if (skip === 0) {
return {
current: GitUri.fromFile(relativePath, repoPath, undefined),
previous: await this.getPreviousUri(repoPath, uri, undefined, skip, undefined, firstParent),
previous: await this.getPreviousUri(repoPath, uri, undefined, skip),
};
}
}
@ -3905,12 +3904,12 @@ export class LocalGitProvider implements GitProvider, Disposable {
const current =
skip === 0
? GitUri.fromFile(relativePath, repoPath, ref)
: (await this.getPreviousUri(repoPath, uri, undefined, skip - 1, undefined, firstParent))!;
: (await this.getPreviousUri(repoPath, uri, undefined, skip - 1))!;
if (current == null || current.sha === deletedOrMissing) return undefined;
return {
current: current,
previous: await this.getPreviousUri(repoPath, uri, undefined, skip, undefined, firstParent),
previous: await this.getPreviousUri(repoPath, uri, undefined, skip),
};
}
@ -3918,12 +3917,12 @@ export class LocalGitProvider implements GitProvider, Disposable {
const current =
skip === 0
? GitUri.fromFile(relativePath, repoPath, ref)
: (await this.getPreviousUri(repoPath, uri, ref, skip - 1, undefined, firstParent))!;
: (await this.getPreviousUri(repoPath, uri, ref, skip - 1))!;
if (current == null || current.sha === deletedOrMissing) return undefined;
return {
current: current,
previous: await this.getPreviousUri(repoPath, uri, ref, skip, undefined, firstParent),
previous: await this.getPreviousUri(repoPath, uri, ref, skip),
};
}
@ -4053,7 +4052,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
ref?: string,
skip: number = 0,
editorLine?: number,
firstParent: boolean = false,
): Promise<GitUri | undefined> {
if (ref === deletedOrMissing) return undefined;
@ -4071,7 +4069,6 @@ export class LocalGitProvider implements GitProvider, Disposable {
data = await this.git.log__file(repoPath, relativePath, ref, {
argsOrFormat: GitLogParser.simpleFormat,
fileMode: 'simple',
firstParent: firstParent,
limit: skip + 2,
ordering: configuration.get('advanced.commitOrdering'),
startLine: editorLine != null ? editorLine + 1 : undefined,

+ 0
- 1
src/git/gitProvider.ts Wyświetl plik

@ -372,7 +372,6 @@ export interface GitProvider extends Disposable {
uri: Uri,
ref: string | undefined,
skip?: number,
firstParent?: boolean,
): Promise<PreviousComparisonUrisResult | undefined>;
getPreviousComparisonUrisForLine(
repoPath: string,

+ 1
- 2
src/git/gitProviderService.ts Wyświetl plik

@ -1911,12 +1911,11 @@ export class GitProviderService implements Disposable {
uri: Uri,
ref: string | undefined,
skip: number = 0,
firstParent: boolean = false,
): Promise<PreviousComparisonUrisResult | undefined> {
if (ref === deletedOrMissing) return Promise.resolve(undefined);
const { provider, path } = this.getProvider(repoPath);
return provider.getPreviousComparisonUris(path, uri, ref, skip, firstParent);
return provider.getPreviousComparisonUris(path, uri, ref, skip);
}
@log()

+ 0
- 1
src/plus/github/githubGitProvider.ts Wyświetl plik

@ -2413,7 +2413,6 @@ export class GitHubGitProvider implements GitProvider, Disposable {
uri: Uri,
ref: string | undefined,
skip: number = 0,
_firstParent: boolean = false,
): Promise<PreviousComparisonUrisResult | undefined> {
if (ref === deletedOrMissing) return undefined;

Ładowanie…
Anuluj
Zapisz