ScriptCollection 3.5.114__py3-none-any.whl → 3.5.115__py3-none-any.whl

ScriptCollection/ScriptCollectionCore.py

@@ -33,7 +33,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
 from .ProgramRunnerPopen import ProgramRunnerPopen
 from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
 
-version = "3.5.114"
+version = "3.5.115"
 __version__ = version
 
 
@@ -469,6 +469,21 @@ class ScriptCollectionCore:
         if undo_all_changes_after_checkout:
             self.git_undo_all_changes(directory)
 
+    @GeneralUtilities.check_arguments
+    def merge_repository(self, repository_folder: str, remote: str, branch: str, pull_first_if_there_are_no_uncommitted_changes: bool = True):
+        if pull_first_if_there_are_no_uncommitted_changes:
+            uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
+            if not uncommitted_changes:
+                self.git_pull(repository_folder, remote, branch, branch)
+                uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
+                GeneralUtilities.assert_condition(not uncommitted_changes, f"Pulling remote \"{remote}\" in \"{repository_folder}\" caused new uncommitted files.")
+        self.git_checkout(repository_folder, branch)
+        self.git_commit(repository_folder, "Automatic commit due to merge")
+        self.git_fetch(repository_folder, remote)
+        self.git_merge(repository_folder, f"{remote}/{branch}", branch)
+        self.git_push_with_retry(repository_folder, remote, branch, branch)
+        self.git_checkout(repository_folder, branch)
+
     @GeneralUtilities.check_arguments
     def git_merge_abort(self, directory: str) -> None:
         self.assert_is_git_repository(directory)

{scriptcollection-3.5.114.dist-info → scriptcollection-3.5.115.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScriptCollection
-Version: 3.5.114
+Version: 3.5.115
 Summary: The ScriptCollection is the place for reusable scripts.
 Home-page: https://github.com/anionDev/ScriptCollection
 Author: Marius Göcke

{scriptcollection-3.5.114.dist-info → scriptcollection-3.5.115.dist-info}/RECORD

@@ -6,11 +6,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
 ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
 ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
 ScriptCollection/SCLog.py,sha256=5qjOBYiliyHV57GY8Y5dgUek512EVI8AzBF288R4fn4,2377
-ScriptCollection/ScriptCollectionCore.py,sha256=21z_31w4QQOJWxU7o_ByGoQ7ZDX8i1t-h2YXjDEYMPQ,130404
+ScriptCollection/ScriptCollectionCore.py,sha256=GdoH7P6iAgIYVNg_7zbcEGS2tDd2mY1zNoIbSlGdBdM,131500
 ScriptCollection/TasksForCommonProjectStructure.py,sha256=d-fbnVk6DvsOIppn-rDslBHhMOsuPFAMRIacvu-F5eo,233988
 ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scriptcollection-3.5.114.dist-info/METADATA,sha256=Zm0Jk650RKLdLRpBa584_HYg8n14MCno5lSJ5ils1b4,7694
-scriptcollection-3.5.114.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-scriptcollection-3.5.114.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
-scriptcollection-3.5.114.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
-scriptcollection-3.5.114.dist-info/RECORD,,
+scriptcollection-3.5.115.dist-info/METADATA,sha256=PHmpwtvb892XkYTsogu0aRnXb8MpLS2VGyz2r62jt78,7694
+scriptcollection-3.5.115.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+scriptcollection-3.5.115.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
+scriptcollection-3.5.115.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
+scriptcollection-3.5.115.dist-info/RECORD,,

{scriptcollection-3.5.114.dist-info → scriptcollection-3.5.115.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any