Skip to content

Fix checking out PRs with a local branch but no upstream #6587

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
alexr00 merged 1 commit into from
Jan 7, 2025
Merged

Fix checking out PRs with a local branch but no upstream #6587

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/view/treeNodes/descriptionNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ export class DescriptionNode extends TreeNode implements vscode.TreeItem {
label: string,
public readonly pullRequestModel: PullRequestModel,
public readonly repository: Repository,
private readonly folderRepositoryManager: FolderRepositoryManager
private readonly folderRepositoryManager: FolderRepositoryManager,
private isLocal: boolean
) {
super(parent);
this.label = label;
Expand All @@ -46,6 +47,6 @@ export class DescriptionNode extends TreeNode implements vscode.TreeItem {
(currentBranchIsForThisPR ? ':active' : ':nonactive') +
(this.pullRequestModel.hasChangesSinceLastReview ? ':hasChangesSinceReview' : '') +
(this.pullRequestModel.showChangesSinceReview ? ':showingChangesSinceReview' : ':showingAllChanges') +
((this.pullRequestModel.item.isRemoteHeadDeleted || !this.folderRepositoryManager.isPullRequestAssociatedWithOpenRepository(this.pullRequestModel)) ? '' : ':hasHeadRef');
(((this.pullRequestModel.item.isRemoteHeadDeleted && !this.isLocal) || !this.folderRepositoryManager.isPullRequestAssociatedWithOpenRepository(this.pullRequestModel)) ? '' : ':hasHeadRef');
}
}
5 changes: 3 additions & 2 deletions src/view/treeNodes/pullRequestNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider2
vscode.l10n.t('Description'),
this.pullRequestModel,
this.repository,
this._folderReposManager
this._folderReposManager,
this._isLocal
);

if (!this.pullRequestModel.isResolved()) {
Expand Down Expand Up @@ -305,7 +306,7 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider2
(this._isLocal ? ':local' : '') +
(currentBranchIsForThisPR ? ':active' : ':nonactive') +
(hasNotification ? ':notification' : '') +
((this.pullRequestModel.item.isRemoteHeadDeleted || !this._folderReposManager.isPullRequestAssociatedWithOpenRepository(this.pullRequestModel)) ? '' : ':hasHeadRef'),
(((this.pullRequestModel.item.isRemoteHeadDeleted && !this._isLocal) || !this._folderReposManager.isPullRequestAssociatedWithOpenRepository(this.pullRequestModel)) ? '' : ':hasHeadRef'),
iconPath: (await DataUri.avatarCirclesAsImageDataUris(this._folderReposManager.context, [this.pullRequestModel.author], 16, 16))[0]
?? new vscode.ThemeIcon('github'),
accessibilityInformation: {
Expand Down
2 changes: 1 addition & 1 deletion src/view/treeNodes/repositoryChangesNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class RepositoryChangesNode extends DescriptionNode implements vscode.Tre
private _reviewModel: ReviewModel,
private _progress: ProgressHelper
) {
super(parent, pullRequest.title, pullRequest, _pullRequestManager.repository, _pullRequestManager);
super(parent, pullRequest.title, pullRequest, _pullRequestManager.repository, _pullRequestManager, true);
// Cause tree values to be filled
this.getTreeItem();

Expand Down