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

mercurial support for directory structures

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-10-23 16:39:09 +02:00
parent fc5c1f2a44
commit 09dc9af0cb
6 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/UnixHgInstaller.java
View File

@@ -77,7 +77,6 @@ public class UnixHgInstaller extends AbstractHgInstaller
super.install(baseDirectory, config);
// search mercurial (hg)
if (Util.isEmpty(config.getHgBinary()))
{
String hg = IOUtil.search(COMMAND_HG);
@@ -100,9 +99,8 @@ public class UnixHgInstaller extends AbstractHgInstaller
}
}
}
// search python
// search python
if (Util.isEmpty(config.getPythonBinary()))
{
config.setPythonBinary(IOUtil.search(COMMAND_PYTHON));

13
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/installer/WindowsHgInstaller.java
View File

@@ -272,8 +272,9 @@ public class WindowsHgInstaller extends AbstractHgInstaller
IOUtil.copy(templateDirectory, new File(libDir, FILE_TEMPLATES));
}
File hg = new File( hgDirectory, FILE_MERCURIAL_EXE );
if ( hg.exists() )
File hg = new File(hgDirectory, FILE_MERCURIAL_EXE);
if (hg.exists())
{
config.setHgBinary(hg.getAbsolutePath());
}
@@ -322,8 +323,8 @@ public class WindowsHgInstaller extends AbstractHgInstaller
private File getMercurialDirectory(String hgBinary)
{
File directory = null;
if ( Util.isNotEmpty(hgBinary) )
if (Util.isNotEmpty(hgBinary))
{
File hg = new File(hgBinary);
@@ -332,8 +333,8 @@ public class WindowsHgInstaller extends AbstractHgInstaller
directory = hg.getParentFile();
}
}
if ( directory == null )
if (directory == null)
{
directory = getMercurialDirectoryFromRegistry();
}