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

fix git hooks for repository structures

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-01-04 17:04:14 +01:00
parent 8c20f9ef65
commit 029dc643e5
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Collection;
import sonia.scm.repository.RepositoryUtil;
/**
*
@@ -93,9 +94,10 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
*
* @param repositoryManager
*/
public GitReceiveHook(RepositoryManager repositoryManager)
public GitReceiveHook(RepositoryManager repositoryManager, GitRepositoryHandler handler)
{
this.repositoryManager = repositoryManager;
this.handler = handler;
}
//~--- methods --------------------------------------------------------------
@@ -213,7 +215,7 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
{
try
{
String repositoryName = directory.getName();
String repositoryName = RepositoryUtil.getRepositoryName(handler, directory);
GitRepositoryHookEvent e = new GitRepositoryHookEvent(directory, newId,
oldId, type);
@@ -364,4 +366,7 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
/** Field description */
private RepositoryManager repositoryManager;
/** Field description */
private GitRepositoryHandler handler;
}

5
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java
View File

@@ -44,6 +44,7 @@ import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
import sonia.scm.repository.GitRepositoryHandler;
import sonia.scm.repository.RepositoryManager;
//~--- JDK imports ------------------------------------------------------------
@@ -65,9 +66,9 @@ public class GitReceivePackFactory
* @param repositoryManager
*/
@Inject
public GitReceivePackFactory(RepositoryManager repositoryManager)
public GitReceivePackFactory(RepositoryManager repositoryManager, GitRepositoryHandler handler)
{
hook = new GitReceiveHook(repositoryManager);
hook = new GitReceiveHook(repositoryManager, handler);
}
//~--- methods --------------------------------------------------------------