Merge pull request #122 from dalehenrich/dev

Pick up recent changes that include support for latest Metacello release
dalehenrich · Oct 29, 2014 · 58d5386 · 58d5386
2 parents 8a4e2c5 + 3e9f763
commit 58d5386
Show file tree

Hide file tree

Showing 38 changed files with 87 additions and 66 deletions.
diff --git a/repository/Topez-Common-Core.package/TDSessionDescription.class/class/importFrom..st b/repository/Topez-Common-Core.package/TDSessionDescription.class/class/importFrom..st
@@ -1,3 +1,3 @@
 instance creation
 importFrom: filepath
-	FileStream readOnlyFileNamed: filepath do: [ :fileStream | ^(STON fromStream: fileStream) asTDSessionDescription ].
+	FileStream readOnlyFileNamed: filepath do: [ :fileStream | ^(STON fromStream: fileStream) asTDSessionDescription ].
diff --git a/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/gciLibrary.st b/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/gciLibrary.st
@@ -1,12 +1,13 @@
 accessing
 gciLibrary
-	| libraryClass library libName ext |
-	libraryClass := GciLibrary withAllSubclasses detect: [ :each | each isClassForVersion: self gemstoneVersion ].
-	ExternalAddress startUp: true.
-	libName := self gciLibraryName.
-	ext := self gciLibraryExtension.
-	(libName endsWith: ext)
-		ifFalse: [ libName := libName , ext ].
-	library := libraryClass libraryNamed: libName.
-	library apiGciInit.
-	^ library
+  | libraryClass library libName ext |
+  libraryClass := GciLibrary withAllSubclasses
+    detect: [ :each | each isClassForVersion: self gemstoneVersion ].
+  (Smalltalk at: #'ExternalAddress') startUp: true.
+  libName := self gciLibraryName.
+  ext := self gciLibraryExtension.
+  (libName endsWith: ext)
+    ifFalse: [ libName := libName , ext ].
+  library := libraryClass libraryNamed: libName.
+  library apiGciInit.
+  ^ library
diff --git a/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/gemNRS.st b/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/gemNRS.st
@@ -3,4 +3,4 @@ gemNRS
 
 	^'!tcp@' , self gemHost, 
 		'#netldi:' , self netLDI, 
-		'#task!' , self gemTask.
+		'#task!' , self gemTask.
diff --git a/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/serverTodeRoot..st b/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/serverTodeRoot..st
@@ -1,4 +1,4 @@
 accessing
 serverTodeRoot: anObject
 
-   serverTodeRoot := anObject
+   serverTodeRoot := anObject
diff --git a/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/stoneNRS.st b/repository/Topez-Common-Core.package/TDSessionDescription.class/instance/stoneNRS.st
@@ -2,5 +2,4 @@ nrs
 stoneNRS
 
 	^'!tcp@' , self stoneHost , 
-		'#server!' , self stoneName.
-
+		'#server!' , self stoneName.
diff --git a/repository/Topez-Common-Core.package/TDSessionDescription.class/methodProperties.json b/repository/Topez-Common-Core.package/TDSessionDescription.class/methodProperties.json
@@ -22,7 +22,7 @@
 		"editTemplateOn:" : "dkh 7/8/2014 22:24",
 		"exportTo:" : "dkh 5/28/2014 06:35",
 		"exportTo:extension:" : "dkh 5/28/2014 06:35",
-		"gciLibrary" : "dkh 5/28/2014 06:35",
+		"gciLibrary" : "dkh 10/07/2014 14:51",
 		"gciLibraryExtension" : "dkh 5/28/2014 06:35",
 		"gciLibraryName" : "dkh 5/28/2014 06:35",
 		"gciLibraryName:" : "dkh 5/28/2014 06:35",

diff --git a/repository/Topez-Common-Core.package/monticello.meta/version b/repository/Topez-Common-Core.package/monticello.meta/version
diff --git a/...efinition.class/instance/hasGithubRepo.st → ...inition.class/instance/hasGitBasedRepo.st b/...efinition.class/instance/hasGithubRepo.st → ...inition.class/instance/hasGitBasedRepo.st
@@ -1,3 +1,3 @@
 testing
-hasGithubRepo
+hasGitBasedRepo
   ^ false
diff --git a/...z-Server-Core.package/TDAbstractProjectRegistrationDefinition.class/methodProperties.json b/...z-Server-Core.package/TDAbstractProjectRegistrationDefinition.class/methodProperties.json
@@ -10,8 +10,8 @@
 		"fieldThree" : "dkh 05/15/2014 18:02",
 		"fieldTwo" : "dkh 05/15/2014 18:02",
 		"hasFileTreeRepo" : "dkh 05/15/2014 18:27",
+		"hasGitBasedRepo" : "dkh 09/29/2014 12:42",
 		"hasGitRepository" : "dkh 05/15/2014 18:27",
-		"hasGithubRepo" : "dkh 05/16/2014 06:19",
 		"hasVersionSkew" : "dkh 05/15/2014 17:54",
 		"isActive" : "dkh 05/15/2014 22:28",
 		"isBaselineBased" : "dkh 05/16/2014 15:52",

diff --git a/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/instance/operations.st b/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/instance/operations.st
@@ -1,3 +1,4 @@
 accessing
 operations
-  ^ self merger operations
+  stFilterBlock ifNil: [ ^ self merger operations ].
+  ^ self merger operations select: stFilterBlock
diff --git a/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/instance/stFilterBlock..st b/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/instance/stFilterBlock..st
@@ -0,0 +1,4 @@
+accessing
+stFilterBlock: anObject
+
+   stFilterBlock := anObject
diff --git a/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/instance/stFilterBlock.st b/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/instance/stFilterBlock.st
@@ -0,0 +1,4 @@
+accessing
+stFilterBlock
+
+   ^stFilterBlock
diff --git a/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/methodProperties.json b/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/methodProperties.json
@@ -9,8 +9,10 @@
 		"merger:" : "dkh 05/28/2014 21:07",
 		"merger:mergerCompletionBlock:mergerAbortBlock:" : "dkh 05/28/2014 21:07",
 		"methodMenuActionSpec" : "dkh 07/08/2014 11:03",
-		"operations" : "dkh 05/09/2014 14:55",
+		"operations" : "dkh 10/07/2014 14:56",
 		"operationsMenuActionSpec" : "dkh 05/30/2014 10:53",
 		"selectClassOperations:selectionIndex:" : "dkh 05/30/2014 10:54",
 		"selectEditDefinitionMenuAction:selectionIndex:" : "dkh 05/09/2014 15:09",
+		"stFilterBlock" : "dkh 10/07/2014 14:57",
+		"stFilterBlock:" : "dkh 10/07/2014 14:57",
 		"toggleViewSameSource:selectionIndex:" : "dkh 05/30/2014 10:53" } }
diff --git a/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/properties.json b/repository/Topez-Server-Core.package/TDMergeDiffBrowser.class/properties.json
@@ -6,7 +6,8 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"merger" ],
+		"merger",
+		"stFilterBlock" ],
 	"name" : "TDMergeDiffBrowser",
 	"pools" : [
 		 ],

diff --git a/....package/TDMetacelloBaselineRegistrationDefinition.class/instance/currentVersionString.st b/....package/TDMetacelloBaselineRegistrationDefinition.class/instance/currentVersionString.st
@@ -4,5 +4,8 @@ currentVersionString
     ifNil: [ 
       currentVersionString := self isLoadedInImage not
         ifTrue: [ '' ]
-        ifFalse: [ self registration currentVersionString ] ].
+        ifFalse: [ 
+          [ self registration currentVersionString ]
+            on: Error
+            do: [ :ex | ex return: '???' ] ] ].
   ^ currentVersionString
diff --git a/...Server-Core.package/TDMetacelloBaselineRegistrationDefinition.class/methodProperties.json b/...Server-Core.package/TDMetacelloBaselineRegistrationDefinition.class/methodProperties.json
@@ -4,6 +4,6 @@
 	"instance" : {
 		"applyVersionStringToMetacello:" : "dkh 06/19/2014 17:49",
 		"baselineClassName" : "dkh 06/20/2014 10:14",
-		"currentVersionString" : "dkh 08/10/2014 16:37",
+		"currentVersionString" : "dkh 10/07/2014 09:59",
 		"isBaselineBased" : "dkh 06/19/2014 17:39",
 		"projectSelector" : "dkh 06/19/2014 18:06" } }
diff --git a/...efinition.class/instance/hasGithubRepo.st → ...inition.class/instance/hasGitBasedRepo.st b/...efinition.class/instance/hasGithubRepo.st → ...inition.class/instance/hasGitBasedRepo.st
@@ -1,5 +1,5 @@
 testing
-hasGithubRepo
-  self repositorySpec type = 'github'
+hasGitBasedRepo
+  super hasGitBasedRepo
     ifTrue: [ ^ true ].
   ^ self hybridRepositorySpec notNil
diff --git a/...z-Server-Core.package/TDMetacelloHybridRegistrationDefinition.class/methodProperties.json b/...z-Server-Core.package/TDMetacelloHybridRegistrationDefinition.class/methodProperties.json
@@ -8,7 +8,7 @@
 		"cloneProjectSpec" : "dkh 06/30/2014 21:01",
 		"configurationClassName" : "dkh 06/20/2014 10:14",
 		"currentVersionString" : "dkh 08/10/2014 16:37",
-		"hasGithubRepo" : "dkh 06/30/2014 20:54",
+		"hasGitBasedRepo" : "dkh 09/29/2014 12:45",
 		"hybridBaselineProjectSpec" : "dkh 06/30/2014 21:02",
 		"hybridRepositorySpec" : "dkh 06/30/2014 20:55",
 		"isHybridBased" : "dkh 06/19/2014 17:41",

diff --git a/...elloProjectBrowser.class/instance/itemSelected.listElement.selectedIndex.shiftPressed..st b/...elloProjectBrowser.class/instance/itemSelected.listElement.selectedIndex.shiftPressed..st
@@ -18,16 +18,16 @@ itemSelected: miniTool listElement: listElement selectedIndex: index shiftPresse
   #'project'.
   #'metacelloProject'.
   #'configurationProject'.
-  #'githubProject'.
+  #'gitBasedProject'.
   #'baselineProject'.
   #'nonDirtyGitProject'}.
   enable := [ :symbol | 
   enabled add: symbol.
   disabled remove: symbol ifAbsent: [  ] ].
   registration hasVersionSkew
     ifTrue: [ enable value: #'versionSkew' ].
-  registration hasGithubRepo
-    ifTrue: [ enable value: #'githubProject' ].
+  registration hasGitBasedRepo
+    ifTrue: [ enable value: #'gitBasedProject' ].
   (registration isLoadedInImage or: [ registration isExternalGitProject ])
     ifTrue: [ 
       registration isLoadedInImage
@@ -38,7 +38,7 @@ itemSelected: miniTool listElement: listElement selectedIndex: index shiftPresse
       (registration isMetacelloProject or: [ registration hasGitRepository ])
         ifTrue: [ 
           enable value: #'repoBasedProject'.
-          registration hasGithubRepo
+          registration hasGitBasedRepo
             ifFalse: [ 
               enable
                 value: #'writableRepoBasedProject';

diff --git a/...ory/Topez-Server-Core.package/TDMetacelloProjectBrowser.class/instance/menuActionSpec..st b/...ory/Topez-Server-Core.package/TDMetacelloProjectBrowser.class/instance/menuActionSpec..st
@@ -20,7 +20,7 @@ menuActionSpec: miniTool
     ->
       {#('branches' nil #'gitBranchesMenuAction:selectionIndex:' nil #'gitProject' false).
       #('checkout' nil #'gitCheckoutMenuAction:selectionIndex:' nil #'gitProject' false).
-      #('clone' nil #'cloneProjectMenuAction:selectionIndex:' nil #'githubProject' false).
+      #('clone' nil #'cloneProjectMenuAction:selectionIndex:' nil #'gitBasedProject' false).
       #('diff' nil #'gitDiffMenuAction:selectionIndex:' nil #'gitProject' false).
       #('diff (cached)' nil #'gitDiffCachedMenuAction:selectionIndex:' nil #'gitProject' false).
       #('fetch' nil #'gitFetchMenuAction:selectionIndex:' nil #'gitProject' false).

diff --git a/repository/Topez-Server-Core.package/TDMetacelloProjectBrowser.class/methodProperties.json b/repository/Topez-Server-Core.package/TDMetacelloProjectBrowser.class/methodProperties.json
@@ -37,11 +37,11 @@
 		"gitVersionSkewDiffMenuAction:selectionIndex:" : "dkh 05/29/2014 20:57",
 		"gitVersionSkewSaveProjectMenuAction:selectionIndex:" : "dkh 06/18/2014 20:52",
 		"hasGitRepository:" : "dkh 05/12/2014 17:05",
-		"itemSelected:listElement:selectedIndex:shiftPressed:" : "dkh 07/26/2014 12:22",
+		"itemSelected:listElement:selectedIndex:shiftPressed:" : "dkh 09/29/2014 12:43",
 		"loadConfigurationVersionMenuAction:selectionIndex:" : "dkh 07/01/2014 15:49",
 		"loadProjectMenuAction:selectionIndex:" : "dkh 06/02/2014 10:17",
 		"lockProjectMenuAction:selectionIndex:" : "dkh 06/13/2014 01:03",
-		"menuActionSpec:" : "dkh 07/03/2014 17:09",
+		"menuActionSpec:" : "dkh 09/29/2014 12:40",
 		"projectBlock" : "dkh 05/07/2014 11:19",
 		"projectBlock:" : "dkh 05/07/2014 11:19",
 		"projectTool" : "dkh 05/12/2014 17:02",

diff --git a/...r-Core.package/TDMetacelloProjectRegistrationDefinition.class/instance/hasGitBasedRepo.st b/...r-Core.package/TDMetacelloProjectRegistrationDefinition.class/instance/hasGitBasedRepo.st
@@ -0,0 +1,3 @@
+testing
+hasGitBasedRepo
+  ^ #('github' 'gitorious' 'bitbucket') includes: self repositorySpec type
diff --git a/...-Core.package/TDMetacelloProjectRegistrationDefinition.class/instance/hasGitRepository.st b/...-Core.package/TDMetacelloProjectRegistrationDefinition.class/instance/hasGitRepository.st
@@ -1,4 +1,7 @@
 testing
 hasGitRepository
   ^ self hasFileTreeRepo
-    and: [ MetacelloPlatform current gitIsGitDirectoryPath: self gitRepoDirectoryPath ]
+    and: [ 
+      [ MetacelloPlatform current gitIsGitDirectoryPath: self gitRepoDirectoryPath ]
+        on: Error
+        do: [ :ex | ex return: false ] ]
diff --git a/...ver-Core.package/TDMetacelloProjectRegistrationDefinition.class/instance/hasGithubRepo.st b/...ver-Core.package/TDMetacelloProjectRegistrationDefinition.class/instance/hasGithubRepo.st
diff --git a/...-Server-Core.package/TDMetacelloProjectRegistrationDefinition.class/methodProperties.json b/...-Server-Core.package/TDMetacelloProjectRegistrationDefinition.class/methodProperties.json
@@ -16,8 +16,8 @@
 		"gitRootDirectory" : "dkh 05/22/2014 12:05",
 		"gitRootPath" : "dkh 06/13/2014 01:37",
 		"hasFileTreeRepo" : "dkh 05/15/2014 18:27",
-		"hasGitRepository" : "dkh 05/15/2014 18:41",
-		"hasGithubRepo" : "dkh 05/16/2014 06:19",
+		"hasGitBasedRepo" : "dkh 09/29/2014 12:44",
+		"hasGitRepository" : "dkh 10/07/2014 09:52",
 		"hybridBaselineProjectSpec" : "dkh 07/01/2014 16:06",
 		"isBaselineBased" : "dkh 05/16/2014 15:53",
 		"isConfigurationBased" : "dkh 05/16/2014 15:54",

diff --git a/...Server-Core.package/TDMetacelloRegistrationDefinition.class/instance/currentBranchName.st b/...Server-Core.package/TDMetacelloRegistrationDefinition.class/instance/currentBranchName.st
@@ -4,5 +4,8 @@ currentBranchName
     ifNil: [ 
       currentBranchName := self isLoadedInImage not
         ifTrue: [ '' ]
-        ifFalse: [ self registration currentBranchName ] ].
+        ifFalse: [ 
+          [ self registration currentBranchName ]
+            on: Error
+            do: [ :ex | ex return: '???' ] ] ].
   ^ currentBranchName
diff --git a/...y/Topez-Server-Core.package/TDMetacelloRegistrationDefinition.class/methodProperties.json b/...y/Topez-Server-Core.package/TDMetacelloRegistrationDefinition.class/methodProperties.json
@@ -10,7 +10,7 @@
 		"configurationClassName" : "dkh 06/20/2014 10:17",
 		"configurationProjectSpec" : "dkh 05/16/2014 07:28",
 		"configurationVersionString" : "dkh 05/16/2014 07:04",
-		"currentBranchName" : "dkh 08/10/2014 16:54",
+		"currentBranchName" : "dkh 10/07/2014 09:59",
 		"currentVersionString" : "dkh 08/10/2014 16:37",
 		"diffProjectUsing:" : "dkh 05/15/2014 17:41",
 		"emphasis" : "dkh 05/20/2014 18:49",

diff --git a/...nConflict.onDowngrade.onLock.onUpgrade.ignoreImage.silently.cacheRepository.overrides..st b/...nConflict.onDowngrade.onLock.onUpgrade.ignoreImage.silently.cacheRepository.overrides..st
@@ -16,11 +16,11 @@ projectLoad: projectName doGet: doGet gsDeployer: gsDeployerOption selector: pro
   repositoryOverrides
     ifNotNil: [ metacello repositoryOverrides: repositoryOverrides ].
   onBlock := [ :ex :aspect | 
-  aspect == #'useNew'
-    ifTrue: [ ex useNew ]
+  aspect == #'useIncoming'
+    ifTrue: [ ex useIncoming ]
     ifFalse: [ 
-      aspect == #'useExisting'
-        ifTrue: [ ex useExisting ]
+      aspect == #'useLoaded'
+        ifTrue: [ ex useLoaded ]
         ifFalse: [ ex pass ] ] ].
   onConflict
     ifNotNil: [ metacello onConflict: [ :ex | onBlock value: ex value: onConflict ] ].

diff --git a/...ool.class/instance/projectLoad.selector.repositoryDescription.className.loads.version..st b/...ool.class/instance/projectLoad.selector.repositoryDescription.className.loads.version..st
@@ -9,7 +9,7 @@ projectLoad: projectName selector: projectSelector repositoryDescription: reposi
     className: className
     loads: loads
     version: version
-    onConflict: #'useNew'
+    onConflict: #'useIncoming'
     onDowngrade: nil
     onLock: #'honor'
     onUpgrade: nil

diff --git a/...class/instance/projectLoadConfiguration.version.repositoryDescription.className.loads..st b/...class/instance/projectLoadConfiguration.version.repositoryDescription.className.loads..st
@@ -11,7 +11,7 @@ projectLoadConfiguration: projectName version: version repositoryDescription: re
     className: className
     loads: loads
     version: version
-    onConflict: #'useNew'
+    onConflict: #'useIncoming'
     onDowngrade: nil
     onLock: #'honor'
     onUpgrade: nil

diff --git a/repository/Topez-Server-Core.package/TDMetacelloTool.class/instance/projectentry.st b/repository/Topez-Server-Core.package/TDMetacelloTool.class/instance/projectentry.st
@@ -29,7 +29,7 @@ projectentry
       projectEntry
         configuration: arg
         version: version
-        repository: repo printString
+        repository: repo
         loads: 'default' ]
     ifAbsent: [ 
       subOptions

diff --git a/repository/Topez-Server-Core.package/TDMetacelloTool.class/instance/projectload.st b/repository/Topez-Server-Core.package/TDMetacelloTool.class/instance/projectload.st
@@ -6,10 +6,10 @@ projectload
                [--no-flush] [--no-get]
                [ (--baseline | --configuration --version=<version> ) ]
                [--repository=<repository-reference>]
-               [--onConflict=useNew|useExisting]
-               [--onDowngrade=useNew|useExisting]
+               [--onConflict=useIncoming|useLoaded]
+               [--onDowngrade=useIncoming|useLoaded]
                [--onLock=break|honor]
-               [--onUpgrade=useNew|useExisting]
+               [--onUpgrade=useIncoming|useLoaded]
                [--ignoreImage] [--silently]
                [--cacheRepository=@<repository-reference>]
                [--repositoryOverrides=@<repository-reference>]
@@ -74,7 +74,7 @@ projectload
   subOptions
     at: 'onConflict'
     ifPresent: [ :arg | onConflict := arg asSymbol ]
-    ifAbsent: [ onConflict := #'useNew' ].
+    ifAbsent: [ onConflict := #'useIncoming' ].
   subOptions at: 'onDowngrade' ifPresent: [ :arg | onDowngrade := arg asSymbol ].
   subOptions
     at: 'onLock'

diff --git a/repository/Topez-Server-Core.package/TDMetacelloTool.class/methodProperties.json b/repository/Topez-Server-Core.package/TDMetacelloTool.class/methodProperties.json
@@ -37,13 +37,13 @@
 		"projectGet:className:selector:repositoryDescription:" : "dkh 07/01/2014 15:47",
 		"projectGet:className:selector:version:repositoryDescription:" : "dkh 07/01/2014 15:31",
 		"projectGetConfiguration:version:repositoryDescription:" : "dkh 07/01/2014 15:50",
-		"projectLoad:doGet:gsDeployer:selector:description:className:loads:version:onConflict:onDowngrade:onLock:onUpgrade:ignoreImage:silently:cacheRepository:overrides:" : "dkh 08/10/2014 21:29",
+		"projectLoad:doGet:gsDeployer:selector:description:className:loads:version:onConflict:onDowngrade:onLock:onUpgrade:ignoreImage:silently:cacheRepository:overrides:" : "dkh 10/10/2014 14:32",
 		"projectLoad:doGet:gsDeployer:selector:repositoryDescription:loads:version:onConflict:onDowngrade:onLock:onUpgrade:ignoreImage:silently:cacheRepository:repositoryOverrides:" : "dkh 07/22/2014 15:47",
-		"projectLoad:selector:repositoryDescription:className:loads:version:" : "dkh 07/22/2014 15:47",
+		"projectLoad:selector:repositoryDescription:className:loads:version:" : "dkh 10/10/2014 14:33",
 		"projectLoad:selector:repositoryDescription:loads:" : "dkh 05/13/2014 15:52",
 		"projectLoad:selector:repositoryDescription:loads:version:" : "dkh 06/17/2014 12:24",
 		"projectLoadBaseline:repositoryDescription:loads:" : "dkh 05/13/2014 15:48",
-		"projectLoadConfiguration:version:repositoryDescription:className:loads:" : "dkh 07/22/2014 15:47",
+		"projectLoadConfiguration:version:repositoryDescription:className:loads:" : "dkh 10/10/2014 14:34",
 		"projectLock:" : "dkh 06/20/2014 07:13",
 		"projectMap:from:toRepository:" : "dkh 07/01/2014 11:31",
 		"projectMerge:commitish:gitRepoDirectory:" : "dkh 05/30/2014 06:57",
@@ -60,9 +60,9 @@
 		"projectcommit" : "dkh 05/16/2014 07:48",
 		"projectcompare" : "dkh 05/29/2014 20:59",
 		"projectdiff" : "dkh 05/13/2014 13:31",
-		"projectentry" : "dkh 07/26/2014 12:49",
+		"projectentry" : "dkh 10/01/2014 09:54",
 		"projectlist" : "dkh 05/22/2014 07:27",
-		"projectload" : "dkh 07/30/2014 11:17",
+		"projectload" : "dkh 10/10/2014 14:33",
 		"projectlock" : "dkh 06/13/2014 01:02",
 		"projectlog" : "dkh 07/11/2014 21:50",
 		"projectprime" : "dkh 05/09/2014 08:22",

diff --git a/...efinition.class/instance/hasGithubRepo.st → ...inition.class/instance/hasGitBasedRepo.st b/...efinition.class/instance/hasGithubRepo.st → ...inition.class/instance/hasGitBasedRepo.st
@@ -1,5 +1,5 @@
 testing
-hasGithubRepo
-  self repositorySpec type = 'github'
+hasGitBasedRepo
+  super hasGitBasedRepo
     ifTrue: [ ^ true ].
   ^ self hybridRepositorySpec notNil
diff --git a/...Core.package/TDMetacelloUnloadedProjectRegistrationDefinition.class/methodProperties.json b/...Core.package/TDMetacelloUnloadedProjectRegistrationDefinition.class/methodProperties.json
@@ -7,7 +7,7 @@
 		"configurationClassName" : "dkh 06/30/2014 19:55",
 		"configurationVersionString" : "dkh 05/23/2014 11:53",
 		"emphasis" : "dkh 05/15/2014 17:57",
-		"hasGithubRepo" : "dkh 06/30/2014 20:50",
+		"hasGitBasedRepo" : "dkh 09/29/2014 12:45",
 		"hybridBaselineProjectSpec" : "dkh 07/02/2014 14:41",
 		"hybridRepositorySpec" : "dkh 06/30/2014 20:56",
 		"isDirty" : "dkh 05/31/2014 15:25",

diff --git a/...e/TDProjectSpecEntryDefinition.class/instance/concreteRevertProjectUsing.registration..st b/...e/TDProjectSpecEntryDefinition.class/instance/concreteRevertProjectUsing.registration..st
@@ -31,10 +31,10 @@ concreteRevertProjectUsing: aProjectTool registration: aProjectRegistration
     className: projectClassName
     loads: loads
     version: aProjectRegistration configurationVersionString
-    onConflict: #'useNew'
-    onDowngrade: #'useNew'
+    onConflict: #'useIncoming'
+    onDowngrade: #'useIncoming'
     onLock: #'honor'
-    onUpgrade: #'useNew'
+    onUpgrade: #'useIncoming'
     ignoreImage: false
     silently: false
     cacheRepository: nil

diff --git a/...sitory/Topez-Server-Core.package/TDProjectSpecEntryDefinition.class/methodProperties.json b/...sitory/Topez-Server-Core.package/TDProjectSpecEntryDefinition.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"baseline:repository:loads:" : "dkh 05/15/2014 17:14",
 		"concreteGetProjectUsing:registration:" : "dkh 08/20/2014 07:02",
 		"concreteLoadProjectUsing:registration:" : "dkh 06/20/2014 13:58",
-		"concreteRevertProjectUsing:registration:" : "dkh 07/22/2014 15:48",
+		"concreteRevertProjectUsing:registration:" : "dkh 10/10/2014 14:34",
 		"configuration:className:version:repository:loads:" : "dkh 06/16/2014 17:13",
 		"configuration:version:repository:loads:" : "dkh 05/30/2014 12:01",
 		"createProjectListRegistration" : "dkh 05/15/2014 18:15",

diff --git a/repository/Topez-Server-Core.package/monticello.meta/version b/repository/Topez-Server-Core.package/monticello.meta/version