Skip to content
This repository was archived by the owner on Jan 22, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions src/libs/code_intelligence/utils/file_info.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Observable, zip } from 'rxjs'
import { map, switchMap } from 'rxjs/operators'
import { FileInfo } from '..'
import { resolveRev, retryWhenCloneInProgressError } from '../../../shared/repo/backend'

export const ensureRevisionsAreCloned = (files: Observable<FileInfo>): Observable<FileInfo> =>
files.pipe(
switchMap(({ repoPath, rev, baseRev, ...rest }) => {
// Although we get the commit SHA's from elesewhere, we still need to
// use `resolveRev` otherwise we can't guarantee Sourcegraph has the
// revision cloned.
const resolvingHeadRev = resolveRev({ repoPath, rev }).pipe(retryWhenCloneInProgressError())
const resolvingBaseRev = resolveRev({ repoPath, rev: baseRev }).pipe(retryWhenCloneInProgressError())

return zip(resolvingHeadRev, resolvingBaseRev).pipe(map(() => ({ repoPath, rev, baseRev, ...rest })))
})
)
3 changes: 2 additions & 1 deletion src/libs/github/file_info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { filter, map, switchMap } from 'rxjs/operators'
import { GitHubBlobUrl } from '.'
import { resolveRev, retryWhenCloneInProgressError } from '../../shared/repo/backend'
import { FileInfo } from '../code_intelligence'
import { ensureRevisionsAreCloned } from '../code_intelligence/utils/file_info'
import { getCommitIDFromPermalink } from './scrape'
import { getDeltaFileName, getDiffResolvedRev, getGitHubState, parseURL } from './util'

Expand Down Expand Up @@ -85,7 +86,7 @@ export const resolveFileInfo = (): Observable<FileInfo> => {
filePath,
commitID,
rev: rev || commitID,
})
}).pipe(ensureRevisionsAreCloned)
} catch (error) {
return throwError(error)
}
Expand Down
2 changes: 1 addition & 1 deletion src/libs/gitlab/file_info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const resolveFileInfo = (): Observable<FileInfo> => {
filePath,
commitID,
rev,
})
}).pipe(ensureRevisionsAreCloned)
} catch (error) {
return throwError(error)
}
Expand Down