fix(repos): 无法获取远程版本的问题。

This commit is contained in:
Ivan 2021-02-24 10:45:33 +08:00
parent 9470aa8f8a
commit 42c389b913
4 changed files with 12 additions and 28 deletions

3
.gitignore vendored
View File

@ -33,5 +33,4 @@ lerna-debug.log*
!.vscode/launch.json
!.vscode/extensions.json
workspaces/*
!workspaces/.gitkeep
/config.yml

View File

@ -1,13 +0,0 @@
env: dev
http:
port: 7122
db:
postgres:
host: 192.168.31.194
port: 5432
database: fennec
username: fennec
password:
workspaces:
root: 'E:\Projects\demos\workspaces'

View File

@ -3,10 +3,10 @@ import { getRepositoryToken } from '@nestjs/typeorm';
import { Project } from '../projects/project.entity';
import { ReposService } from './repos.service';
import { ConfigService } from '@nestjs/config';
import { rm, unlink } from 'fs/promises';
import { rm } from 'fs/promises';
import { join } from 'path';
const workspacesRoot = '/Users/ivanli/Projects/fennec/workspaces';
const workspacesRoot = 'E:\\Projects\\demos\\workspaces';
describe('ReposService', () => {
let service: ReposService;
@ -21,7 +21,15 @@ describe('ReposService', () => {
}),
),
}));
afterEach(async () => {
await rm(join(workspacesRoot, 'test1'), {
recursive: true,
}).catch(() => undefined);
});
beforeEach(async () => {
await rm(join(workspacesRoot, 'test1'), {
recursive: true,
}).catch(() => undefined);
const module: TestingModule = await Test.createTestingModule({
providers: [
ReposService,
@ -47,9 +55,6 @@ describe('ReposService', () => {
expect(service).toBeDefined();
});
describe('listLogs', () => {
beforeEach(async () => {
await rm(join(workspacesRoot, 'test1'), { recursive: true });
});
it('should be return logs', async () => {
const result = await service.listLogs({ projectId: '1' });
expect(result).toBeDefined();

View File

@ -34,7 +34,6 @@ export class ReposService {
if (firstInit) {
await git.init();
await git.addRemote('origin', project.sshUrl);
// await git.clone(project.sshUrl, workspacePath);
}
return git;
}
@ -44,13 +43,7 @@ export class ReposService {
id: dto.projectId,
});
const git = await this.getGit(project);
await git
.outputHandler((command, stdout, stderr) => {
stdout.pipe(process.stdout);
stderr.pipe(process.stderr);
})
.fetch();
// await git.checkoutBranch('master', 'origin/master');
await git.fetch();
return await git.log({
'--branches': dto.branch ?? '',
'--remotes': 'origin',