src/main/kotlin/de/uapcore/lightpit/vcs/HgConnector.kt

changeset 281
c15b9555ecf3
parent 280
12b898531d1a
     1.1 --- a/src/main/kotlin/de/uapcore/lightpit/vcs/HgConnector.kt	Tue Jul 18 18:05:49 2023 +0200
     1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/vcs/HgConnector.kt	Sat Jul 22 11:32:27 2023 +0200
     1.3 @@ -27,7 +27,6 @@
     1.4  package de.uapcore.lightpit.vcs
     1.5  
     1.6  import java.nio.file.Files
     1.7 -import java.nio.file.Path
     1.8  import kotlin.io.path.ExperimentalPathApi
     1.9  import kotlin.io.path.deleteRecursively
    1.10  
    1.11 @@ -42,7 +41,7 @@
    1.12       * Checks, if the specified binary is available and executable.
    1.13       */
    1.14      fun checkAvailability(): Boolean {
    1.15 -        return when (val versionInfo = invokeCommand(Path.of("."), "--version")) {
    1.16 +        return when (val versionInfo = invokeCommand("--version")) {
    1.17              is VcsConnectorResult.Success -> versionInfo.content.contains("Mercurial")
    1.18              else -> false
    1.19          }
    1.20 @@ -61,13 +60,15 @@
    1.21          } catch (e: Throwable) {
    1.22              return VcsConnectorResult.Error("Creating temporary directory for VCS connection failed: " + e.message)
    1.23          }
    1.24 -        val init = invokeCommand(tmpDir, "init")
    1.25 +        val init = invokeCommand("init", workingDir = tmpDir)
    1.26          if (init is VcsConnectorResult.Error) {
    1.27              return init
    1.28          }
    1.29  
    1.30          val commitLogContent = when (val result = invokeCommand(
    1.31 -            tmpDir, "incoming", pathOrUrl, "-n", "--template", "::lpitref::{node}:{desc}\\n"
    1.32 +            "incoming", pathOrUrl, "-n", "--template", "::lpitref::{node}:{desc}\\n",
    1.33 +            workingDir = tmpDir,
    1.34 +            timeout = 60
    1.35          )) {
    1.36              is VcsConnectorResult.Error -> return result
    1.37              is VcsConnectorResult.Success -> result.content

mercurial