Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 14:05:44 +01:00
Code Issues Packages Projects Releases Activity

Remove hooks for internal repository id

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-23 16:12:35 +01:00
parent 1a9c3a1a6c
commit c8fc673ce0
10 changed files with 44 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
View File

@@ -118,14 +118,14 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
try
{
Repository repository = rpack.getRepository();
String id = resolveRepositoryId(repository);
sonia.scm.repository.Repository scmRepository = resolveRepositoryId(repository);
logger.trace("resolved repository to id {}", id);
logger.trace("resolved repository to {}", scmRepository.getNamespaceAndName());
GitHookContextProvider context = new GitHookContextProvider(rpack,
receiveCommands);
hookEventFacade.handle(id).fireHookEvent(type, context);
hookEventFacade.handle(scmRepository).fireHookEvent(type, context);
}
catch (Exception ex)
@@ -177,7 +177,7 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
*
* @throws IOException
*/
private String resolveRepositoryId(Repository repository)
private sonia.scm.repository.Repository resolveRepositoryId(Repository repository)
{
File directory;
@@ -190,7 +190,7 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
directory = repository.getWorkTree();
}
return repositoryDAO.getIdForDirectory(directory);
return repositoryDAO.getRepositoryForDirectory(directory);
}
//~--- fields ---------------------------------------------------------------