diff --git a/src/main/scala/Vcs.scala b/src/main/scala/Vcs.scala index 92c22709..9d9cfc7a 100644 --- a/src/main/scala/Vcs.scala +++ b/src/main/scala/Vcs.scala @@ -240,10 +240,10 @@ class Subversion(val baseDir: File) extends Vcs { override def status: ProcessBuilder = cmd("status", "-q") lazy val workingDirSvnUrl:String = { - val svnInfo = cmd("info").!! val svnInfoUrlKey = "URL: " + val svnInfo: String = cmd("info").lines.mkString("\n") val urlStartIdx = svnInfo.indexOf(svnInfoUrlKey) + svnInfoUrlKey.length - svnInfo.substring(urlStartIdx, svnInfo.indexOf('\n', urlStartIdx)-1) + svnInfo.substring(urlStartIdx, svnInfo.indexOf('\n', urlStartIdx)).trim } lazy val repoRoot:String = { @@ -252,7 +252,7 @@ class Subversion(val baseDir: File) extends Vcs { workingDirSvnUrl.indexOf("/branches"), workingDirSvnUrl.indexOf("/tags") ).filter(_ >= 0) - require(!svnBaseUrlEndIdxOptions.isEmpty, "No /trunk, /branches or /tags part found in svn url. Base url cannot be extracted.") + require(!svnBaseUrlEndIdxOptions.isEmpty, "No /trunk, /branches or /tags part found in svn url. Base url cannot be extracted. Url: " + workingDirSvnUrl) val svnBaseUrlEndIdx = svnBaseUrlEndIdxOptions.head workingDirSvnUrl.substring(0, svnBaseUrlEndIdx + 1) }