Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Git] Migrate to git autostash when pulling for better performance (#187850)

Browse Source 
* git: migrate to git autostash when pulling (better performance)

* should be implemented correctly!

* refactor other op

* Pull request feedback

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
This commit is contained in:
Vitaly
2025-02-04 18:35:47 +03:00
committed by GitHub
parent f614d9d870
commit a2a0272687
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/git/src/git.ts
View File

@@ -1127,8 +1127,9 @@ function parseGitBlame(data: string): BlameInformation[] {
}
export interface PullOptions {
unshallow?: boolean;
tags?: boolean;
readonly unshallow?: boolean;
readonly tags?: boolean;
readonly autoStash?: boolean;
readonly cancellationToken?: CancellationToken;
}
@@ -2087,6 +2088,11 @@ export class Repository {
args.push('--unshallow');
}
// --auto-stash option is only available `git pull --merge` starting with git 2.27.0
if (options.autoStash && this._git.compareGitVersionTo('2.27.0') !== -1) {
args.push('--autostash');
}
if (rebase) {
args.push('-r');
}

7
extensions/git/src/repository.ts
View File

@@ -1798,6 +1798,7 @@ export class Repository implements Disposable {
await this.run(Operation.Pull, async () => {
await this.maybeAutoStash(async () => {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const autoStash = config.get<boolean>('autoStash');
const fetchOnPull = config.get<boolean>('fetchOnPull');
const tags = config.get<boolean>('pullTags');
@@ -1807,7 +1808,7 @@ export class Repository implements Disposable {
}
if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
await this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags });
await this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags, autoStash });
}
});
});
@@ -1881,6 +1882,7 @@ export class Repository implements Disposable {
await this.run(Operation.Sync, async () => {
await this.maybeAutoStash(async () => {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const autoStash = config.get<boolean>('autoStash');
const fetchOnPull = config.get<boolean>('fetchOnPull');
const tags = config.get<boolean>('pullTags');
const followTags = config.get<boolean>('followTagsWhenSync');
@@ -1893,7 +1895,7 @@ export class Repository implements Disposable {
}
if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
await this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken });
await this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken, autoStash });
}
};
@@ -2530,6 +2532,7 @@ export class Repository implements Disposable {
private async maybeAutoStash<T>(runOperation: () => Promise<T>): Promise<T> {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const shouldAutoStash = config.get<boolean>('autoStash')
&& this.repository.git.compareGitVersionTo('2.27.0') < 0
&& (this.indexGroup.resourceStates.length > 0
|| this.workingTreeGroup.resourceStates.some(
r => r.type !== Status.UNTRACKED && r.type !== Status.IGNORED));