Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

set git.mergeChanges context key for all repos, not just one #162339

Merged
merged 1 commit into from Sep 29, 2022
Merged

set git.mergeChanges context key for all repos, not just one #162339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 16 additions & 1 deletion extensions/git/src/model.ts
View file
Open in desktop
Expand Up @@ -450,7 +450,21 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand
.forEach(p => this.eventuallyScanPossibleGitRepository(p));
};

const statusListener = repository.onDidRunGitStatus(checkForSubmodules);
const updateMergeChanges = () => {
// set mergeChanges context
const mergeChanges: Uri[] = [];
for (const { repository } of this.openRepositories.values()) {
for (const state of repository.mergeGroup.resourceStates) {
mergeChanges.push(state.resourceUri);
}
}
commands.executeCommand('setContext', 'git.mergeChanges', mergeChanges);
};

const statusListener = repository.onDidRunGitStatus(() => {
checkForSubmodules();
updateMergeChanges();
});
checkForSubmodules();

const dispose = () => {
Expand All @@ -466,6 +480,7 @@ export class Model implements IRemoteSourcePublisherRegistry, IPostCommitCommand

const openRepository = { repository, dispose };
this.openRepositories.push(openRepository);
updateMergeChanges();
this._onDidOpenRepository.fire(repository);
}

Expand Down
3 changes: 0 additions & 3 deletions extensions/git/src/repository.ts
View file
Open in desktop
Expand Up @@ -2103,9 +2103,6 @@ export class Repository implements Disposable {
// set count badge
this.setCountBadge();

// set mergeChanges context
commands.executeCommand('setContext', 'git.mergeChanges', merge.map(item => item.resourceUri));

this._onDidChangeStatus.fire();

this._sourceControl.commitTemplate = await this.getInputTemplate();
Expand Down