feat(bulk-model-sync-gradle): configuration options for sync with subtree-skipping

Author: mhuster23

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/ModelSyncGradlePlugin.kt

@@ -77,9 +77,17 @@ class ModelSyncGradlePlugin : Plugin<Project> {
     ) {
         val baseDir = project.layout.buildDirectory.dir("model-sync").get().asFile.apply { mkdirs() }
         val jsonDir = baseDir.resolve(syncDirection.name).apply { mkdir() }
-        val sourceTask = when (syncDirection.source) {
+        val source = syncDirection.source
+
+        val sourceTask = when (source) {
             is LocalSource -> registerTasksForLocalSource(syncDirection, previousTask, jsonDir)
-            is ServerSource -> registerTasksForServerSource(syncDirection, project, previousTask, jsonDir)
+            is ServerSource -> {
+                if (source.baseRevision != null) {
+                    previousTask
+                } else {
+                    registerTasksForServerSource(syncDirection, project, previousTask, jsonDir)
+                }
+            }
             else -> error("Unknown sync direction source")
         }
 
@@ -196,9 +204,10 @@ class ModelSyncGradlePlugin : Plugin<Project> {
         val localTarget = syncDirection.target as LocalTarget
         val importName = "${syncDirection.name}ImportIntoMps"
         val resolvedDependencies = mpsDependencies.resolvedConfiguration.files
+        val hasBaseRevision = (syncDirection.source as? ServerSource)?.baseRevision != null
         val config = MPSRunnerConfig(
             mainClassName = "org.modelix.mps.model.sync.bulk.MPSBulkSynchronizer",
-            mainMethodName = "importRepository",
+            mainMethodName = if (hasBaseRevision) "importRepositoryFromModelServer" else "importRepository",
             classPathElements = resolvedDependencies.toList(),
             mpsHome = localTarget.mpsHome,
             workDir = jsonDir,
@@ -209,6 +218,10 @@ class ModelSyncGradlePlugin : Plugin<Project> {
                 "-Dmodelix.mps.model.sync.bulk.input.modules.prefixes=${syncDirection.includedModulePrefixes.joinToString(",")}",
                 "-Dmodelix.mps.model.sync.bulk.repo.path=${localTarget.repositoryDir?.absolutePath}",
                 "-Dmodelix.mps.model.sync.bulk.input.continueOnError=${syncDirection.continueOnError}",
+                "-Dmodelix.mps.model.sync.bulk.server.repository=${(syncDirection.source as ServerSource).repositoryId}".takeIf { hasBaseRevision },
+                "-Dmodelix.mps.model.sync.bulk.server.url=${(syncDirection.source as ServerSource).url}".takeIf { hasBaseRevision },
+                "-Dmodelix.mps.model.sync.bulk.server.version.hash=${(syncDirection.source as ServerSource).revision}".takeIf { hasBaseRevision },
+                "-Dmodelix.mps.model.sync.bulk.server.version.base.hash=${(syncDirection.source as ServerSource).baseRevision}".takeIf { hasBaseRevision },
                 "-Xmx${localTarget.mpsHeapSize}",
                 localTarget.mpsDebugPort?.let { "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=$it" },
             ),

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/config/ModelSyncGradleSettings.kt

@@ -153,6 +153,7 @@ data class ServerSource(
     override var branchName: String? = null,
     override var requestTimeoutSeconds: Int = DEFAULT_REQUEST_TIMEOUT_SECONDS,
     var revision: String? = null,
+    var baseRevision: String? = null,
 ) : ServerEndpoint {
     override fun getValidationErrors(): List<String> {
         val errors = mutableListOf<String>()

docs/global/modules/core/pages/reference/component-bulk-model-sync-gradle.adoc

@@ -117,7 +117,7 @@ mpsBuild {
 === ServerSource/-Target configuration
 [WARNING]
 --
-In the future you will be required to specify a `repositoryId` along the`revision`.
+In the future you will be required to specify a `repositoryId` along the `revision`.
 --
 [%header, cols="1,1,2"]
 |===
@@ -144,6 +144,10 @@ If the target branch does not exist on the model-server, it will be created.
 |Source model-server revision. Can be used instead of `repositoryId` and `branchName`.
 Only available in ServerSource.
 
+|`baseRevision`
+|String
+|Source model-server base revision. If specified, only the subtrees that changed between `baseRevision` and `revision` will be synchronized. Only available in ServerSource.
+
 |`requestTimeoutSeconds`
 |Integer
 |The request timeout measured in seconds to apply when performing HTTP requests towards the model-server.