Skip to content

Commit 6bcb977

Browse files
fix merge issue
1 parent 5f59ac0 commit 6bcb977

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

packages/backend/src/repoIndexManager.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
import * as Sentry from '@sentry/node';
22
import { PrismaClient, Repo, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
3-
import { createLogger, Logger } from "@sourcebot/shared";
4-
import { env, RepoIndexingJobMetadata, repoIndexingJobMetadataSchema, RepoMetadata, repoMetadataSchema, getRepoPath } from '@sourcebot/shared';
3+
import { createLogger, env, getRepoPath, Logger, RepoIndexingJobMetadata, repoIndexingJobMetadataSchema, RepoMetadata, repoMetadataSchema } from "@sourcebot/shared";
4+
import { DelayedError, Job, Queue, Worker } from "bullmq";
55
import { existsSync } from 'fs';
66
import { readdir, rm } from 'fs/promises';
7-
import { DelayedError, Job, Queue, Worker } from "bullmq";
87
import { Redis } from 'ioredis';
9-
import Redlock, { ExecutionError } from 'redlock';
108
import micromatch from 'micromatch';
11-
import { WORKER_STOP_GRACEFUL_TIMEOUT_MS, INDEX_CACHE_DIR } from './constants.js';
9+
import Redlock, { ExecutionError } from 'redlock';
10+
import { INDEX_CACHE_DIR, WORKER_STOP_GRACEFUL_TIMEOUT_MS } from './constants.js';
1211
import { cloneRepository, fetchRepository, getBranches, getCommitHashForRefName, getLatestCommitTimestamp, getLocalDefaultBranch, getTags, isPathAValidGitRepoRoot, unsetGitConfig, upsertGitConfig } from './git.js';
1312
import { captureEvent } from './posthog.js';
1413
import { PromClient } from './promClient.js';
1514
import { RepoWithConnections, Settings } from "./types.js";
16-
import { getAuthCredentialsForRepo, getShardPrefix, groupmqLifecycleExceptionWrapper, measure, setIntervalAsync } from './utils.js';
1715
import { getAuthCredentialsForRepo, getShardPrefix, measure, setIntervalAsync } from './utils.js';
1816
import { cleanupTempShards, indexGitRepository } from './zoekt.js';
1917

0 commit comments

Comments
 (0)