ScriptCollection 3.5.116__py3-none-any.whl → 3.5.117__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ScriptCollection/ScriptCollectionCore.py +6 -4
- {scriptcollection-3.5.116.dist-info → scriptcollection-3.5.117.dist-info}/METADATA +1 -1
- {scriptcollection-3.5.116.dist-info → scriptcollection-3.5.117.dist-info}/RECORD +6 -6
- {scriptcollection-3.5.116.dist-info → scriptcollection-3.5.117.dist-info}/WHEEL +0 -0
- {scriptcollection-3.5.116.dist-info → scriptcollection-3.5.117.dist-info}/entry_points.txt +0 -0
- {scriptcollection-3.5.116.dist-info → scriptcollection-3.5.117.dist-info}/top_level.txt +0 -0
|
@@ -33,7 +33,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
|
|
|
33
33
|
from .ProgramRunnerPopen import ProgramRunnerPopen
|
|
34
34
|
from .ProgramRunnerEpew import ProgramRunnerEpew, CustomEpewArgument
|
|
35
35
|
|
|
36
|
-
version = "3.5.
|
|
36
|
+
version = "3.5.117"
|
|
37
37
|
__version__ = version
|
|
38
38
|
|
|
39
39
|
|
|
@@ -474,9 +474,11 @@ class ScriptCollectionCore:
|
|
|
474
474
|
if pull_first_if_there_are_no_uncommitted_changes:
|
|
475
475
|
uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
|
|
476
476
|
if not uncommitted_changes:
|
|
477
|
-
self.
|
|
478
|
-
|
|
479
|
-
|
|
477
|
+
is_pullable: bool = self.git_commit_is_ancestor(repository_folder, branch, f"{remote}/{branch}")
|
|
478
|
+
if is_pullable:
|
|
479
|
+
self.git_pull(repository_folder, remote, branch, branch)
|
|
480
|
+
uncommitted_changes = self.git_repository_has_uncommitted_changes(repository_folder)
|
|
481
|
+
GeneralUtilities.assert_condition(not uncommitted_changes, f"Pulling remote \"{remote}\" in \"{repository_folder}\" caused new uncommitted files.")
|
|
480
482
|
self.git_checkout(repository_folder, branch)
|
|
481
483
|
self.git_commit(repository_folder, "Automatic commit due to merge")
|
|
482
484
|
self.git_fetch(repository_folder, remote)
|
|
@@ -6,11 +6,11 @@ ScriptCollection/ProgramRunnerBase.py,sha256=2kMIAqdc65UjBAddOZkzy_aFx9h5roZ5a4b
|
|
|
6
6
|
ScriptCollection/ProgramRunnerEpew.py,sha256=4pjEd0r9Fcz3TTDv0MdTSd5KkigYXcWUVI1X43regfU,6477
|
|
7
7
|
ScriptCollection/ProgramRunnerPopen.py,sha256=BPY7-ZMIlqT7JOKz8qlB5c0laF2Js-ijzqk09GxZC48,3821
|
|
8
8
|
ScriptCollection/SCLog.py,sha256=5qjOBYiliyHV57GY8Y5dgUek512EVI8AzBF288R4fn4,2377
|
|
9
|
-
ScriptCollection/ScriptCollectionCore.py,sha256=
|
|
9
|
+
ScriptCollection/ScriptCollectionCore.py,sha256=i2go86C1-i4iNUAC0rC4p607FR9b7p4Z2vzJdHbofhY,131657
|
|
10
10
|
ScriptCollection/TasksForCommonProjectStructure.py,sha256=OfCJsg-FLdde6Duhy4FjBcfwLr-9iLhQAimRa1ZgRyE,234045
|
|
11
11
|
ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
12
|
-
scriptcollection-3.5.
|
|
13
|
-
scriptcollection-3.5.
|
|
14
|
-
scriptcollection-3.5.
|
|
15
|
-
scriptcollection-3.5.
|
|
16
|
-
scriptcollection-3.5.
|
|
12
|
+
scriptcollection-3.5.117.dist-info/METADATA,sha256=zBJ-RUNIjTfjFRr82kLYlKy_7yYJ4dFmXTEUxAFutQE,7694
|
|
13
|
+
scriptcollection-3.5.117.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
|
|
14
|
+
scriptcollection-3.5.117.dist-info/entry_points.txt,sha256=3qMbfZEMhc_VTJj-bcLwB8AWcn9iXSB3l0AWpuu52Bs,3689
|
|
15
|
+
scriptcollection-3.5.117.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
|
|
16
|
+
scriptcollection-3.5.117.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|