Skip to content

Commit 1bba438

Browse files
authored
Fix for open changes action (#2363)
1 parent f18ff6e commit 1bba438

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

src/extension/chatSessions/vscode-node/pullRequestFileChangesService.ts

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,21 @@ export class PullRequestFileChangesService implements IPullRequestFileChangesSer
3232
try {
3333
this.logService.trace(`Getting file changes for PR #${pullRequest.number}`);
3434
const repoId = await getRepoId(this._gitService);
35-
if (!repoId) {
35+
let repoName, repoOwner = undefined;
36+
if (repoId) {
37+
repoName = repoId.repo;
38+
repoOwner = repoId.org;
39+
} else {
40+
repoOwner = pullRequest.repository.owner.login;
41+
repoName = pullRequest.repository.name;
42+
}
43+
if (!repoName || !repoOwner) {
3644
this.logService.warn('No repo ID available for fetching PR file changes');
3745
return undefined;
3846
}
3947

40-
this.logService.trace(`Fetching PR files from ${repoId.org}/${repoId.repo} for PR #${pullRequest.number}`);
41-
const files = await this._octoKitService.getPullRequestFiles(repoId.org, repoId.repo, pullRequest.number);
48+
this.logService.trace(`Fetching PR files from ${repoOwner}/${repoName} for PR #${pullRequest.number}`);
49+
const files = await this._octoKitService.getPullRequestFiles(repoOwner, repoName, pullRequest.number);
4250
this.logService.trace(`Got ${files?.length || 0} files from API`);
4351

4452
if (!files || files.length === 0) {
@@ -62,8 +70,8 @@ export class PullRequestFileChangesService implements IPullRequestFileChangesSer
6270
const originalUri = toPRContentUri(
6371
file.previous_filename || file.filename,
6472
{
65-
owner: repoId.org,
66-
repo: repoId.repo,
73+
owner: repoOwner,
74+
repo: repoName,
6775
prNumber: pullRequest.number,
6876
commitSha: pullRequest.baseRefOid,
6977
isBase: true,
@@ -75,8 +83,8 @@ export class PullRequestFileChangesService implements IPullRequestFileChangesSer
7583
const modifiedUri = toPRContentUri(
7684
file.filename,
7785
{
78-
owner: repoId.org,
79-
repo: repoId.repo,
86+
owner: repoOwner,
87+
repo: repoName,
8088
prNumber: pullRequest.number,
8189
commitSha: pullRequest.headRefOid,
8290
isBase: false,

0 commit comments

Comments
 (0)