import TelemetryReporter from '@vscode/extension-telemetry';
import * as fs from 'fs';
import * as path from 'path';
import picomatch from 'picomatch';
import { CancellationError, CancellationToken, CancellationTokenSource, Command, commands, Disposable, Event, EventEmitter, FileDecoration, FileType, l10n, LogLevel, LogOutputChannel, Memento, ProgressLocation, ProgressOptions, QuickDiffProvider, RelativePattern, scm, SourceControl, SourceControlInputBox, SourceControlInputBoxValidation, SourceControlInputBoxValidationType, SourceControlResourceDecorations, SourceControlResourceGroup, SourceControlResourceState, TabInputNotebookDiff, TabInputTextDiff, TabInputTextMultiDiff, ThemeColor, ThemeIcon, Uri, window, workspace, WorkspaceEdit } from 'vscode';
import { ActionButton } from './actionButton';
import { ApiRepository } from './api/api1';
import { Branch, BranchQuery, Change, CommitOptions, FetchOptions, ForcePushMode, GitErrorCodes, LogOptions, Ref, RefType, Remote, Status } from './api/git';
import { AutoFetcher } from './autofetch';
import { GitBranchProtectionProvider, IBranchProtectionProviderRegistry } from './branchProtection';
import { debounce, memoize, sequentialize, throttle } from './decorators';
import { Repository as BaseRepository, BlameInformation, Commit, GitError, LogFileOptions, LsTreeElement, PullOptions, RefQuery, Stash, Submodule, Worktree } from './git';
import { GitHistoryProvider } from './historyProvider';
import { Operation, OperationKind, OperationManager, OperationResult } from './operation';
import { CommitCommandsCenter, IPostCommitCommandsProviderRegistry } from './postCommitCommands';
import { IPushErrorHandlerRegistry } from './pushError';
import { IRemoteSourcePublisherRegistry } from './remotePublisher';
import { StatusBarCommands } from './statusbar';
import { toGitUri } from './uri';
import { anyEvent, combinedDisposable, debounceEvent, dispose, EmptyDisposable, eventToPromise, filterEvent, find, getCommitShortHash, IDisposable, isDescendant, isLinuxSnap, isRemote, isWindows, Limiter, onceEvent, pathEquals, relativePath } from './util';
import { IFileWatcher, watch } from './watch';
import { ISourceControlHistoryItemDetailsProviderRegistry } from './historyItemDetailsProvider';
const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
const iconsRootPath = path.join(path.dirname(__dirname), 'resources', 'icons');
function getIconUri(iconName: string, theme: string): Uri {
return Uri.file(path.join(iconsRootPath, theme, `${iconName}.svg`));
}
export const enum RepositoryState {
Idle,
Disposed
}
export const enum ResourceGroupType {
Merge,
Index,
WorkingTree,
Untracked
}
export class Resource implements SourceControlResourceState {
static getStatusLetter(type: Status): string {
switch (type) {
case Status.INDEX_MODIFIED:
case Status.MODIFIED:
return 'M';
case Status.INDEX_ADDED:
case Status.INTENT_TO_ADD:
return 'A';
case Status.INDEX_DELETED:
case Status.DELETED:
return 'D';
case Status.INDEX_RENAMED:
case Status.INTENT_TO_RENAME:
return 'R';
case Status.TYPE_CHANGED:
return 'T';
case Status.UNTRACKED:
return 'U';
case Status.IGNORED:
return 'I';
case Status.INDEX_COPIED:
return 'C';
case Status.BOTH_DELETED:
case Status.ADDED_BY_US:
case Status.DELETED_BY_THEM:
case Status.ADDED_BY_THEM:
case Status.DELETED_BY_US:
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return '!';
default:
throw new Error('Unknown git status: ' + type);
}
}
static getStatusText(type: Status) {
switch (type) {
case Status.INDEX_MODIFIED: return l10n.t('Index Modified');
case Status.MODIFIED: return l10n.t('Modified');
case Status.INDEX_ADDED: return l10n.t('Index Added');
case Status.INDEX_DELETED: return l10n.t('Index Deleted');
case Status.DELETED: return l10n.t('Deleted');
case Status.INDEX_RENAMED: return l10n.t('Index Renamed');
case Status.INDEX_COPIED: return l10n.t('Index Copied');
case Status.UNTRACKED: return l10n.t('Untracked');
case Status.IGNORED: return l10n.t('Ignored');
case Status.INTENT_TO_ADD: return l10n.t('Intent to Add');
case Status.INTENT_TO_RENAME: return l10n.t('Intent to Rename');
case Status.TYPE_CHANGED: return l10n.t('Type Changed');
case Status.BOTH_DELETED: return l10n.t('Conflict: Both Deleted');
case Status.ADDED_BY_US: return l10n.t('Conflict: Added By Us');
case Status.DELETED_BY_THEM: return l10n.t('Conflict: Deleted By Them');
case Status.ADDED_BY_THEM: return l10n.t('Conflict: Added By Them');
case Status.DELETED_BY_US: return l10n.t('Conflict: Deleted By Us');
case Status.BOTH_ADDED: return l10n.t('Conflict: Both Added');
case Status.BOTH_MODIFIED: return l10n.t('Conflict: Both Modified');
default: return '';
}
}
static getStatusColor(type: Status): ThemeColor {
switch (type) {
case Status.INDEX_MODIFIED:
return new ThemeColor('gitDecoration.stageModifiedResourceForeground');
case Status.MODIFIED:
case Status.TYPE_CHANGED:
return new ThemeColor('gitDecoration.modifiedResourceForeground');
case Status.INDEX_DELETED:
return new ThemeColor('gitDecoration.stageDeletedResourceForeground');
case Status.DELETED:
return new ThemeColor('gitDecoration.deletedResourceForeground');
case Status.INDEX_ADDED:
case Status.INTENT_TO_ADD:
return new ThemeColor('gitDecoration.addedResourceForeground');
case Status.INDEX_COPIED:
case Status.INDEX_RENAMED:
case Status.INTENT_TO_RENAME:
return new ThemeColor('gitDecoration.renamedResourceForeground');
case Status.UNTRACKED:
return new ThemeColor('gitDecoration.untrackedResourceForeground');
case Status.IGNORED:
return new ThemeColor('gitDecoration.ignoredResourceForeground');
case Status.BOTH_DELETED:
case Status.ADDED_BY_US:
case Status.DELETED_BY_THEM:
case Status.ADDED_BY_THEM:
case Status.DELETED_BY_US:
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return new ThemeColor('gitDecoration.conflictingResourceForeground');
default:
throw new Error('Unknown git status: ' + type);
}
}
@memoize
get resourceUri(): Uri {
if (this.renameResourceUri && (this._type === Status.MODIFIED || this._type === Status.DELETED || this._type === Status.INDEX_RENAMED || this._type === Status.INDEX_COPIED || this._type === Status.INTENT_TO_RENAME)) {
return this.renameResourceUri;
}
return this._resourceUri;
}
get leftUri(): Uri | undefined {
return this.resources.left;
}
get rightUri(): Uri | undefined {
return this.resources.right;
}
get multiDiffEditorOriginalUri(): Uri | undefined {
return this.resources.original;
}
get multiFileDiffEditorModifiedUri(): Uri | undefined {
return this.resources.modified;
}
@memoize
get command(): Command {
return this._commandResolver.resolveDefaultCommand(this);
}
@memoize
private get resources(): { left: Uri | undefined; right: Uri | undefined; original: Uri | undefined; modified: Uri | undefined } {
return this._commandResolver.getResources(this);
}
get resourceGroupType(): ResourceGroupType { return this._resourceGroupType; }
get type(): Status { return this._type; }
get original(): Uri { return this._resourceUri; }
get renameResourceUri(): Uri | undefined { return this._renameResourceUri; }
get contextValue(): string | undefined { return this._repositoryKind; }
private static Icons: any = {
light: {
Modified: getIconUri('status-modified', 'light'),
Added: getIconUri('status-added', 'light'),
Deleted: getIconUri('status-deleted', 'light'),
Renamed: getIconUri('status-renamed', 'light'),
Copied: getIconUri('status-copied', 'light'),
Untracked: getIconUri('status-untracked', 'light'),
Ignored: getIconUri('status-ignored', 'light'),
Conflict: getIconUri('status-conflict', 'light'),
TypeChanged: getIconUri('status-type-changed', 'light')
},
dark: {
Modified: getIconUri('status-modified', 'dark'),
Added: getIconUri('status-added', 'dark'),
Deleted: getIconUri('status-deleted', 'dark'),
Renamed: getIconUri('status-renamed', 'dark'),
Copied: getIconUri('status-copied', 'dark'),
Untracked: getIconUri('status-untracked', 'dark'),
Ignored: getIconUri('status-ignored', 'dark'),
Conflict: getIconUri('status-conflict', 'dark'),
TypeChanged: getIconUri('status-type-changed', 'dark')
}
};
private getIconPath(theme: string): Uri {
switch (this.type) {
case Status.INDEX_MODIFIED: return Resource.Icons[theme].Modified;
case Status.MODIFIED: return Resource.Icons[theme].Modified;
case Status.INDEX_ADDED: return Resource.Icons[theme].Added;
case Status.INDEX_DELETED: return Resource.Icons[theme].Deleted;
case Status.DELETED: return Resource.Icons[theme].Deleted;
case Status.INDEX_RENAMED: return Resource.Icons[theme].Renamed;
case Status.INDEX_COPIED: return Resource.Icons[theme].Copied;
case Status.UNTRACKED: return Resource.Icons[theme].Untracked;
case Status.IGNORED: return Resource.Icons[theme].Ignored;
case Status.INTENT_TO_ADD: return Resource.Icons[theme].Added;
case Status.INTENT_TO_RENAME: return Resource.Icons[theme].Renamed;
case Status.TYPE_CHANGED: return Resource.Icons[theme].TypeChanged;
case Status.BOTH_DELETED: return Resource.Icons[theme].Conflict;
case Status.ADDED_BY_US: return Resource.Icons[theme].Conflict;
case Status.DELETED_BY_THEM: return Resource.Icons[theme].Conflict;
case Status.ADDED_BY_THEM: return Resource.Icons[theme].Conflict;
case Status.DELETED_BY_US: return Resource.Icons[theme].Conflict;
case Status.BOTH_ADDED: return Resource.Icons[theme].Conflict;
case Status.BOTH_MODIFIED: return Resource.Icons[theme].Conflict;
default: throw new Error('Unknown git status: ' + this.type);
}
}
private get tooltip(): string {
return Resource.getStatusText(this.type);
}
private get strikeThrough(): boolean {
switch (this.type) {
case Status.DELETED:
case Status.BOTH_DELETED:
case Status.DELETED_BY_THEM:
case Status.DELETED_BY_US:
case Status.INDEX_DELETED:
return true;
default:
return false;
}
}
@memoize
private get faded(): boolean {
return false;
}
get decorations(): SourceControlResourceDecorations {
const light = this._useIcons ? { iconPath: this.getIconPath('light') } : undefined;
const dark = this._useIcons ? { iconPath: this.getIconPath('dark') } : undefined;
const tooltip = this.tooltip;
const strikeThrough = this.strikeThrough;
const faded = this.faded;
return { strikeThrough, faded, tooltip, light, dark };
}
get letter(): string {
return Resource.getStatusLetter(this.type);
}
get color(): ThemeColor {
return Resource.getStatusColor(this.type);
}
get priority(): number {
switch (this.type) {
case Status.INDEX_MODIFIED:
case Status.MODIFIED:
case Status.INDEX_COPIED:
case Status.TYPE_CHANGED:
return 2;
case Status.IGNORED:
return 3;
case Status.BOTH_DELETED:
case Status.ADDED_BY_US:
case Status.DELETED_BY_THEM:
case Status.ADDED_BY_THEM:
case Status.DELETED_BY_US:
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return 4;
default:
return 1;
}
}
get resourceDecoration(): FileDecoration {
const res = new FileDecoration(this.letter, this.tooltip, this.color);
res.propagate = this.type !== Status.DELETED && this.type !== Status.INDEX_DELETED;
return res;
}
constructor(
private _commandResolver: ResourceCommandResolver,
private _resourceGroupType: ResourceGroupType,
private _resourceUri: Uri,
private _type: Status,
private _useIcons: boolean,
private _renameResourceUri?: Uri,
private _repositoryKind?: 'repository' | 'submodule' | 'worktree',
) { }
async open(): Promise<void> {
const command = this.command;
await commands.executeCommand<void>(command.command, ...(command.arguments || []));
}
async openFile(): Promise<void> {
const command = this._commandResolver.resolveFileCommand(this);
await commands.executeCommand<void>(command.command, ...(command.arguments || []));
}
async openChange(): Promise<void> {
const command = this._commandResolver.resolveChangeCommand(this);
await commands.executeCommand<void>(command.command, ...(command.arguments || []));
}
async compareWithWorkspace(): Promise<void> {
const command = this._commandResolver.resolveCompareWithWorkspaceCommand(this);
await commands.executeCommand<void>(command.command, ...(command.arguments || []));
}
clone(resourceGroupType?: ResourceGroupType) {
return new Resource(this._commandResolver, resourceGroupType ?? this._resourceGroupType, this._resourceUri, this._type, this._useIcons, this._renameResourceUri, this._repositoryKind);
}
}
export interface GitResourceGroup extends SourceControlResourceGroup {
resourceStates: Resource[];
}
interface GitResourceGroups {
indexGroup?: Resource[];
mergeGroup?: Resource[];
untrackedGroup?: Resource[];
workingTreeGroup?: Resource[];
}
class ProgressManager {
private enabled = false;
private disposable: IDisposable = EmptyDisposable;
constructor(private repository: Repository) {
const onDidChange = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git', Uri.file(this.repository.root)));
onDidChange(_ => this.updateEnablement());
this.updateEnablement();
this.repository.onDidChangeOperations(() => {
this.repository.sourceControl.inputBox.enabled = !this.repository.operations.isRunning(OperationKind.Commit);
});
}
private updateEnablement(): void {
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
if (config.get<boolean>('showProgress')) {
this.enable();
} else {
this.disable();
}
}
private enable(): void {
if (this.enabled) {
return;
}
const start = onceEvent(filterEvent(this.repository.onDidChangeOperations, () => this.repository.operations.shouldShowProgress()));
const end = onceEvent(filterEvent(debounceEvent(this.repository.onDidChangeOperations, 300), () => !this.repository.operations.shouldShowProgress()));
const setup = () => {
this.disposable = start(() => {
const promise = eventToPromise(end).then(() => setup());
window.withProgress({ location: ProgressLocation.SourceControl }, () => promise);
});
};
setup();
this.enabled = true;
}
private disable(): void {
if (!this.enabled) {
return;
}
this.disposable.dispose();
this.disposable = EmptyDisposable;
this.enabled = false;
}
dispose(): void {
this.disable();
}
}
class FileEventLogger {
private eventDisposable: IDisposable = EmptyDisposable;
private logLevelDisposable: IDisposable = EmptyDisposable;
constructor(
private onWorkspaceWorkingTreeFileChange: Event<Uri>,
private onDotGitFileChange: Event<Uri>,
private logger: LogOutputChannel
) {
this.logLevelDisposable = logger.onDidChangeLogLevel(this.onDidChangeLogLevel, this);
this.onDidChangeLogLevel(logger.logLevel);
}
private onDidChangeLogLevel(logLevel: LogLevel): void {
this.eventDisposable.dispose();
if (logLevel > LogLevel.Debug) {
return;
}
this.eventDisposable = combinedDisposable([
this.onWorkspaceWorkingTreeFileChange(uri => this.logger.debug(`[FileEventLogger][onWorkspaceWorkingTreeFileChange] ${uri.fsPath}`)),
this.onDotGitFileChange(uri => this.logger.debug(`[FileEventLogger][onDotGitFileChange] ${uri.fsPath}`))
]);
}
dispose(): void {
this.eventDisposable.dispose();
this.logLevelDisposable.dispose();
}
}
class DotGitWatcher implements IFileWatcher {
readonly event: Event<Uri>;
private emitter = new EventEmitter<Uri>();
private transientDisposables: IDisposable[] = [];
private disposables: IDisposable[] = [];
constructor(
private repository: Repository,
private logger: LogOutputChannel
) {
const rootWatcher = watch(repository.dotGit.path);
this.disposables.push(rootWatcher);
const filteredRootWatcher = filterEvent(rootWatcher.event, uri => uri.scheme === 'file' && !/\/\.git(\/index\.lock)?$|\/\.watchman-cookie-/.test(uri.path));
this.event = anyEvent(filteredRootWatcher, this.emitter.event);
repository.onDidRunGitStatus(this.updateTransientWatchers, this, this.disposables);
this.updateTransientWatchers();
}
private updateTransientWatchers() {
this.transientDisposables = dispose(this.transientDisposables);
if (!this.repository.HEAD || !this.repository.HEAD.upstream) {
return;
}
this.transientDisposables = dispose(this.transientDisposables);
const { name, remote } = this.repository.HEAD.upstream;
const upstreamPath = path.join(this.repository.dotGit.commonPath ?? this.repository.dotGit.path, 'refs', 'remotes', remote, name);
try {
const upstreamWatcher = watch(upstreamPath);
this.transientDisposables.push(upstreamWatcher);
upstreamWatcher.event(this.emitter.fire, this.emitter, this.transientDisposables);
} catch (err) {
this.logger.warn(`[DotGitWatcher][updateTransientWatchers] Failed to watch ref '${upstreamPath}', is most likely packed.`);
}
}
dispose() {
this.emitter.dispose();
this.transientDisposables = dispose(this.transientDisposables);
this.disposables = dispose(this.disposables);
}
}
class ResourceCommandResolver {
constructor(private repository: Repository) { }
resolveDefaultCommand(resource: Resource): Command {
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
const openDiffOnClick = config.get<boolean>('openDiffOnClick', true);
return openDiffOnClick ? this.resolveChangeCommand(resource) : this.resolveFileCommand(resource);
}
resolveFileCommand(resource: Resource): Command {
return {
command: 'vscode.open',
title: l10n.t('Open'),
arguments: [resource.resourceUri]
};
}
resolveChangeCommand(resource: Resource, compareWithWorkspace?: boolean, leftUri?: Uri): Command {
if (!compareWithWorkspace) {
leftUri = resource.leftUri;
}
const title = this.getTitle(resource);
if (!leftUri) {
const bothModified = resource.type === Status.BOTH_MODIFIED;
if (resource.rightUri && workspace.getConfiguration('git').get<boolean>('mergeEditor', false) && (bothModified || resource.type === Status.BOTH_ADDED)) {
const command = this.repository.isWorktreeMigrating ? 'git.openWorktreeMergeEditor' : 'git.openMergeEditor';
return {
command,
title: l10n.t('Open Merge'),
arguments: [resource.rightUri]
};
} else {
return {
command: 'vscode.open',
title: l10n.t('Open'),
arguments: [resource.rightUri, { override: bothModified ? false : undefined }, title]
};
}
} else {
return {
command: 'vscode.diff',
title: l10n.t('Open'),
arguments: [leftUri, resource.rightUri, title]
};
}
}
resolveCompareWithWorkspaceCommand(resource: Resource): Command {
if (!this.repository.dotGit.commonPath) {
return this.resolveChangeCommand(resource);
}
const parentRepoRoot = path.dirname(this.repository.dotGit.commonPath);
const relPath = path.relative(this.repository.root, resource.resourceUri.fsPath);
const candidateFsPath = path.join(parentRepoRoot, relPath);
const leftUri = fs.existsSync(candidateFsPath) ? Uri.file(candidateFsPath) : undefined;
return this.resolveChangeCommand(resource, true, leftUri);
}
getResources(resource: Resource): { left: Uri | undefined; right: Uri | undefined; original: Uri | undefined; modified: Uri | undefined } {
for (const submodule of this.repository.submodules) {
if (path.join(this.repository.root, submodule.path) === resource.resourceUri.fsPath) {
const original = undefined;
const modified = toGitUri(resource.resourceUri, resource.resourceGroupType === ResourceGroupType.Index ? 'index' : 'wt', { submoduleOf: this.repository.root });
return { left: original, right: modified, original, modified };
}
}
const left = this.getLeftResource(resource);
const right = this.getRightResource(resource);
return {
left: left.original ?? left.modified,
right: right.original ?? right.modified,
original: left.original ?? right.original,
modified: left.modified ?? right.modified,
};
}
private getLeftResource(resource: Resource): ModifiedOrOriginal {
switch (resource.type) {
case Status.INDEX_MODIFIED:
case Status.INDEX_RENAMED:
case Status.INTENT_TO_RENAME:
case Status.TYPE_CHANGED:
return { original: toGitUri(resource.original, 'HEAD') };
case Status.MODIFIED:
return { original: toGitUri(resource.resourceUri, '~') };
case Status.DELETED_BY_US:
case Status.DELETED_BY_THEM:
return { original: toGitUri(resource.resourceUri, '~1') };
}
return {};
}
private getRightResource(resource: Resource): ModifiedOrOriginal {
switch (resource.type) {
case Status.INDEX_MODIFIED:
case Status.INDEX_ADDED:
case Status.INDEX_COPIED:
case Status.INDEX_RENAMED:
return { modified: toGitUri(resource.resourceUri, '') };
case Status.INDEX_DELETED:
case Status.DELETED:
return { original: toGitUri(resource.resourceUri, 'HEAD') };
case Status.DELETED_BY_US:
return { original: toGitUri(resource.resourceUri, '~3') };
case Status.DELETED_BY_THEM:
return { original: toGitUri(resource.resourceUri, '~2') };
case Status.MODIFIED:
case Status.UNTRACKED:
case Status.IGNORED:
case Status.INTENT_TO_ADD:
case Status.INTENT_TO_RENAME:
case Status.TYPE_CHANGED: {
const uriString = resource.resourceUri.toString();
const [indexStatus] = this.repository.indexGroup.resourceStates.filter(r => r.resourceUri.toString() === uriString);
if (indexStatus && indexStatus.renameResourceUri) {
return { modified: indexStatus.renameResourceUri };
}
return { modified: resource.resourceUri };
}
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return { modified: resource.resourceUri };
}
return {};
}
private getTitle(resource: Resource): string {
const basename = path.basename(resource.resourceUri.fsPath);
switch (resource.type) {
case Status.INDEX_MODIFIED:
case Status.INDEX_RENAMED:
case Status.INDEX_ADDED:
return l10n.t('{0} (Index)', basename);
case Status.MODIFIED:
case Status.BOTH_ADDED:
case Status.BOTH_MODIFIED:
return l10n.t('{0} (Working Tree)', basename);
case Status.INDEX_DELETED:
case Status.DELETED:
return l10n.t('{0} (Deleted)', basename);
case Status.DELETED_BY_US:
return l10n.t('{0} (Theirs)', basename);
case Status.DELETED_BY_THEM:
return l10n.t('{0} (Ours)', basename);
case Status.UNTRACKED:
return l10n.t('{0} (Untracked)', basename);
case Status.INTENT_TO_ADD:
case Status.INTENT_TO_RENAME:
return l10n.t('{0} (Intent to add)', basename);
case Status.TYPE_CHANGED:
return l10n.t('{0} (Type changed)', basename);
default:
return '';
}
}
}
interface ModifiedOrOriginal {
modified?: Uri | undefined;
original?: Uri | undefined;
}
interface BranchProtectionMatcher {
include?: picomatch.Matcher;
exclude?: picomatch.Matcher;
}
export interface IRepositoryResolver {
getRepository(sourceControl: SourceControl): Repository | undefined;
getRepository(resourceGroup: SourceControlResourceGroup): Repository | undefined;
getRepository(path: string): Repository | undefined;
getRepository(resource: Uri): Repository | undefined;
getRepository(hint: any): Repository | undefined;
}
export class Repository implements Disposable {
private _onDidChangeRepository = new EventEmitter<Uri>();
readonly onDidChangeRepository: Event<Uri> = this._onDidChangeRepository.event;
private _onDidChangeState = new EventEmitter<RepositoryState>();
readonly onDidChangeState: Event<RepositoryState> = this._onDidChangeState.event;
private _onDidChangeStatus = new EventEmitter<void>();
readonly onDidRunGitStatus: Event<void> = this._onDidChangeStatus.event;
private _onDidChangeOriginalResource = new EventEmitter<Uri>();
readonly onDidChangeOriginalResource: Event<Uri> = this._onDidChangeOriginalResource.event;
private _onRunOperation = new EventEmitter<OperationKind>();
readonly onRunOperation: Event<OperationKind> = this._onRunOperation.event;
private _onDidRunOperation = new EventEmitter<OperationResult>();
readonly onDidRunOperation: Event<OperationResult> = this._onDidRunOperation.event;
private _onDidChangeBranchProtection = new EventEmitter<void>();
readonly onDidChangeBranchProtection: Event<void> = this._onDidChangeBranchProtection.event;
@memoize
get onDidChangeOperations(): Event<void> {
return anyEvent(this.onRunOperation as Event<any>, this.onDidRunOperation as Event<any>);
}
private _sourceControl: SourceControl;
get sourceControl(): SourceControl { return this._sourceControl; }
get inputBox(): SourceControlInputBox { return this._sourceControl.inputBox; }
private _mergeGroup: SourceControlResourceGroup;
get mergeGroup(): GitResourceGroup { return this._mergeGroup as GitResourceGroup; }
private _indexGroup: SourceControlResourceGroup;
get indexGroup(): GitResourceGroup { return this._indexGroup as GitResourceGroup; }
private _workingTreeGroup: SourceControlResourceGroup;
get workingTreeGroup(): GitResourceGroup { return this._workingTreeGroup as GitResourceGroup; }
private _untrackedGroup: SourceControlResourceGroup;
get untrackedGroup(): GitResourceGroup { return this._untrackedGroup as GitResourceGroup; }
private _EMPTY_TREE: string | undefined;
private _HEAD: Branch | undefined;
get HEAD(): Branch | undefined {
return this._HEAD;
}
private _refs: Ref[] = [];
get refs(): Ref[] {
return this._refs;
}
get headShortName(): string | undefined {
if (!this.HEAD) {
return;
}
const HEAD = this.HEAD;
if (HEAD.name) {
return HEAD.name;
}
return (HEAD.commit || '').substr(0, 8);
}
private _remotes: Remote[] = [];
get remotes(): Remote[] {
return this._remotes;
}
private _submodules: Submodule[] = [];
get submodules(): Submodule[] {
return this._submodules;
}
private _worktrees: Worktree[] = [];
get worktrees(): Worktree[] {
return this._worktrees;
}
private _rebaseCommit: Commit | undefined = undefined;
set rebaseCommit(rebaseCommit: Commit | undefined) {
if (this._rebaseCommit && !rebaseCommit) {
this.inputBox.value = '';
} else if (rebaseCommit && (!this._rebaseCommit || this._rebaseCommit.hash !== rebaseCommit.hash)) {
this.inputBox.value = rebaseCommit.message;
}
const shouldUpdateContext = !!this._rebaseCommit !== !!rebaseCommit;
this._rebaseCommit = rebaseCommit;
if (shouldUpdateContext) {
commands.executeCommand('setContext', 'gitRebaseInProgress', !!this._rebaseCommit);
}
}
get rebaseCommit(): Commit | undefined {
return this._rebaseCommit;
}
private _mergeInProgress: boolean = false;
set mergeInProgress(value: boolean) {
if (this._mergeInProgress === value) {
return;
}
this._mergeInProgress = value;
commands.executeCommand('setContext', 'gitMergeInProgress', value);
}
get mergeInProgress() {
return this._mergeInProgress;
}
private _cherryPickInProgress: boolean = false;
set cherryPickInProgress(value: boolean) {
if (this._cherryPickInProgress === value) {
return;
}
this._cherryPickInProgress = value;
commands.executeCommand('setContext', 'gitCherryPickInProgress', value);
}
get cherryPickInProgress() {
return this._cherryPickInProgress;
}
private _isWorktreeMigrating: boolean = false;
get isWorktreeMigrating(): boolean { return this._isWorktreeMigrating; }
set isWorktreeMigrating(value: boolean) { this._isWorktreeMigrating = value; }
private readonly _operations: OperationManager;
get operations(): OperationManager { return this._operations; }
private _state = RepositoryState.Idle;
get state(): RepositoryState { return this._state; }
set state(state: RepositoryState) {
this._state = state;
this._onDidChangeState.fire(state);
this._HEAD = undefined;
this._remotes = [];
this.mergeGroup.resourceStates = [];
this.indexGroup.resourceStates = [];
this.workingTreeGroup.resourceStates = [];
this.untrackedGroup.resourceStates = [];
this._sourceControl.count = 0;
}
get root(): string {
return this.repository.root;
}
get rootRealPath(): string | undefined {
return this.repository.rootRealPath;
}
get dotGit(): { path: string; commonPath?: string } {
return this.repository.dotGit;
}
get kind(): 'repository' | 'submodule' | 'worktree' {
return this.repository.kind;
}
private _historyProvider: GitHistoryProvider;
get historyProvider(): GitHistoryProvider { return this._historyProvider; }
private isRepositoryHuge: false | { limit: number } = false;
private didWarnAboutLimit = false;
private unpublishedCommits: Set<string> | undefined = undefined;
private branchProtection = new Map<string, BranchProtectionMatcher[]>();
private commitCommandCenter: CommitCommandsCenter;
private resourceCommandResolver = new ResourceCommandResolver(this);
private updateModelStateCancellationTokenSource: CancellationTokenSource | undefined;
private disposables: Disposable[] = [];
constructor(
private readonly repository: BaseRepository,
private readonly repositoryResolver: IRepositoryResolver,
private pushErrorHandlerRegistry: IPushErrorHandlerRegistry,
remoteSourcePublisherRegistry: IRemoteSourcePublisherRegistry,
postCommitCommandsProviderRegistry: IPostCommitCommandsProviderRegistry,
private readonly branchProtectionProviderRegistry: IBranchProtectionProviderRegistry,
historyItemDetailProviderRegistry: ISourceControlHistoryItemDetailsProviderRegistry,
globalState: Memento,
private readonly logger: LogOutputChannel,
private telemetryReporter: TelemetryReporter
) {
this._operations = new OperationManager(this.logger);
const repositoryWatcher = workspace.createFileSystemWatcher(new RelativePattern(Uri.file(repository.root), '**'));
this.disposables.push(repositoryWatcher);
const onRepositoryFileChange = anyEvent(repositoryWatcher.onDidChange, repositoryWatcher.onDidCreate, repositoryWatcher.onDidDelete);
const onRepositoryWorkingTreeFileChange = filterEvent(onRepositoryFileChange, uri => !/\.git($|\\|\/)/.test(relativePath(repository.root, uri.fsPath)));
let onRepositoryDotGitFileChange: Event<Uri>;
try {
const dotGitFileWatcher = new DotGitWatcher(this, logger);
onRepositoryDotGitFileChange = dotGitFileWatcher.event;
this.disposables.push(dotGitFileWatcher);
} catch (err) {
logger.error(`Failed to watch path:'${this.dotGit.path}' or commonPath:'${this.dotGit.commonPath}', reverting to legacy API file watched. Some events might be lost.\n${err.stack || err}`);
onRepositoryDotGitFileChange = filterEvent(onRepositoryFileChange, uri => /\.git($|\\|\/)/.test(uri.path));
}
const onFileChange = anyEvent(onRepositoryWorkingTreeFileChange, onRepositoryDotGitFileChange);
onFileChange(this.onFileChange, this, this.disposables);
onRepositoryDotGitFileChange(this._onDidChangeRepository.fire, this._onDidChangeRepository, this.disposables);
this.disposables.push(new FileEventLogger(onRepositoryWorkingTreeFileChange, onRepositoryDotGitFileChange, logger));
const parentRoot = repository.kind === 'submodule'
? repository.dotGit.superProjectPath
: repository.kind === 'worktree' && repository.dotGit.commonPath
? path.dirname(repository.dotGit.commonPath)
: undefined;
const parent = this.repositoryResolver.getRepository(parentRoot)?.sourceControl;
const icon = repository.kind === 'submodule'
? new ThemeIcon('archive')
: repository.kind === 'worktree'
? new ThemeIcon('list-tree')
: new ThemeIcon('repo');
const root = Uri.file(repository.root);
this._sourceControl = scm.createSourceControl('git', 'Git', root, icon, parent);
this._sourceControl.contextValue = repository.kind;
this._sourceControl.quickDiffProvider = this;
this._sourceControl.secondaryQuickDiffProvider = new StagedResourceQuickDiffProvider(this, logger);
this._historyProvider = new GitHistoryProvider(historyItemDetailProviderRegistry, this, logger);
this._sourceControl.historyProvider = this._historyProvider;
this.disposables.push(this._historyProvider);
this._sourceControl.acceptInputCommand = { command: 'git.commit', title: l10n.t('Commit'), arguments: [this._sourceControl] };
this._sourceControl.inputBox.validateInput = this.validateInput.bind(this);
this.disposables.push(this._sourceControl);
this.updateInputBoxPlaceholder();
this.disposables.push(this.onDidRunGitStatus(() => this.updateInputBoxPlaceholder()));
this._mergeGroup = this._sourceControl.createResourceGroup('merge', l10n.t('Merge Changes'));
this._indexGroup = this._sourceControl.createResourceGroup('index', l10n.t('Staged Changes'), { multiDiffEditorEnableViewChanges: true });
this._workingTreeGroup = this._sourceControl.createResourceGroup('workingTree', l10n.t('Changes'), { multiDiffEditorEnableViewChanges: true });
this._untrackedGroup = this._sourceControl.createResourceGroup('untracked', l10n.t('Untracked Changes'), { multiDiffEditorEnableViewChanges: true });
const updateIndexGroupVisibility = () => {
const config = workspace.getConfiguration('git', root);
this.indexGroup.hideWhenEmpty = !config.get<boolean>('alwaysShowStagedChangesResourceGroup');
};
const onConfigListener = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.alwaysShowStagedChangesResourceGroup', root));
onConfigListener(updateIndexGroupVisibility, this, this.disposables);
updateIndexGroupVisibility();
workspace.onDidChangeConfiguration(e => {
if (e.affectsConfiguration('git.mergeEditor')) {
this.mergeGroup.resourceStates = this.mergeGroup.resourceStates.map(r => r.clone());
}
}, undefined, this.disposables);
filterEvent(workspace.onDidChangeConfiguration, e =>
e.affectsConfiguration('git.branchSortOrder', root)
|| e.affectsConfiguration('git.untrackedChanges', root)
|| e.affectsConfiguration('git.ignoreSubmodules', root)
|| e.affectsConfiguration('git.openDiffOnClick', root)
|| e.affectsConfiguration('git.showActionButton', root)
|| e.affectsConfiguration('git.similarityThreshold', root)
)(() => this.updateModelState(), this, this.disposables);
const updateInputBoxVisibility = () => {
const config = workspace.getConfiguration('git', root);
this._sourceControl.inputBox.visible = config.get<boolean>('showCommitInput', true);
};
const onConfigListenerForInputBoxVisibility = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.showCommitInput', root));
onConfigListenerForInputBoxVisibility(updateInputBoxVisibility, this, this.disposables);
updateInputBoxVisibility();
this.mergeGroup.hideWhenEmpty = true;
this.untrackedGroup.hideWhenEmpty = true;
this.disposables.push(this.mergeGroup);
this.disposables.push(this.indexGroup);
this.disposables.push(this.workingTreeGroup);
this.disposables.push(this.untrackedGroup);
if (workspace.isTrusted) {
this.disposables.push(new AutoFetcher(this, globalState));
} else {
const trustDisposable = workspace.onDidGrantWorkspaceTrust(() => {
trustDisposable.dispose();
this.disposables.push(new AutoFetcher(this, globalState));
});
this.disposables.push(trustDisposable);
}
const onSuccessfulPush = filterEvent(this.onDidRunOperation, e => e.operation.kind === OperationKind.Push && !e.error);
onSuccessfulPush(() => {
const gitConfig = workspace.getConfiguration('git');
if (gitConfig.get<boolean>('showPushSuccessNotification')) {
window.showInformationMessage(l10n.t('Successfully pushed.'));
}
}, null, this.disposables);
const onBranchProtectionProviderChanged = filterEvent(this.branchProtectionProviderRegistry.onDidChangeBranchProtectionProviders, e => pathEquals(e.fsPath, root.fsPath));
this.disposables.push(onBranchProtectionProviderChanged(root => this.updateBranchProtectionMatchers(root)));
this.disposables.push(this.branchProtectionProviderRegistry.registerBranchProtectionProvider(root, new GitBranchProtectionProvider(root)));
const statusBar = new StatusBarCommands(this, remoteSourcePublisherRegistry);
this.disposables.push(statusBar);
statusBar.onDidChange(() => this._sourceControl.statusBarCommands = statusBar.commands, null, this.disposables);
this._sourceControl.statusBarCommands = statusBar.commands;
this.commitCommandCenter = new CommitCommandsCenter(globalState, this, postCommitCommandsProviderRegistry);
this.disposables.push(this.commitCommandCenter);
const actionButton = new ActionButton(this, this.commitCommandCenter, this.logger);
this.disposables.push(actionButton);
actionButton.onDidChange(() => this._sourceControl.actionButton = actionButton.button, this, this.disposables);
this._sourceControl.actionButton = actionButton.button;
const progressManager = new ProgressManager(this);
this.disposables.push(progressManager);
const onDidChangeCountBadge = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.countBadge', root));
onDidChangeCountBadge(this.setCountBadge, this, this.disposables);
this.setCountBadge();
}
validateInput(text: string, _: number): SourceControlInputBoxValidation | undefined {
if (this.isRepositoryHuge) {
return {
message: l10n.t('Too many changes were detected. Only the first {0} changes will be shown below.', this.isRepositoryHuge.limit),
type: SourceControlInputBoxValidationType.Warning
};
}
if (this.rebaseCommit) {
if (this.rebaseCommit.message !== text) {
return {
message: l10n.t('It\'s not possible to change the commit message in the middle of a rebase. Please complete the rebase operation and use interactive rebase instead.'),
type: SourceControlInputBoxValidationType.Warning
};
}
}
return undefined;
}
get label(): string {
return l10n.t('Git Local Changes (Working Tree)');
}
async provideOriginalResource(uri: Uri): Promise<Uri | undefined> {
this.logger.trace(`[Repository][provideOriginalResource] Resource: ${uri.toString()}`);
if (uri.scheme !== 'file') {
this.logger.trace(`[Repository][provideOriginalResource] Resource is not a file: ${uri.scheme}`);
return undefined;
}
const stat = await workspace.fs.stat(uri);
if ((stat.type & FileType.SymbolicLink) !== 0) {
this.logger.trace(`[Repository][provideOriginalResource] Resource is a symbolic link: ${uri.toString()}`);
return undefined;
}
if (this.repositoryResolver.getRepository(uri) !== this) {
this.logger.trace(`[Repository][provideOriginalResource] Resource is not part of the repository: ${uri.toString()}`);
return undefined;
}
if (this.mergeGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
this.logger.trace(`[Repository][provideOriginalResource] Resource is part of a merge group: ${uri.toString()}`);
return undefined;
}
if (this.untrackedGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path)) ||
this.workingTreeGroup.resourceStates.some(r => pathEquals(r.resourceUri.path, uri.path) && r.type === Status.UNTRACKED)) {
this.logger.trace(`[Repository][provideOriginalResource] Resource is untracked: ${uri.toString()}`);
return undefined;
}
const activeTabInput = window.tabGroups.activeTabGroup.activeTab?.input;
if (activeTabInput instanceof TabInputTextDiff && pathEquals(activeTabInput.modified.fsPath, uri.fsPath)) {
this.logger.trace(`[Repository][provideOriginalResource] Resource is on the right-hand side of a diff editor: ${uri.toString()}`);
return undefined;
}
if (activeTabInput instanceof TabInputTextMultiDiff && activeTabInput.textDiffs.some(diff => pathEquals(diff.modified.fsPath, uri.fsPath))) {
this.logger.trace(`[Repository][provideOriginalResource] Resource is on the right-hand side of a multi-file diff editor: ${uri.toString()}`);
return undefined;
}
const originalResource = toGitUri(uri, '', { replaceFileExtension: true });
this.logger.trace(`[Repository][provideOriginalResource] Original resource: ${originalResource.toString()}`);
return originalResource;
}
async getInputTemplate(): Promise<string> {
const commitMessage = (await Promise.all([this.repository.getMergeMessage(), this.repository.getSquashMessage()])).find(msg => !!msg);
if (commitMessage) {
return commitMessage;
}
return await this.repository.getCommitTemplate();
}
getConfigs(): Promise<{ key: string; value: string }[]> {
return this.run(Operation.Config(true), () => this.repository.getConfigs('local'));
}
getConfig(key: string): Promise<string> {
return this.run(Operation.Config(true), () => this.repository.config('get', 'local', key));
}
getGlobalConfig(key: string): Promise<string> {
return this.run(Operation.Config(true), () => this.repository.config('get', 'global', key));
}
setConfig(key: string, value: string): Promise<string> {
return this.run(Operation.Config(false), () => this.repository.config('add', 'local', key, value));
}
unsetConfig(key: string): Promise<string> {
return this.run(Operation.Config(false), () => this.repository.config('unset', 'local', key));
}
log(options?: LogOptions & { silent?: boolean }, cancellationToken?: CancellationToken): Promise<Commit[]> {
const showProgress = !options || options.silent !== true;
return this.run(Operation.Log(showProgress), () => this.repository.log(options, cancellationToken));
}
logFile(uri: Uri, options?: LogFileOptions, cancellationToken?: CancellationToken): Promise<Commit[]> {
return this.run(Operation.LogFile, () => this.repository.logFile(uri, options, cancellationToken));
}
@throttle
async status(): Promise<void> {
await this.run(Operation.Status);
}
@throttle
async refresh(): Promise<void> {
await this.run(Operation.Refresh);
}
diff(cached?: boolean): Promise<string> {
return this.run(Operation.Diff, () => this.repository.diff(cached));
}
diffWithHEAD(): Promise<Change[]>;
diffWithHEAD(path: string): Promise<string>;
diffWithHEAD(path?: string | undefined): Promise<string | Change[]>;
diffWithHEAD(path?: string | undefined): Promise<string | Change[]> {
return this.run(Operation.Diff, () => this.repository.diffWithHEAD(path));
}
diffWith(ref: string): Promise<Change[]>;
diffWith(ref: string, path: string): Promise<string>;
diffWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
diffWith(ref: string, path?: string): Promise<string | Change[]> {
return this.run(Operation.Diff, () => this.repository.diffWith(ref, path));
}
diffIndexWithHEAD(): Promise<Change[]>;
diffIndexWithHEAD(path: string): Promise<string>;
diffIndexWithHEAD(path?: string | undefined): Promise<string | Change[]>;
diffIndexWithHEAD(path?: string): Promise<string | Change[]> {
return this.run(Operation.Diff, () => this.repository.diffIndexWithHEAD(path));
}
diffIndexWith(ref: string): Promise<Change[]>;
diffIndexWith(ref: string, path: string): Promise<string>;
diffIndexWith(ref: string, path?: string | undefined): Promise<string | Change[]>;
diffIndexWith(ref: string, path?: string): Promise<string | Change[]> {
return this.run(Operation.Diff, () => this.repository.diffIndexWith(ref, path));
}
diffBlobs(object1: string, object2: string): Promise<string> {
return this.run(Operation.Diff, () => this.repository.diffBlobs(object1, object2));
}
diffBetween(ref1: string, ref2: string): Promise<Change[]>;
diffBetween(ref1: string, ref2: string, path: string): Promise<string>;
diffBetween(ref1: string, ref2: string, path?: string | undefined): Promise<string | Change[]>;
diffBetween(ref1: string, ref2: string, path?: string): Promise<string | Change[]> {
return this.run(Operation.Diff, () => this.repository.diffBetween(ref1, ref2, path));
}
diffBetweenShortStat(ref1: string, ref2: string): Promise<{ files: number; insertions: number; deletions: number }> {
return this.run(Operation.Diff, () => this.repository.diffBetweenShortStat(ref1, ref2));
}
diffTrees(treeish1: string, treeish2?: string): Promise<Change[]> {
const scopedConfig = workspace.getConfiguration('git', Uri.file(this.root));
const similarityThreshold = scopedConfig.get<number>('similarityThreshold', 50);
return this.run(Operation.Diff, () => this.repository.diffTrees(treeish1, treeish2, { similarityThreshold }));
}
getMergeBase(ref1: string, ref2: string, ...refs: string[]): Promise<string | undefined> {
return this.run(Operation.MergeBase, () => this.repository.getMergeBase(ref1, ref2, ...refs));
}
async hashObject(data: string): Promise<string> {
return this.run(Operation.HashObject, () => this.repository.hashObject(data));
}
async add(resources: Uri[], opts?: { update?: boolean }): Promise<void> {
await this.run(
Operation.Add(!this.optimisticUpdateEnabled()),
async () => {
await this.repository.add(resources.map(r => r.fsPath), opts);
this.closeDiffEditors([], [...resources.map(r => r.fsPath)]);
commands.executeCommand('_chat.editSessions.accept', resources);
},
() => {
const resourcePaths = resources.map(r => r.fsPath);
const indexGroupResourcePaths = this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath);
const addedResourceStates: Resource[] = [];
for (const resource of [...this.mergeGroup.resourceStates, ...this.untrackedGroup.resourceStates, ...this.workingTreeGroup.resourceStates]) {
if (resourcePaths.includes(resource.resourceUri.fsPath) && !indexGroupResourcePaths.includes(resource.resourceUri.fsPath)) {
addedResourceStates.push(resource.clone(ResourceGroupType.Index));
}
}
const indexGroup = [...this.indexGroup.resourceStates, ...addedResourceStates];
const mergeGroup = this.mergeGroup.resourceStates
.filter(r => !resourcePaths.includes(r.resourceUri.fsPath));
const workingTreeGroup = this.workingTreeGroup.resourceStates
.filter(r => !resourcePaths.includes(r.resourceUri.fsPath));
const untrackedGroup = this.untrackedGroup.resourceStates
.filter(r => !resourcePaths.includes(r.resourceUri.fsPath));
return { indexGroup, mergeGroup, workingTreeGroup, untrackedGroup };
});
}
async rm(resources: Uri[]): Promise<void> {
await this.run(Operation.Remove, () => this.repository.rm(resources.map(r => r.fsPath)));
}
async stage(resource: Uri, contents: string, encoding: string): Promise<void> {
await this.run(Operation.Stage, async () => {
const data = await workspace.encode(contents, { encoding });
await this.repository.stage(resource.fsPath, data);
this._onDidChangeOriginalResource.fire(resource);
this.closeDiffEditors([], [...resource.fsPath]);
});
}
async revert(resources: Uri[]): Promise<void> {
await this.run(
Operation.RevertFiles(!this.optimisticUpdateEnabled()),
async () => {
await this.repository.revert('HEAD', resources.map(r => r.fsPath));
for (const resource of resources) {
this._onDidChangeOriginalResource.fire(resource);
}
this.closeDiffEditors([...resources.length !== 0 ?
resources.map(r => r.fsPath) :
this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)], []);
},
() => {
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
const untrackedChanges = config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges');
const untrackedChangesResourceGroupType = untrackedChanges === 'mixed' ? ResourceGroupType.WorkingTree : ResourceGroupType.Untracked;
const resourcePaths = resources.length === 0 ?
this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath) : resources.map(r => r.fsPath);
const trackedResources: Resource[] = [];
const untrackedResources: Resource[] = [];
for (const resource of this.indexGroup.resourceStates) {
if (resourcePaths.includes(resource.resourceUri.fsPath)) {
if (resource.type === Status.INDEX_ADDED) {
untrackedResources.push(resource.clone(untrackedChangesResourceGroupType));
} else {
trackedResources.push(resource.clone(ResourceGroupType.WorkingTree));
}
}
}
const indexGroup = this.indexGroup.resourceStates
.filter(r => !resourcePaths.includes(r.resourceUri.fsPath));
const workingTreeGroup = untrackedChanges === 'mixed' ?
[...this.workingTreeGroup.resourceStates, ...trackedResources, ...untrackedResources] :
[...this.workingTreeGroup.resourceStates, ...trackedResources];
const untrackedGroup = untrackedChanges === 'separate' ?
[...this.untrackedGroup.resourceStates, ...untrackedResources] : undefined;
return { indexGroup, workingTreeGroup, untrackedGroup };
});
}
async commit(message: string | undefined, opts: CommitOptions = Object.create(null)): Promise<void> {
const indexResources = [...this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)];
const workingGroupResources = opts.all && opts.all !== 'tracked' ?
[...this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath)] : [];
if (this.rebaseCommit) {
await this.run(
Operation.RebaseContinue,
async () => {
if (opts.all) {
const addOpts = opts.all === 'tracked' ? { update: true } : {};
await this.repository.add([], addOpts);
}
await this.repository.rebaseContinue();
await this.commitOperationCleanup(message, indexResources, workingGroupResources);
},
() => this.commitOperationGetOptimisticResourceGroups(opts));
} else {
this.commitCommandCenter.postCommitCommand = opts.postCommitCommand;
await this.run(
Operation.Commit,
async () => {
if (opts.all) {
const addOpts = opts.all === 'tracked' ? { update: true } : {};
await this.repository.add([], addOpts);
}
delete opts.all;
if (opts.requireUserConfig === undefined || opts.requireUserConfig === null) {
const config = workspace.getConfiguration('git', Uri.file(this.root));
opts.requireUserConfig = config.get<boolean>('requireGitUserConfig');
}
await this.repository.commit(message, opts);
await this.commitOperationCleanup(message, indexResources, workingGroupResources);
},
() => this.commitOperationGetOptimisticResourceGroups(opts));
await this.run(Operation.PostCommitCommand, async () => {
await this.commitCommandCenter.executePostCommitCommand(opts.postCommitCommand);
});
}
}
private async commitOperationCleanup(message: string | undefined, indexResources: string[], workingGroupResources: string[]) {
if (message) {
this.inputBox.value = await this.getInputTemplate();
}
this.closeDiffEditors(indexResources, workingGroupResources);
const resources = indexResources.length !== 0
? indexResources.map(r => Uri.file(r))
: workingGroupResources.map(r => Uri.file(r));
commands.executeCommand('_chat.editSessions.accept', resources);
}
private commitOperationGetOptimisticResourceGroups(opts: CommitOptions): GitResourceGroups {
let untrackedGroup: Resource[] | undefined = undefined,
workingTreeGroup: Resource[] | undefined = undefined;
if (opts.all === 'tracked') {
workingTreeGroup = this.workingTreeGroup.resourceStates
.filter(r => r.type === Status.UNTRACKED);
} else if (opts.all) {
untrackedGroup = workingTreeGroup = [];
}
return { indexGroup: [], mergeGroup: [], untrackedGroup, workingTreeGroup };
}
async clean(resources: Uri[]): Promise<void> {
const config = workspace.getConfiguration('git');
const discardUntrackedChangesToTrash = config.get<boolean>('discardUntrackedChangesToTrash', true) && !isRemote && !isLinuxSnap;
await this.run(
Operation.Clean(!this.optimisticUpdateEnabled()),
async () => {
const toClean: string[] = [];
const toCheckout: string[] = [];
const submodulesToUpdate: string[] = [];
const resourceStates = [...this.workingTreeGroup.resourceStates, ...this.untrackedGroup.resourceStates];
resources.forEach(r => {
const fsPath = r.fsPath;
for (const submodule of this.submodules) {
if (path.join(this.root, submodule.path) === fsPath) {
submodulesToUpdate.push(fsPath);
return;
}
}
const raw = r.toString();
const scmResource = find(resourceStates, sr => sr.resourceUri.toString() === raw);
if (!scmResource) {
return;
}
switch (scmResource.type) {
case Status.UNTRACKED:
case Status.IGNORED:
toClean.push(fsPath);
break;
default:
toCheckout.push(fsPath);
break;
}
});
if (toClean.length > 0) {
if (discardUntrackedChangesToTrash) {
try {
await workspace.fs.delete(Uri.file(toClean[0]), { useTrash: true });
const limiter = new Limiter<void>(5);
await Promise.all(toClean.slice(1).map(fsPath => limiter.queue(
async () => await workspace.fs.delete(Uri.file(fsPath), { useTrash: true }))));
} catch {
const message = isWindows
? l10n.t('Failed to delete using the Recycle Bin. Do you want to permanently delete instead?')
: l10n.t('Failed to delete using the Trash. Do you want to permanently delete instead?');
const primaryAction = toClean.length === 1
? l10n.t('Delete File')
: l10n.t('Delete All {0} Files', resources.length);
const result = await window.showWarningMessage(message, { modal: true }, primaryAction);
if (result === primaryAction) {
await this.repository.clean(toClean);
}
}
} else {
await this.repository.clean(toClean);
}
}
if (toCheckout.length > 0) {
try {
await this.repository.checkout('', toCheckout);
} catch (err) {
if (err.gitErrorCode !== GitErrorCodes.BranchNotYetBorn) {
throw err;
}
}
}
if (submodulesToUpdate.length > 0) {
await this.repository.updateSubmodules(submodulesToUpdate);
}
this.closeDiffEditors([], [...toClean, ...toCheckout]);
},
() => {
const resourcePaths = resources.map(r => r.fsPath);
const workingTreeGroup = this.workingTreeGroup.resourceStates
.filter(r => !resourcePaths.includes(r.resourceUri.fsPath));
const untrackedGroup = this.untrackedGroup.resourceStates
.filter(r => !resourcePaths.includes(r.resourceUri.fsPath));
return { workingTreeGroup, untrackedGroup };
});
}
closeDiffEditors(indexResources: string[] | undefined, workingTreeResources: string[] | undefined, ignoreSetting = false): void {
const config = workspace.getConfiguration('git', Uri.file(this.root));
if (!config.get<boolean>('closeDiffOnOperation', false) && !ignoreSetting) { return; }
function checkTabShouldClose(input: TabInputTextDiff | TabInputNotebookDiff) {
if (input.modified.scheme === 'git' && (indexResources === undefined || indexResources.some(r => pathEquals(r, input.modified.fsPath)))) {
return true;
}
if (input.modified.scheme === 'file' && input.original.scheme === 'git' && (workingTreeResources === undefined || workingTreeResources.some(r => pathEquals(r, input.modified.fsPath)))) {
return true;
}
return false;
}
const diffEditorTabsToClose = window.tabGroups.all
.flatMap(g => g.tabs)
.filter(({ input }) => {
if (input instanceof TabInputTextDiff || input instanceof TabInputNotebookDiff) {
return checkTabShouldClose(input);
} else if (input instanceof TabInputTextMultiDiff) {
return input.textDiffs.every(checkTabShouldClose);
}
return false;
});
window.tabGroups.close(diffEditorTabsToClose, true);
}
async branch(name: string, _checkout: boolean, _ref?: string): Promise<void> {
await this.run(Operation.Branch, () => this.repository.branch(name, _checkout, _ref));
}
async deleteBranch(name: string, force?: boolean): Promise<void> {
return this.run(Operation.DeleteBranch, async () => {
await this.repository.deleteBranch(name, force);
await this.repository.config('unset', 'local', `branch.${name}.vscode-merge-base`);
});
}
async renameBranch(name: string): Promise<void> {
await this.run(Operation.RenameBranch, () => this.repository.renameBranch(name));
}
@throttle
async fastForwardBranch(name: string): Promise<void> {
const branch = await this.getBranch(name);
if (!branch.upstream?.remote || !branch.upstream?.name || !branch.name) {
return;
}
try {
const options = { remote: branch.upstream.remote, ref: `${branch.upstream.name}:${branch.name}` };
await this.run(Operation.Fetch(true), async () => this.repository.fetch(options));
} catch (err) {
if (err.gitErrorCode === GitErrorCodes.BranchFastForwardRejected) {
return;
}
throw err;
}
}
async cherryPick(commitHash: string): Promise<void> {
await this.run(Operation.CherryPick, () => this.repository.cherryPick(commitHash));
}
async cherryPickAbort(): Promise<void> {
await this.run(Operation.CherryPick, () => this.repository.cherryPickAbort());
}
async move(from: string, to: string): Promise<void> {
await this.run(Operation.Move, () => this.repository.move(from, to));
}
async getBranch(name: string): Promise<Branch> {
return await this.run(Operation.GetBranch, () => this.repository.getBranch(name));
}
async getBranches(query: BranchQuery = {}, cancellationToken?: CancellationToken): Promise<Ref[]> {
return await this.run(Operation.GetBranches, async () => {
const refs = await this.getRefs(query, cancellationToken);
return refs.filter(value => value.type === RefType.Head || (value.type === RefType.RemoteHead && query.remote));
});
}
@sequentialize
async getBranchBase(ref: string): Promise<Branch | undefined> {
const branch = await this.getBranch(ref);
const mergeBaseConfigKey = `branch.${branch.name}.vscode-merge-base`;
try {
const mergeBase = await this.getConfig(mergeBaseConfigKey);
const branchFromConfig = mergeBase !== '' ? await this.getBranch(mergeBase) : undefined;
if (branchFromConfig && branchFromConfig.remote) {
return branchFromConfig;
}
} catch (err) { }
const branchFromReflog = await this.getBranchBaseFromReflog(ref);
let branchFromReflogUpstream: Branch | undefined = undefined;
if (branchFromReflog?.type === RefType.RemoteHead) {
branchFromReflogUpstream = branchFromReflog;
} else if (branchFromReflog?.type === RefType.Head) {
branchFromReflogUpstream = await this.getUpstreamBranch(branchFromReflog);
}
if (branchFromReflogUpstream) {
await this.setConfig(mergeBaseConfigKey, `${branchFromReflogUpstream.remote}/${branchFromReflogUpstream.name}`);
return branchFromReflogUpstream;
}
const defaultBranch = await this.getDefaultBranch();
if (defaultBranch) {
await this.setConfig(mergeBaseConfigKey, `${defaultBranch.remote}/${defaultBranch.name}`);
return defaultBranch;
}
return undefined;
}
private async getBranchBaseFromReflog(ref: string): Promise<Branch | undefined> {
try {
const reflogEntries = await this.repository.reflog(ref, 'branch: Created from *.');
if (reflogEntries.length !== 1) {
return undefined;
}
const match = reflogEntries[0].match(/branch: Created from (?<name>.*)$/);
if (match && match.length === 2 && match[1] !== 'HEAD') {
return await this.getBranch(match[1]);
}
const headReflogEntries = await this.repository.reflog('HEAD', `checkout: moving from .* to ${ref.replace('refs/heads/', '')}`);
if (headReflogEntries.length === 0) {
return undefined;
}
const match2 = headReflogEntries[headReflogEntries.length - 1].match(/checkout: moving from ([^\s]+)\s/);
if (match2 && match2.length === 2) {
return await this.getBranch(match2[1]);
}
}
catch (err) { }
return undefined;
}
private async getDefaultBranch(): Promise<Branch | undefined> {
const defaultRemote = this.getDefaultRemote();
if (!defaultRemote) {
return undefined;
}
try {
const defaultBranch = await this.repository.getDefaultBranch(defaultRemote.name);
return defaultBranch;
}
catch (err) {
this.logger.warn(`[Repository][getDefaultBranch] Failed to get default branch details: ${err.message}.`);
return undefined;
}
}
private async getUpstreamBranch(branch: Branch): Promise<Branch | undefined> {
if (!branch.upstream) {
return undefined;
}
try {
const upstreamBranch = await this.getBranch(`refs/remotes/${branch.upstream.remote}/${branch.upstream.name}`);
return upstreamBranch;
}
catch (err) {
this.logger.warn(`[Repository][getUpstreamBranch] Failed to get branch details for 'refs/remotes/${branch.upstream.remote}/${branch.upstream.name}': ${err.message}.`);
return undefined;
}
}
async getRefs(query: RefQuery = {}, cancellationToken?: CancellationToken): Promise<(Ref | Branch)[]> {
const config = workspace.getConfiguration('git');
let defaultSort = config.get<'alphabetically' | 'committerdate'>('branchSortOrder');
if (defaultSort !== 'alphabetically' && defaultSort !== 'committerdate') {
defaultSort = 'alphabetically';
}
query = { ...query, sort: query?.sort ?? defaultSort };
return await this.run(Operation.GetRefs, () => this.repository.getRefs(query, cancellationToken));
}
async getWorktrees(): Promise<Worktree[]> {
return await this.run(Operation.GetWorktrees, () => this.repository.getWorktrees());
}
async getRemoteRefs(remote: string, opts?: { heads?: boolean; tags?: boolean }): Promise<Ref[]> {
return await this.run(Operation.GetRemoteRefs, () => this.repository.getRemoteRefs(remote, opts));
}
async setBranchUpstream(name: string, upstream: string): Promise<void> {
await this.run(Operation.SetBranchUpstream, () => this.repository.setBranchUpstream(name, upstream));
}
async merge(ref: string): Promise<void> {
await this.run(Operation.Merge, () => this.repository.merge(ref));
}
async mergeAbort(): Promise<void> {
await this.run(Operation.MergeAbort, async () => await this.repository.mergeAbort());
}
async rebase(branch: string): Promise<void> {
await this.run(Operation.Rebase, () => this.repository.rebase(branch));
}
async tag(options: { name: string; message?: string; ref?: string }): Promise<void> {
await this.run(Operation.Tag, () => this.repository.tag(options));
}
async deleteTag(name: string): Promise<void> {
await this.run(Operation.DeleteTag, () => this.repository.deleteTag(name));
}
async addWorktree(options: { path: string; commitish: string; branch?: string }): Promise<void> {
await this.run(Operation.Worktree, () => this.repository.addWorktree(options));
}
async deleteWorktree(path: string, options?: { force?: boolean }): Promise<void> {
await this.run(Operation.DeleteWorktree, () => this.repository.deleteWorktree(path, options));
}
async deleteRemoteRef(remoteName: string, refName: string, options?: { force?: boolean }): Promise<void> {
await this.run(Operation.DeleteRemoteRef, () => this.repository.deleteRemoteRef(remoteName, refName, options));
}
async checkout(treeish: string, opts?: { detached?: boolean; pullBeforeCheckout?: boolean }): Promise<void> {
const refLabel = opts?.detached ? getCommitShortHash(Uri.file(this.root), treeish) : treeish;
await this.run(Operation.Checkout(refLabel),
async () => {
if (opts?.pullBeforeCheckout && !opts?.detached) {
try {
await this.fastForwardBranch(treeish);
}
catch (err) {
}
}
await this.repository.checkout(treeish, [], opts);
});
}
async checkoutTracking(treeish: string, opts: { detached?: boolean } = {}): Promise<void> {
const refLabel = opts.detached ? getCommitShortHash(Uri.file(this.root), treeish) : treeish;
await this.run(Operation.CheckoutTracking(refLabel), () => this.repository.checkout(treeish, [], { ...opts, track: true }));
}
async findTrackingBranches(upstreamRef: string): Promise<Branch[]> {
return await this.run(Operation.FindTrackingBranches, () => this.repository.findTrackingBranches(upstreamRef));
}
async getCommit(ref: string): Promise<Commit> {
return await this.repository.getCommit(ref);
}
async showCommit(ref: string): Promise<string> {
return await this.run(Operation.Show, () => this.repository.showCommit(ref));
}
async getEmptyTree(): Promise<string> {
if (!this._EMPTY_TREE) {
const result = await this.repository.exec(['hash-object', '-t', 'tree', '/dev/null']);
this._EMPTY_TREE = result.stdout.trim();
}
return this._EMPTY_TREE;
}
async reset(treeish: string, hard?: boolean): Promise<void> {
await this.run(Operation.Reset, () => this.repository.reset(treeish, hard));
}
async deleteRef(ref: string): Promise<void> {
await this.run(Operation.DeleteRef, () => this.repository.deleteRef(ref));
}
getDefaultRemote(): Remote | undefined {
if (this.remotes.length === 0) {
return undefined;
}
return this.remotes.find(r => r.name === 'origin') ?? this.remotes[0];
}
async addRemote(name: string, url: string): Promise<void> {
await this.run(Operation.Remote, () => this.repository.addRemote(name, url));
}
async removeRemote(name: string): Promise<void> {
await this.run(Operation.Remote, () => this.repository.removeRemote(name));
}
async renameRemote(name: string, newName: string): Promise<void> {
await this.run(Operation.Remote, () => this.repository.renameRemote(name, newName));
}
@throttle
async fetchDefault(options: { silent?: boolean } = {}): Promise<void> {
await this._fetch({ silent: options.silent });
}
@throttle
async fetchPrune(): Promise<void> {
await this._fetch({ prune: true });
}
@throttle
async fetchAll(options: { silent?: boolean } = {}, cancellationToken?: CancellationToken): Promise<void> {
await this._fetch({ all: true, silent: options.silent, cancellationToken });
}
async fetch(options: FetchOptions): Promise<void> {
await this._fetch(options);
}
private async _fetch(options: { remote?: string; ref?: string; all?: boolean; prune?: boolean; depth?: number; silent?: boolean; cancellationToken?: CancellationToken } = {}): Promise<void> {
if (!options.prune) {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const prune = config.get<boolean>('pruneOnFetch');
options.prune = prune;
}
await this.run(Operation.Fetch(options.silent !== true), async () => this.repository.fetch(options));
}
@throttle
async pullWithRebase(head: Branch | undefined): Promise<void> {
let remote: string | undefined;
let branch: string | undefined;
if (head && head.name && head.upstream) {
remote = head.upstream.remote;
branch = `${head.upstream.name}`;
}
return this.pullFrom(true, remote, branch);
}
@throttle
async pull(head?: Branch, unshallow?: boolean): Promise<void> {
let remote: string | undefined;
let branch: string | undefined;
if (head && head.name && head.upstream) {
remote = head.upstream.remote;
branch = `${head.upstream.name}`;
}
return this.pullFrom(false, remote, branch, unshallow);
}
async pullFrom(rebase?: boolean, remote?: string, branch?: string, unshallow?: boolean): Promise<void> {
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');
if (fetchOnPull) {
await this.fetchAll();
}
if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
await this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags, autoStash });
}
});
});
}
private async _pullAndHandleTagConflict(rebase?: boolean, remote?: string, branch?: string, options: PullOptions = {}): Promise<void> {
try {
await this.repository.pull(rebase, remote, branch, options);
}
catch (err) {
if (err.gitErrorCode !== GitErrorCodes.TagConflict) {
throw err;
}
if (await this.handleTagConflict(remote, err.stderr)) {
await this.repository.pull(rebase, remote, branch, options);
}
}
}
@throttle
async push(head: Branch, forcePushMode?: ForcePushMode): Promise<void> {
let remote: string | undefined;
let branch: string | undefined;
if (head && head.name && head.upstream) {
remote = head.upstream.remote;
branch = `${head.name}:${head.upstream.name}`;
}
await this.run(Operation.Push, () => this._push(remote, branch, undefined, undefined, forcePushMode));
}
async pushTo(remote?: string, name?: string, setUpstream = false, forcePushMode?: ForcePushMode): Promise<void> {
await this.run(Operation.Push, () => this._push(remote, name, setUpstream, undefined, forcePushMode));
}
async pushFollowTags(remote?: string, forcePushMode?: ForcePushMode): Promise<void> {
await this.run(Operation.Push, () => this._push(remote, undefined, false, true, forcePushMode));
}
async pushTags(remote?: string, forcePushMode?: ForcePushMode): Promise<void> {
await this.run(Operation.Push, () => this._push(remote, undefined, false, false, forcePushMode, true));
}
async blame(path: string): Promise<string> {
return await this.run(Operation.Blame(true), () => this.repository.blame(path));
}
async blame2(path: string, ref?: string): Promise<BlameInformation[] | undefined> {
return await this.run(Operation.Blame(false), () => this.repository.blame2(path, ref));
}
@throttle
sync(head: Branch, rebase: boolean): Promise<void> {
return this._sync(head, rebase);
}
private async _sync(head: Branch, rebase: boolean): Promise<void> {
let remoteName: string | undefined;
let pullBranch: string | undefined;
let pushBranch: string | undefined;
if (head.name && head.upstream) {
remoteName = head.upstream.remote;
pullBranch = `${head.upstream.name}`;
pushBranch = `${head.name}:${head.upstream.name}`;
}
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');
const supportCancellation = config.get<boolean>('supportCancellation');
const fn = async (cancellationToken?: CancellationToken) => {
if (fetchOnPull) {
await this.fetchAll({}, cancellationToken);
}
if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
await this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken, autoStash });
}
};
if (supportCancellation) {
const opts: ProgressOptions = {
location: ProgressLocation.Notification,
title: l10n.t('Syncing. Cancelling may cause serious damages to the repository'),
cancellable: true
};
await window.withProgress(opts, (_, token) => fn(token));
} else {
await fn();
}
const remote = this.remotes.find(r => r.name === remoteName);
if (remote && remote.isReadOnly) {
return;
}
const shouldPush = this.HEAD && (typeof this.HEAD.ahead === 'number' ? this.HEAD.ahead > 0 : true);
if (shouldPush) {
await this._push(remoteName, pushBranch, false, followTags);
}
});
});
}
private async checkIfMaybeRebased(currentBranch?: string) {
const config = workspace.getConfiguration('git');
const shouldIgnore = config.get<boolean>('ignoreRebaseWarning') === true;
if (shouldIgnore) {
return true;
}
const maybeRebased = await this.run(Operation.Log(true), async () => {
try {
const result = await this.repository.exec(['log', '--oneline', '--cherry', `${currentBranch ?? ''}...${currentBranch ?? ''}@{upstream}`, '--']);
if (result.exitCode) {
return false;
}
return /^=/.test(result.stdout);
} catch {
return false;
}
});
if (!maybeRebased) {
return true;
}
const always = { title: l10n.t('Always Pull') };
const pull = { title: l10n.t('Pull') };
const cancel = { title: l10n.t('Don\'t Pull') };
const result = await window.showWarningMessage(
currentBranch
? l10n.t('It looks like the current branch "{0}" might have been rebased. Are you sure you still want to pull into it?', currentBranch)
: l10n.t('It looks like the current branch might have been rebased. Are you sure you still want to pull into it?'),
always, pull, cancel
);
if (result === pull) {
return true;
}
if (result === always) {
await config.update('ignoreRebaseWarning', true, true);
return true;
}
return false;
}
async show(ref: string, filePath: string): Promise<string> {
return await this.run(Operation.Show, async () => {
try {
const content = await this.repository.buffer(ref, filePath);
return await workspace.decode(content, { uri: Uri.file(filePath) });
} catch (err) {
if (err.gitErrorCode === GitErrorCodes.WrongCase) {
const gitFilePath = await this.repository.getGitFilePath(ref, filePath);
const content = await this.repository.buffer(ref, gitFilePath);
return await workspace.decode(content, { uri: Uri.file(filePath) });
}
throw err;
}
});
}
async buffer(ref: string, filePath: string): Promise<Buffer> {
return this.run(Operation.Show, () => this.repository.buffer(ref, filePath));
}
getObjectFiles(ref: string): Promise<LsTreeElement[]> {
return this.run(Operation.GetObjectFiles, () => this.repository.lstree(ref));
}
getObjectDetails(ref: string, path: string): Promise<{ mode: string; object: string; size: number }> {
return this.run(Operation.GetObjectDetails, () => this.repository.getObjectDetails(ref, path));
}
detectObjectType(object: string): Promise<{ mimetype: string; encoding?: string }> {
return this.run(Operation.Show, () => this.repository.detectObjectType(object));
}
async apply(patch: string, reverse?: boolean): Promise<void> {
return await this.run(Operation.Apply, () => this.repository.apply(patch, reverse));
}
async getStashes(): Promise<Stash[]> {
return this.run(Operation.Stash, () => this.repository.getStashes());
}
async createStash(message?: string, includeUntracked?: boolean, staged?: boolean): Promise<void> {
const indexResources = [...this.indexGroup.resourceStates.map(r => r.resourceUri.fsPath)];
const workingGroupResources = [
...!staged ? this.workingTreeGroup.resourceStates.map(r => r.resourceUri.fsPath) : [],
...includeUntracked ? this.untrackedGroup.resourceStates.map(r => r.resourceUri.fsPath) : []];
return await this.run(Operation.Stash, async () => {
await this.repository.createStash(message, includeUntracked, staged);
this.closeDiffEditors(indexResources, workingGroupResources);
});
}
async popStash(index?: number): Promise<void> {
return await this.run(Operation.Stash, () => this.repository.popStash(index));
}
async dropStash(index?: number): Promise<void> {
return await this.run(Operation.Stash, () => this.repository.dropStash(index));
}
async applyStash(index?: number): Promise<void> {
return await this.run(Operation.Stash, () => this.repository.applyStash(index));
}
async showStash(index: number): Promise<Change[] | undefined> {
return await this.run(Operation.Stash, () => this.repository.showStash(index));
}
async getCommitTemplate(): Promise<string> {
return await this.run(Operation.GetCommitTemplate, async () => this.repository.getCommitTemplate());
}
async ignore(files: Uri[]): Promise<void> {
return await this.run(Operation.Ignore, async () => {
const ignoreFile = `${this.repository.root}${path.sep}.gitignore`;
const textToAppend = files
.map(uri => relativePath(this.repository.root, uri.fsPath)
.replace(/\\|\[/g, match => match === '\\' ? '/' : `\\${match}`))
.join('\n');
const document = await new Promise(c => fs.exists(ignoreFile, c))
? await workspace.openTextDocument(ignoreFile)
: await workspace.openTextDocument(Uri.file(ignoreFile).with({ scheme: 'untitled' }));
await window.showTextDocument(document);
const edit = new WorkspaceEdit();
const lastLine = document.lineAt(document.lineCount - 1);
const text = lastLine.isEmptyOrWhitespace ? `${textToAppend}\n` : `\n${textToAppend}\n`;
edit.insert(document.uri, lastLine.range.end, text);
await workspace.applyEdit(edit);
await document.save();
});
}
async rebaseAbort(): Promise<void> {
await this.run(Operation.RebaseAbort, async () => await this.repository.rebaseAbort());
}
checkIgnore(filePaths: string[]): Promise<Set<string>> {
return this.run(Operation.CheckIgnore, () => {
return new Promise<Set<string>>((resolve, reject) => {
filePaths = filePaths
.filter(filePath => isDescendant(this.root, filePath));
if (filePaths.length === 0) {
return resolve(new Set<string>());
}
const child = this.repository.stream(['check-ignore', '-v', '-z', '--stdin'], { stdio: [null, null, null] });
child.stdin!.end(filePaths.join('\0'), 'utf8');
const onExit = (exitCode: number) => {
if (exitCode === 1) {
resolve(new Set<string>());
} else if (exitCode === 0) {
resolve(new Set<string>(this.parseIgnoreCheck(data)));
} else {
if (/ is in submodule /.test(stderr)) {
reject(new GitError({ stdout: data, stderr, exitCode, gitErrorCode: GitErrorCodes.IsInSubmodule }));
} else {
reject(new GitError({ stdout: data, stderr, exitCode }));
}
}
};
let data = '';
const onStdoutData = (raw: string) => {
data += raw;
};
child.stdout!.setEncoding('utf8');
child.stdout!.on('data', onStdoutData);
let stderr: string = '';
child.stderr!.setEncoding('utf8');
child.stderr!.on('data', raw => stderr += raw);
child.on('error', reject);
child.on('exit', onExit);
});
});
}
private parseIgnoreCheck(raw: string): string[] {
const ignored = [];
const elements = raw.split('\0');
for (let i = 0; i < elements.length; i += 4) {
const pattern = elements[i + 2];
const path = elements[i + 3];
if (pattern && !pattern.startsWith('!')) {
ignored.push(path);
}
}
return ignored;
}
private async _push(remote?: string, refspec?: string, setUpstream = false, followTags = false, forcePushMode?: ForcePushMode, tags = false): Promise<void> {
try {
await this.repository.push(remote, refspec, setUpstream, followTags, forcePushMode, tags);
} catch (err) {
if (!remote || !refspec) {
throw err;
}
const repository = new ApiRepository(this);
const remoteObj = repository.state.remotes.find(r => r.name === remote);
if (!remoteObj) {
throw err;
}
for (const handler of this.pushErrorHandlerRegistry.getPushErrorHandlers()) {
if (await handler.handlePushError(repository, remoteObj, refspec, err)) {
return;
}
}
throw err;
}
}
private async run<T>(
operation: Operation,
runOperation: () => Promise<T> = () => Promise.resolve<any>(null),
getOptimisticResourceGroups: () => GitResourceGroups | undefined = () => undefined): Promise<T> {
if (this.state !== RepositoryState.Idle) {
throw new Error('Repository not initialized');
}
let error: any = null;
this._operations.start(operation);
this._onRunOperation.fire(operation.kind);
try {
const result = await this.retryRun(operation, runOperation);
if (!operation.readOnly) {
await this.updateModelState(this.optimisticUpdateEnabled() ? getOptimisticResourceGroups() : undefined);
}
return result;
} catch (err) {
error = err;
if (err.gitErrorCode === GitErrorCodes.NotAGitRepository) {
this.state = RepositoryState.Disposed;
}
if (!operation.readOnly) {
await this.updateModelState();
}
throw err;
} finally {
this._operations.end(operation);
this._onDidRunOperation.fire({ operation: operation, error });
}
}
private async retryRun<T>(operation: Operation, runOperation: () => Promise<T> = () => Promise.resolve<any>(null)): Promise<T> {
let attempt = 0;
while (true) {
try {
attempt++;
return await runOperation();
} catch (err) {
const shouldRetry = attempt <= 10 && (
(err.gitErrorCode === GitErrorCodes.RepositoryIsLocked)
|| (operation.retry && (err.gitErrorCode === GitErrorCodes.CantLockRef || err.gitErrorCode === GitErrorCodes.CantRebaseMultipleBranches))
);
if (shouldRetry) {
await timeout(Math.pow(attempt, 2) * 50);
} else {
throw err;
}
}
}
}
private static KnownHugeFolderNames = ['node_modules'];
private async findKnownHugeFolderPathsToIgnore(): Promise<string[]> {
const folderPaths: string[] = [];
for (const folderName of Repository.KnownHugeFolderNames) {
const folderPath = path.join(this.repository.root, folderName);
if (await new Promise<boolean>(c => fs.exists(folderPath, c))) {
folderPaths.push(folderPath);
}
}
const ignored = await this.checkIgnore(folderPaths);
return folderPaths.filter(p => !ignored.has(p));
}
private async updateModelState(optimisticResourcesGroups?: GitResourceGroups) {
this.updateModelStateCancellationTokenSource?.cancel();
this.updateModelStateCancellationTokenSource = new CancellationTokenSource();
await this._updateModelState(optimisticResourcesGroups, this.updateModelStateCancellationTokenSource.token);
}
private async _updateModelState(optimisticResourcesGroups?: GitResourceGroups, cancellationToken?: CancellationToken): Promise<void> {
try {
if (optimisticResourcesGroups) {
this._updateResourceGroupsState(optimisticResourcesGroups);
}
const [HEAD, remotes, submodules, worktrees, rebaseCommit, mergeInProgress, cherryPickInProgress, commitTemplate] =
await Promise.all([
this.repository.getHEADRef(),
this.repository.getRemotes(),
this.repository.getSubmodules(),
this.repository.getWorktrees(),
this.getRebaseCommit(),
this.isMergeInProgress(),
this.isCherryPickInProgress(),
this.getInputTemplate()]);
if (this.HEAD?.name !== HEAD?.name ||
this.HEAD?.commit !== HEAD?.commit ||
this.HEAD?.ahead !== HEAD?.ahead ||
this.HEAD?.upstream !== HEAD?.upstream) {
this.unpublishedCommits = undefined;
}
this._HEAD = HEAD;
this._remotes = remotes!;
this._submodules = submodules!;
this._worktrees = worktrees!;
this.rebaseCommit = rebaseCommit;
this.mergeInProgress = mergeInProgress;
this.cherryPickInProgress = cherryPickInProgress;
this._sourceControl.commitTemplate = commitTemplate;
const [resourceGroups, refs] =
await Promise.all([
this.getStatus(cancellationToken),
this.getRefs({}, cancellationToken)]);
this._refs = refs;
this._updateResourceGroupsState(resourceGroups);
this._onDidChangeStatus.fire();
}
catch (err) {
if (err instanceof CancellationError) {
return;
}
throw err;
}
}
private _updateResourceGroupsState(resourcesGroups: GitResourceGroups): void {
if (resourcesGroups.indexGroup) { this.indexGroup.resourceStates = resourcesGroups.indexGroup; }
if (resourcesGroups.mergeGroup) { this.mergeGroup.resourceStates = resourcesGroups.mergeGroup; }
if (resourcesGroups.untrackedGroup) { this.untrackedGroup.resourceStates = resourcesGroups.untrackedGroup; }
if (resourcesGroups.workingTreeGroup) { this.workingTreeGroup.resourceStates = resourcesGroups.workingTreeGroup; }
if (this._isWorktreeMigrating && resourcesGroups.mergeGroup && resourcesGroups.mergeGroup.length === 0) {
this._isWorktreeMigrating = false;
}
this.setCountBadge();
}
private async getStatus(cancellationToken?: CancellationToken): Promise<GitResourceGroups> {
if (cancellationToken && cancellationToken.isCancellationRequested) {
throw new CancellationError();
}
const scopedConfig = workspace.getConfiguration('git', Uri.file(this.repository.root));
const untrackedChanges = scopedConfig.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges');
const ignoreSubmodules = scopedConfig.get<boolean>('ignoreSubmodules');
const limit = scopedConfig.get<number>('statusLimit', 10000);
const similarityThreshold = scopedConfig.get<number>('similarityThreshold', 50);
const start = new Date().getTime();
const { status, statusLength, didHitLimit } = await this.repository.getStatus({ limit, ignoreSubmodules, similarityThreshold, untrackedChanges, cancellationToken });
const totalTime = new Date().getTime() - start;
this.isRepositoryHuge = didHitLimit ? { limit } : false;
if (didHitLimit) {
this.telemetryReporter.sendTelemetryEvent('statusLimit', { ignoreSubmodules: String(ignoreSubmodules) }, { limit, statusLength, totalTime });
}
if (totalTime > 5000) {
this.telemetryReporter.sendTelemetryEvent('statusSlow', { ignoreSubmodules: String(ignoreSubmodules), didHitLimit: String(didHitLimit), didWarnAboutLimit: String(this.didWarnAboutLimit) }, { statusLength, totalTime });
}
this._sourceControl.inputBox.validateInput = this._sourceControl.inputBox.validateInput;
const config = workspace.getConfiguration('git');
const shouldIgnore = config.get<boolean>('ignoreLimitWarning') === true;
const useIcons = !config.get<boolean>('decorations.enabled', true);
if (didHitLimit && !shouldIgnore && !this.didWarnAboutLimit) {
const knownHugeFolderPaths = await this.findKnownHugeFolderPathsToIgnore();
const gitWarn = l10n.t('The git repository at "{0}" has too many active changes, only a subset of Git features will be enabled.', this.repository.root);
const neverAgain = { title: l10n.t('Don\'t Show Again') };
if (knownHugeFolderPaths.length > 0) {
const folderPath = knownHugeFolderPaths[0];
const folderName = path.basename(folderPath);
const addKnown = l10n.t('Would you like to add "{0}" to .gitignore?', folderName);
const yes = { title: l10n.t('Yes') };
const no = { title: l10n.t('No') };
window.showWarningMessage(`${gitWarn} ${addKnown}`, yes, no, neverAgain).then(result => {
if (result === yes) {
this.ignore([Uri.file(folderPath)]);
} else {
if (result === neverAgain) {
config.update('ignoreLimitWarning', true, false);
}
this.didWarnAboutLimit = true;
}
});
} else {
const ok = { title: l10n.t('OK') };
window.showWarningMessage(gitWarn, ok, neverAgain).then(result => {
if (result === neverAgain) {
config.update('ignoreLimitWarning', true, false);
}
this.didWarnAboutLimit = true;
});
}
}
const indexGroup: Resource[] = [],
mergeGroup: Resource[] = [],
untrackedGroup: Resource[] = [],
workingTreeGroup: Resource[] = [];
status.forEach(raw => {
const uri = Uri.file(path.join(this.repository.root, raw.path));
const renameUri = raw.rename
? Uri.file(path.join(this.repository.root, raw.rename))
: undefined;
switch (raw.x + raw.y) {
case '??': switch (untrackedChanges) {
case 'mixed': return workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.UNTRACKED, useIcons, undefined, this.kind));
case 'separate': return untrackedGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Untracked, uri, Status.UNTRACKED, useIcons));
default: return undefined;
}
case '!!': switch (untrackedChanges) {
case 'mixed': return workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.IGNORED, useIcons, undefined, this.kind));
case 'separate': return untrackedGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Untracked, uri, Status.IGNORED, useIcons));
default: return undefined;
}
case 'DD': return mergeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Merge, uri, Status.BOTH_DELETED, useIcons));
case 'AU': return mergeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Merge, uri, Status.ADDED_BY_US, useIcons));
case 'UD': return mergeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Merge, uri, Status.DELETED_BY_THEM, useIcons));
case 'UA': return mergeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Merge, uri, Status.ADDED_BY_THEM, useIcons));
case 'DU': return mergeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Merge, uri, Status.DELETED_BY_US, useIcons));
case 'AA': return mergeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Merge, uri, Status.BOTH_ADDED, useIcons));
case 'UU': return mergeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Merge, uri, Status.BOTH_MODIFIED, useIcons));
}
switch (raw.x) {
case 'M': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_MODIFIED, useIcons, undefined, this.kind)); break;
case 'A': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_ADDED, useIcons, undefined, this.kind)); break;
case 'D': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_DELETED, useIcons, undefined, this.kind)); break;
case 'R': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_RENAMED, useIcons, renameUri, this.kind)); break;
case 'C': indexGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.Index, uri, Status.INDEX_COPIED, useIcons, renameUri, this.kind)); break;
}
switch (raw.y) {
case 'M': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.MODIFIED, useIcons, renameUri, this.kind)); break;
case 'D': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.DELETED, useIcons, renameUri, this.kind)); break;
case 'A': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_ADD, useIcons, renameUri, this.kind)); break;
case 'R': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.INTENT_TO_RENAME, useIcons, renameUri, this.kind)); break;
case 'T': workingTreeGroup.push(new Resource(this.resourceCommandResolver, ResourceGroupType.WorkingTree, uri, Status.TYPE_CHANGED, useIcons, renameUri, this.kind)); break;
}
return undefined;
});
return { indexGroup, mergeGroup, untrackedGroup, workingTreeGroup };
}
private setCountBadge(): void {
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
const countBadge = config.get<'all' | 'tracked' | 'off'>('countBadge');
const untrackedChanges = config.get<'mixed' | 'separate' | 'hidden'>('untrackedChanges');
let count =
this.mergeGroup.resourceStates.length +
this.indexGroup.resourceStates.length +
this.workingTreeGroup.resourceStates.length;
switch (countBadge) {
case 'off': count = 0; break;
case 'tracked':
if (untrackedChanges === 'mixed') {
count -= this.workingTreeGroup.resourceStates.filter(r => r.type === Status.UNTRACKED || r.type === Status.IGNORED).length;
}
break;
case 'all':
if (untrackedChanges === 'separate') {
count += this.untrackedGroup.resourceStates.length;
}
break;
}
this._sourceControl.count = count;
}
private async getRebaseCommit(): Promise<Commit | undefined> {
const rebaseHeadPath = path.join(this.repository.root, '.git', 'REBASE_HEAD');
const rebaseApplyPath = path.join(this.repository.root, '.git', 'rebase-apply');
const rebaseMergePath = path.join(this.repository.root, '.git', 'rebase-merge');
try {
const [rebaseApplyExists, rebaseMergePathExists, rebaseHead] = await Promise.all([
new Promise<boolean>(c => fs.exists(rebaseApplyPath, c)),
new Promise<boolean>(c => fs.exists(rebaseMergePath, c)),
new Promise<string>((c, e) => fs.readFile(rebaseHeadPath, 'utf8', (err, result) => err ? e(err) : c(result)))
]);
if (!rebaseApplyExists && !rebaseMergePathExists) {
return undefined;
}
return await this.getCommit(rebaseHead.trim());
} catch (err) {
return undefined;
}
}
private isMergeInProgress(): Promise<boolean> {
const mergeHeadPath = path.join(this.repository.root, '.git', 'MERGE_HEAD');
return new Promise<boolean>(resolve => fs.exists(mergeHeadPath, resolve));
}
private isCherryPickInProgress(): Promise<boolean> {
const cherryPickHeadPath = path.join(this.repository.root, '.git', 'CHERRY_PICK_HEAD');
return new Promise<boolean>(resolve => fs.exists(cherryPickHeadPath, resolve));
}
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));
if (!shouldAutoStash) {
return await runOperation();
}
await this.repository.createStash(undefined, true);
try {
const result = await runOperation();
return result;
} finally {
await this.repository.popStash();
}
}
private onFileChange(_uri: Uri): void {
const config = workspace.getConfiguration('git');
const autorefresh = config.get<boolean>('autorefresh');
if (!autorefresh) {
this.logger.trace('[Repository][onFileChange] Skip running git status because autorefresh setting is disabled.');
return;
}
if (this.isRepositoryHuge) {
this.logger.trace('[Repository][onFileChange] Skip running git status because repository is huge.');
return;
}
if (!this.operations.isIdle()) {
this.logger.trace('[Repository][onFileChange] Skip running git status because an operation is running.');
return;
}
this.eventuallyUpdateWhenIdleAndWait();
}
@debounce(1000)
private eventuallyUpdateWhenIdleAndWait(): void {
this.updateWhenIdleAndWait();
}
@throttle
private async updateWhenIdleAndWait(): Promise<void> {
await this.whenIdleAndFocused();
await this.status();
await timeout(5000);
}
async whenIdleAndFocused(): Promise<void> {
while (true) {
if (!this.operations.isIdle()) {
await eventToPromise(this.onDidRunOperation);
continue;
}
if (!window.state.focused) {
const onDidFocusWindow = filterEvent(window.onDidChangeWindowState, e => e.focused);
await eventToPromise(onDidFocusWindow);
continue;
}
return;
}
}
get headLabel(): string {
const HEAD = this.HEAD;
if (!HEAD) {
return '';
}
const head = HEAD.name || (HEAD.commit || '').substr(0, 8);
return head
+ (this.workingTreeGroup.resourceStates.length + this.untrackedGroup.resourceStates.length > 0 ? '*' : '')
+ (this.indexGroup.resourceStates.length > 0 ? '+' : '')
+ (this.mergeInProgress || !!this.rebaseCommit ? '!' : '');
}
get syncLabel(): string {
if (!this.HEAD
|| !this.HEAD.name
|| !this.HEAD.commit
|| !this.HEAD.upstream
|| !(this.HEAD.ahead || this.HEAD.behind)
) {
return '';
}
const remoteName = this.HEAD && this.HEAD.remote || this.HEAD.upstream.remote;
const remote = this.remotes.find(r => r.name === remoteName);
if (remote && remote.isReadOnly) {
return `${this.HEAD.behind}↓`;
}
return `${this.HEAD.behind}↓ ${this.HEAD.ahead}↑`;
}
get syncTooltip(): string {
if (!this.HEAD
|| !this.HEAD.name
|| !this.HEAD.commit
|| !this.HEAD.upstream
|| !(this.HEAD.ahead || this.HEAD.behind)
) {
return l10n.t('Synchronize Changes');
}
const remoteName = this.HEAD && this.HEAD.remote || this.HEAD.upstream.remote;
const remote = this.remotes.find(r => r.name === remoteName);
if ((remote && remote.isReadOnly) || !this.HEAD.ahead) {
return l10n.t('Pull {0} commits from {1}/{2}', this.HEAD.behind!, this.HEAD.upstream.remote, this.HEAD.upstream.name);
} else if (!this.HEAD.behind) {
return l10n.t('Push {0} commits to {1}/{2}', this.HEAD.ahead, this.HEAD.upstream.remote, this.HEAD.upstream.name);
} else {
return l10n.t('Pull {0} and push {1} commits between {2}/{3}', this.HEAD.behind, this.HEAD.ahead, this.HEAD.upstream.remote, this.HEAD.upstream.name);
}
}
private updateInputBoxPlaceholder(): void {
const branchName = this.headShortName;
if (branchName) {
this._sourceControl.inputBox.placeholder = l10n.t('Message ({0} to commit on "{1}")', '{0}', branchName);
} else {
this._sourceControl.inputBox.placeholder = l10n.t('Message ({0} to commit)');
}
}
private updateBranchProtectionMatchers(root: Uri): void {
this.branchProtection.clear();
for (const provider of this.branchProtectionProviderRegistry.getBranchProtectionProviders(root)) {
for (const { remote, rules } of provider.provideBranchProtection()) {
const matchers: BranchProtectionMatcher[] = [];
for (const rule of rules) {
const include = rule.include && rule.include.length !== 0 ? picomatch(rule.include) : undefined;
const exclude = rule.exclude && rule.exclude.length !== 0 ? picomatch(rule.exclude) : undefined;
if (include || exclude) {
matchers.push({ include, exclude });
}
}
if (matchers.length !== 0) {
this.branchProtection.set(remote, matchers);
}
}
}
this._onDidChangeBranchProtection.fire();
}
private optimisticUpdateEnabled(): boolean {
const config = workspace.getConfiguration('git', Uri.file(this.root));
return config.get<boolean>('optimisticUpdate') === true;
}
private async handleTagConflict(remote: string | undefined, raw: string): Promise<boolean> {
remote = remote ?? this.HEAD?.upstream?.remote;
if (!remote) {
throw new Error('Unable to resolve tag conflict due to missing remote.');
}
const tags: string[] = [];
for (const match of raw.matchAll(/^ ! \[rejected\]\s+([^\s]+)\s+->\s+([^\s]+)\s+\(would clobber existing tag\)$/gm)) {
if (match.length === 3) {
tags.push(match[1]);
}
}
if (tags.length === 0) {
throw new Error(`Unable to extract tag names from error message: ${raw}`);
}
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
const replaceTagsWhenPull = config.get<boolean>('replaceTagsWhenPull', false) === true;
if (!replaceTagsWhenPull) {
const replaceLocalTags = l10n.t('Replace Local Tag(s)');
const replaceLocalTagsAlways = l10n.t('Always Replace Local Tag(s)');
const message = l10n.t('Unable to pull from remote repository due to conflicting tag(s): {0}. Would you like to resolve the conflict by replacing the local tag(s)?', tags.join(', '));
const choice = await window.showErrorMessage(message, { modal: true }, replaceLocalTags, replaceLocalTagsAlways);
if (choice !== replaceLocalTags && choice !== replaceLocalTagsAlways) {
return false;
}
if (choice === replaceLocalTagsAlways) {
await config.update('replaceTagsWhenPull', true, true);
}
}
await this.repository.fetchTags({ remote, tags, force: true });
return true;
}
public isBranchProtected(branch = this.HEAD): boolean {
if (branch?.name) {
const defaultBranchProtectionMatcher = this.branchProtection.get('');
if (defaultBranchProtectionMatcher?.length === 1 &&
defaultBranchProtectionMatcher[0].include &&
defaultBranchProtectionMatcher[0].include(branch.name)) {
return true;
}
if (branch.upstream?.remote) {
const remoteBranchProtectionMatcher = this.branchProtection.get(branch.upstream.remote);
if (remoteBranchProtectionMatcher && remoteBranchProtectionMatcher?.length !== 0) {
return remoteBranchProtectionMatcher.some(matcher => {
const include = matcher.include ? matcher.include(branch.name!) : true;
const exclude = matcher.exclude ? matcher.exclude(branch.name!) : false;
return include && !exclude;
});
}
}
}
return false;
}
async getUnpublishedCommits(): Promise<Set<string>> {
if (this.unpublishedCommits) {
return this.unpublishedCommits;
}
if (!this.HEAD?.name) {
this.unpublishedCommits = new Set<string>();
return this.unpublishedCommits;
}
if (this.HEAD.upstream) {
if (this.HEAD.ahead === 0) {
this.unpublishedCommits = new Set<string>();
} else {
const ref1 = `${this.HEAD.upstream.remote}/${this.HEAD.upstream.name}`;
const ref2 = this.HEAD.name;
const revList = await this.repository.revList(ref1, ref2);
this.unpublishedCommits = new Set<string>(revList);
}
} else if (this.historyProvider.currentHistoryItemBaseRef) {
const ref1 = this.historyProvider.currentHistoryItemBaseRef.id;
const ref2 = this.HEAD.name;
const revList = await this.repository.revList(ref1, ref2);
this.unpublishedCommits = new Set<string>(revList);
} else {
this.unpublishedCommits = new Set<string>();
}
return this.unpublishedCommits;
}
dispose(): void {
this.disposables = dispose(this.disposables);
}
}
export class StagedResourceQuickDiffProvider implements QuickDiffProvider {
readonly label = l10n.t('Git Local Changes (Index)');
constructor(
private readonly _repository: Repository,
private readonly logger: LogOutputChannel
) { }
async provideOriginalResource(uri: Uri): Promise<Uri | undefined> {
this.logger.trace(`[StagedResourceQuickDiffProvider][provideOriginalResource] Resource: ${uri.toString()}`);
if (uri.scheme !== 'file') {
this.logger.trace(`[StagedResourceQuickDiffProvider][provideOriginalResource] Resource is not a file: ${uri.scheme}`);
return undefined;
}
const stat = await workspace.fs.stat(uri);
if ((stat.type & FileType.SymbolicLink) !== 0) {
this.logger.trace(`[StagedResourceQuickDiffProvider][provideOriginalResource] Resource is a symbolic link: ${uri.toString()}`);
return undefined;
}
if (!this._repository.indexGroup.resourceStates.some(r => pathEquals(r.resourceUri.fsPath, uri.fsPath))) {
this.logger.trace(`[StagedResourceQuickDiffProvider][provideOriginalResource] Resource is not part of a index group: ${uri.toString()}`);
return undefined;
}
const originalResource = toGitUri(uri, 'HEAD', { replaceFileExtension: true });
this.logger.trace(`[StagedResourceQuickDiffProvider][provideOriginalResource] Original resource: ${originalResource.toString()}`);
return originalResource;
}
}