Monticello dependencies

pharo-project · Nov 2, 2019 · 70d198b · 70d198b
1 parent 1c5826b
commit 70d198b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git a/src/Monticello/CommandLineUIManager.extension.st b/src/Monticello/CommandLineUIManager.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #CommandLineUIManager }
+
+{ #category : #'*Monticello' }
+CommandLineUIManager >> merge: merger informing: aString [
+	"Check for conflicts, if there are none, just continue. 
+	 Merger will accept all conflicts"
+	merger hasConflicts ifFalse: [ ^ self ].
+	self abort: aString title: 'Conflict detected'
+]
diff --git a/src/Monticello/NonInteractiveUIManager.extension.st b/src/Monticello/NonInteractiveUIManager.extension.st
@@ -0,0 +1,9 @@
+Extension { #name : #NonInteractiveUIManager }
+
+{ #category : #'*Monticello' }
+NonInteractiveUIManager >> merge: merger informing: aString [
+	"Check for conflicts, if there are none, just continue. 
+	 Merger will accept all conflicts"
+	super merge: merger informing: aString.
+	merger hasConflicts ifTrue: [ self exitFailure ]
+]
diff --git a/src/System-DependenciesTests/SystemDependenciesTest.class.st b/src/System-DependenciesTests/SystemDependenciesTest.class.st
@@ -68,7 +68,7 @@ SystemDependenciesTest >> knownCompilerDependencies [
 
 	"ideally this list should be empty"	
 
-	^ #(#DeprecatedFileStream #'FileSystem-Core' #Monticello #'System-Changes' #'System-Localization' #'Transcript-Core')
+	^ #(#DeprecatedFileStream #'FileSystem-Core' #'System-Changes' #'System-Localization' #'Transcript-Core')
 ]
 
 { #category : #'known dependencies' }
@@ -84,7 +84,7 @@ SystemDependenciesTest >> knownFileSystemDependencies [
 
 	"ideally this list should be empty"	
 
-	^ #(#Monticello #'System-Changes' #'System-Localization' #'Transcript-Core' #'Zinc-Resource-Meta-Core')
+	^ #(#'System-Changes' #'System-Localization' #'Transcript-Core' #'Zinc-Resource-Meta-Core')
 ]
 
 { #category : #'known dependencies' }
@@ -101,7 +101,7 @@ SystemDependenciesTest >> knownKernelDependencies [
 
 	"ideally this list should be empty"	
 
-	^ #(#'FileSystem-Core' #Monticello #'OpalCompiler-Core' #'System-Changes' #'AST-Core')
+	^ #(#'FileSystem-Core' #'OpalCompiler-Core' #'System-Changes' #'AST-Core')
 ]
 
 { #category : #'known dependencies' }
@@ -157,7 +157,7 @@ SystemDependenciesTest >> knownSUnitKernelDependencies [
 
 	"ideally this list should be empty"	
 
-	^ #(#'FileSystem-Core' #Monticello #'OpalCompiler-Core' #'System-Changes' #'AST-Core')
+	^ #(#'FileSystem-Core' #'OpalCompiler-Core' #'System-Changes' #'AST-Core')
 ]
 
 { #category : #'known dependencies' }

diff --git a/src/UIManager/CommandLineUIManager.class.st b/src/UIManager/CommandLineUIManager.class.st
@@ -273,14 +273,6 @@ CommandLineUIManager >> logYellowDuring: aBlock [
 	^ self logColored: '33' during: aBlock
 ]
 
-{ #category : #'ui requests' }
-CommandLineUIManager >> merge: merger informing: aString [
-	"Check for conflicts, if there are none, just continue. 
-	 Merger will accept all conflicts"
-	merger hasConflicts ifFalse: [ ^ self ].
-	self abort: aString title: 'Conflict detected'
-]
-
 { #category : #display }
 CommandLineUIManager >> newDisplayDepthNoRestore: pixelSize [	
 	"do nothing"

diff --git a/src/UIManager/ManifestUIManager.class.st b/src/UIManager/ManifestUIManager.class.st
@@ -14,5 +14,5 @@ ManifestUIManager class >> ignoredDependencies [
 
 { #category : #'meta-data - dependency analyser' }
 ManifestUIManager class >> manuallyResolvedDependencies [
-	^ #(#'Collections-Streams' #'System-Support' #'OpalCompiler-Core' #Monticello #'System-Settings-Core')
+	^ #(#'Collections-Streams' #'System-Support' #'OpalCompiler-Core' #'System-Settings-Core')
 ]
diff --git a/src/UIManager/NonInteractiveUIManager.class.st b/src/UIManager/NonInteractiveUIManager.class.st
@@ -128,14 +128,6 @@ NonInteractiveUIManager >> lowSpaceWatcherDefaultAction: preemptedProcess [
 	self error. "what else we can do? "
 ]
 
-{ #category : #'ui requests' }
-NonInteractiveUIManager >> merge: merger informing: aString [
-	"Check for conflicts, if there are none, just continue. 
-	 Merger will accept all conflicts"
-	super merge: merger informing: aString.
-	merger hasConflicts ifTrue: [ self exitFailure ]
-]
-
 { #category : #'ui requests' }
 NonInteractiveUIManager >> multiLineRequest: queryString initialAnswer: defaultAnswer answerHeight: answerHeight [
 	^  self nonInteractiveRequest: queryString