Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +01:00
Code Issues Packages Projects Releases Activity

Minimal cleanup

Browse Source
This commit is contained in:
René Pfeuffer
2019-03-29 13:25:22 +01:00
parent 9833bfd34d
commit bf84037019
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgHookChangesetProvider.java
View File

@@ -127,7 +127,8 @@ public class HgHookChangesetProvider implements HookChangesetProvider
boolean pending = type == RepositoryHookType.PRE_RECEIVE; boolean pending = type == RepositoryHookType.PRE_RECEIVE;
// TODO get repository encoding // TODO get repository encoding
return HgUtil.open(handler, hookManager, repositoryDirectory, null, pending); return HgUtil.open(handler, hookManager, repositoryDirectory, null,
pending);
} }
//~--- fields --------------------------------------------------------------- //~--- fields ---------------------------------------------------------------

4
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceResolver.java
View File

@@ -47,8 +47,8 @@ import sonia.scm.repository.Repository;
public class HgRepositoryServiceResolver implements RepositoryServiceResolver public class HgRepositoryServiceResolver implements RepositoryServiceResolver
{ {
private final HgRepositoryHandler handler; private HgRepositoryHandler handler;
private final HgHookManager hookManager; private HgHookManager hookManager;
@Inject @Inject
public HgRepositoryServiceResolver(HgRepositoryHandler handler, public HgRepositoryServiceResolver(HgRepositoryHandler handler,

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
View File

@@ -102,8 +102,6 @@ public class BranchRootResourceTest extends RepositoryTestBase {
branchRootResource = new BranchRootResource(serviceFactory, branchToDtoMapper, branchCollectionToDtoMapper, changesetCollectionToDtoMapper, resourceLinks); branchRootResource = new BranchRootResource(serviceFactory, branchToDtoMapper, branchCollectionToDtoMapper, changesetCollectionToDtoMapper, resourceLinks);
super.branchRootResource = Providers.of(branchRootResource); super.branchRootResource = Providers.of(branchRootResource);
dispatcher = DispatcherMock.createDispatcher(getRepositoryRootResource()); dispatcher = DispatcherMock.createDispatcher(getRepositoryRootResource());
// dispatcher.getRegistry().addSingletonResource(getRepositoryRootResource());
when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(service); when(serviceFactory.create(new NamespaceAndName("space", "repo"))).thenReturn(service);
when(serviceFactory.create(any(Repository.class))).thenReturn(service); when(serviceFactory.create(any(Repository.class))).thenReturn(service);
when(service.getRepository()).thenReturn(new Repository("repoId", "git", "space", "repo")); when(service.getRepository()).thenReturn(new Repository("repoId", "git", "space", "repo"));