diff --git a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo1.py b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo1.py new file mode 100644 index 00000000..216d047d --- /dev/null +++ b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo1.py @@ -0,0 +1,14 @@ +def fac(n): + if n == 1: + return 1 + else: + return n*fac(n-1) + +def demo(): + print("Demo") + print(f'fac(6) = {fac(6)}') + +if __name__ == '__main__': + demo() + + diff --git a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo2.py b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo2.py new file mode 100644 index 00000000..ff0f1aff --- /dev/null +++ b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/demo2.py @@ -0,0 +1,15 @@ +def fac(n): + r = 1 + for i in range(2, n+1): + print(i) + r *= i + return r + +def demo(): + print("Demo") + print(f'fac(6) = {fac(6)}') + +if __name__ == '__main__': + demo() + + diff --git a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/zusammenarbeit-rebasing-sandbox.kt b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/zusammenarbeit-rebasing-sandbox.kt index 2c8ff9f8..f256ec6d 100644 --- a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/zusammenarbeit-rebasing-sandbox.kt +++ b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshop/zusammenarbeit-rebasing-sandbox.kt @@ -12,7 +12,22 @@ fun CollectionOfSamples.rebasingSandbox() { """ ) { createRepo("repo-rebase") { - createFileAndCommit("hello") { content = "hallo welt" } + createFileAndCommit("hello") { content = """ + def fac(n): + if n == 1: + return 1 + else: + return n*fac(n-1) + + def demo(): + print("Demo") + print(f'fac(6) = {fac(6)}') + + if __name__ == '__main__': + demo() + + """.trimIndent() + } startBranch("feature") { editAndCommit("hello", "Uppercase hello") { content = "Hallo Welt" } diff --git a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsamples.kt b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsamples.kt index 9635e384..4a5c2fa6 100644 --- a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsamples.kt +++ b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsamples.kt @@ -48,6 +48,7 @@ fun buildGitUebungen() { } thema("Weihnachten") { + rebasingSandbox() gitmas() } } diff --git a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsandbox.kt b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsandbox.kt index 9c8578ff..2acdad2f 100644 --- a/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsandbox.kt +++ b/generator/src/main/kotlin/de/kapitel26/gitsamplebuilder/gitworkshopsandbox.kt @@ -11,9 +11,9 @@ fun main() { thema("beispiel") { // halloWelt() - // rebasingSandbox() + rebasingSandbox() //repositoryUntersuchen() - reverting() + // reverting() // commitsErstellen() // staging() // cloning()