refactor(mercurial): Introduce a runHg() helper extension function

Signed-off-by: Sebastian Schuberth <[email protected]>

Author: sschuberth

plugins/version-control-systems/mercurial/src/main/kotlin/Mercurial.kt

@@ -47,6 +47,9 @@ internal object MercurialCommand : CommandLineTool {
         }.orEmpty()
 }
 
+internal fun MercurialWorkingTree.runHg(vararg args: String) =
+    MercurialCommand.run(*args, workingDir = workingDir).requireSuccess()
+
 @OrtPlugin(
     displayName = "Mercurial",
     description = "A VCS implementation to interact with Mercurial repositories.",
@@ -103,15 +106,17 @@ class Mercurial(override val descriptor: PluginDescriptor = MercurialFactory.des
 
     override fun updateWorkingTree(workingTree: WorkingTree, revision: String, path: String, recursive: Boolean) =
         runCatching {
+            check(workingTree is MercurialWorkingTree)
+
             // To safe network bandwidth, only pull exactly the revision we want. Do not use "-u" to update the
             // working tree just yet, as Mercurial would only update if new changesets were pulled. But that might
             // not be the case if the requested revision is already available locally.
-            MercurialCommand.run(workingTree.getRootPath(), "pull", "-r", revision).requireSuccess()
+            workingTree.runHg("pull", "-r", revision)
 
             // TODO: Implement updating of subrepositories.
 
             // Explicitly update the working tree to the desired revision.
-            MercurialCommand.run(workingTree.getRootPath(), "update", revision).isSuccess
+            workingTree.runHg("update", revision).isSuccess
         }.map {
             revision
         }

plugins/version-control-systems/mercurial/src/main/kotlin/MercurialWorkingTree.kt

@@ -34,15 +34,14 @@ internal class MercurialWorkingTree(workingDir: File, vcsType: VcsType) : Workin
 
     override fun isShallow() = false
 
-    override fun getRemoteUrl() = MercurialCommand.run(workingDir, "paths", "default").requireSuccess().stdout.trimEnd()
+    override fun getRemoteUrl() = runHg("paths", "default").stdout.trimEnd()
 
-    override fun getRevision() =
-        MercurialCommand.run(workingDir, "--debug", "id", "-i").requireSuccess().stdout.trimEnd()
+    override fun getRevision() = runHg("--debug", "id", "-i").stdout.trimEnd()
 
-    override fun getRootPath() = File(MercurialCommand.run(workingDir, "root").requireSuccess().stdout.trimEnd())
+    override fun getRootPath() = File(runHg("root").stdout.trimEnd())
 
     override fun listRemoteBranches(): List<String> {
-        val branches = MercurialCommand.run(workingDir, "branches").requireSuccess().stdout.trimEnd()
+        val branches = runHg("branches").stdout.trimEnd()
         return branches.lines().map {
             it.substringBefore(' ')
         }.sorted()
@@ -51,8 +50,8 @@ internal class MercurialWorkingTree(workingDir: File, vcsType: VcsType) : Workin
     override fun listRemoteTags(): List<String> {
         // Mercurial does not have the concept of global remote tags. Its "regular tags" are defined per
         // branch as part of the committed ".hgtags" file. See https://stackoverflow.com/a/2059189/1127485.
-        MercurialCommand.run(workingDir, "pull", "-r", "default").requireSuccess()
-        val tags = MercurialCommand.run(workingDir, "cat", "-r", "default", ".hgtags").requireSuccess().stdout.trimEnd()
+        runHg("pull", "-r", "default")
+        val tags = runHg("cat", "-r", "default", ".hgtags").stdout.trimEnd()
         return tags.lines().map {
             it.substringAfterLast(' ')
         }.sorted()