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

fix mercurial push with symbolic links

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-12-23 11:32:40 +01:00
parent 03c6fd51ef
commit 8bce0b4906
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/web/HgHookCallbackServlet.java
View File

@@ -57,6 +57,7 @@ import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -337,16 +338,31 @@ public class HgHookCallbackServlet extends HttpServlet
if (Util.isNotEmpty(path)) if (Util.isNotEmpty(path))
{ {
int directoryLength =
handler.getConfig().getRepositoryDirectory().getAbsolutePath().length();
if (directoryLength < path.length()) /**
* use canonical path to fix symbolic links
* https://bitbucket.org/sdorra/scm-manager/issue/82/symbolic-link-in-hg-repository-path
*/
try
{ {
name = IOUtil.trimSeperatorChars(path.substring(directoryLength)); path = new File(path).getCanonicalPath();
int directoryLength =
handler.getConfig().getRepositoryDirectory().getCanonicalPath()
.length();
if (directoryLength < path.length())
{
name = IOUtil.trimSeperatorChars(path.substring(directoryLength));
}
else if (logger.isWarnEnabled())
{
logger.warn("path is shorter as the main hg repository path");
}
} }
else if (logger.isWarnEnabled()) catch (IOException ex)
{ {
logger.warn("path is shorter as the main hg repository path"); logger.error("could not find name of repository", ex);
} }
} }
else if (logger.isWarnEnabled()) else if (logger.isWarnEnabled())