@@ -12,7 +12,7 @@ import { ConflictResolutionCoordinator } from './conflictResolutionCoordinator';
1212import { Conflict , ConflictResolutionModel } from './conflictResolutionModel' ;
1313import { CredentialStore } from './credentials' ;
1414import { CopilotWorkingStatus , GitHubRepository , isRateLimitError , ItemsData , PULL_REQUEST_PAGE_SIZE , PullRequestChangeEvent , PullRequestData , TeamReviewerRefreshKind , ViewerPermission } from './githubRepository' ;
15- import { PullRequestResponse , PullRequestState } from './graphql' ;
15+ import { PullRequestState } from './graphql' ;
1616import { IAccount , ILabel , IMilestone , IProject , IPullRequestsPagingOptions , Issue , ITeam , MergeMethod , PRType , PullRequestMergeability , RepoAccessAndMergeMethods , User } from './interface' ;
1717import { IssueModel } from './issueModel' ;
1818import { PullRequestGitHelper , PullRequestMetadata } from './pullRequestGitHelper' ;
@@ -24,7 +24,6 @@ import {
2424 getPRFetchQuery ,
2525 getStateFromQuery ,
2626 loginComparator ,
27- parseGraphQLPullRequest ,
2827 teamComparator ,
2928 variableSubstitution ,
3029} from './utils' ;
@@ -952,7 +951,7 @@ export class FolderRepositoryManager extends Disposable {
952951 ) ;
953952
954953 if ( githubRepo ) {
955- const pullRequest : PullRequestModel | undefined = await githubRepo . getPullRequest ( prNumber ) ;
954+ const pullRequest : PullRequestModel | undefined = await githubRepo . getPullRequest ( prNumber , 'FolderRepositoryManager.getLocalPullRequests' ) ;
956955
957956 if ( pullRequest ) {
958957 pullRequest . localBranchName = localBranchName ;
@@ -1307,7 +1306,7 @@ export class FolderRepositoryManager extends Disposable {
13071306 async getPullRequestsForCategory ( githubRepository : GitHubRepository , categoryQuery : string , page ?: number ) : Promise < PullRequestData | undefined > {
13081307 try {
13091308 Logger . debug ( `Fetch pull request category ${ categoryQuery } - enter` , this . id ) ;
1310- const { octokit, query , schema } = await githubRepository . ensure ( ) ;
1309+ const { octokit } = await githubRepository . ensure ( ) ;
13111310
13121311 /* __GDPR__
13131312 "pr.search.category" : {
@@ -1323,18 +1322,11 @@ export class FolderRepositoryManager extends Disposable {
13231322 page : page || 1 ,
13241323 } ) ;
13251324
1326- const promises : Promise < { data : PullRequestResponse , repo : GitHubRepository } | undefined > [ ] = data . items . map ( async ( item ) => {
1325+ const promises : Promise < { data : PullRequestModel | undefined , repo : GitHubRepository } | undefined > [ ] = data . items . map ( async ( item ) => {
13271326 const protocol = new Protocol ( item . repository_url ) ;
13281327
13291328 const prRepo = await this . createGitHubRepositoryFromOwnerName ( protocol . owner , protocol . repositoryName ) ;
1330- const { data } = await query < PullRequestResponse > ( {
1331- query : schema . PullRequest ,
1332- variables : {
1333- owner : prRepo . remote . owner ,
1334- name : prRepo . remote . repositoryName ,
1335- number : item . number
1336- }
1337- } ) ;
1329+ const data = await prRepo . getPullRequest ( item . number , 'FolderRepositoryManager.getPullRequestsForCategory' , false , true ) ;
13381330 return { data, repo : prRepo } ;
13391331 } ) ;
13401332
@@ -1343,16 +1335,12 @@ export class FolderRepositoryManager extends Disposable {
13431335
13441336 const pullRequests = ( await Promise . all ( pullRequestResponses
13451337 . map ( async response => {
1346- if ( ! response ?. data . repository ) {
1338+ if ( ! response ?. data ) {
13471339 Logger . appendLine ( 'Pull request doesn\'t appear to exist.' , this . id ) ;
13481340 return null ;
13491341 }
13501342
1351- // Pull requests fetched with a query can be from any repo.
1352- // We need to use the correct GitHubRepository for this PR.
1353- return response . repo . createOrUpdatePullRequestModel (
1354- await parseGraphQLPullRequest ( response . data . repository . pullRequest , response . repo ) , true
1355- ) ;
1343+ return response . data ;
13561344 } ) ) )
13571345 . filter ( item => item !== null ) as PullRequestModel [ ] ;
13581346
@@ -2364,7 +2352,7 @@ export class FolderRepositoryManager extends Disposable {
23642352 const githubRepo = await this . resolveItem ( owner , repositoryName ) ;
23652353 Logger . trace ( `Found GitHub repo for pr #${ pullRequestNumber } : ${ githubRepo ? 'yes' : 'no' } ` , this . id ) ;
23662354 if ( githubRepo ) {
2367- const pr = await githubRepo . getPullRequest ( pullRequestNumber , useCache ) ;
2355+ const pr = await githubRepo . getPullRequest ( pullRequestNumber , 'FolderRepositoryManager.resolvePullRequest' , useCache ) ;
23682356 Logger . trace ( `Found GitHub pr repo for pr #${ pullRequestNumber } : ${ pr ? 'yes' : 'no' } ` , this . id ) ;
23692357 return pr ;
23702358 }
@@ -2644,7 +2632,7 @@ export class FolderRepositoryManager extends Disposable {
26442632 }
26452633
26462634 async fetchById ( githubRepo : GitHubRepository , id : number ) : Promise < PullRequestModel | undefined > {
2647- const pullRequest = await githubRepo . getPullRequest ( id ) ;
2635+ const pullRequest = await githubRepo . getPullRequest ( id , 'FolderRepositoryManager.fetchById' ) ;
26482636 if ( pullRequest ) {
26492637 return pullRequest ;
26502638 } else {
0 commit comments