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

Author: alexr00

src/view/treeNodes/descriptionNode.ts

@@ -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;
@@ -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');
 	}
 }

src/view/treeNodes/pullRequestNode.ts

@@ -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()) {
@@ -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: {

src/view/treeNodes/repositoryChangesNode.ts

@@ -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();