Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

21019 remove mc cache repository classdefault #696

Merged
merged 4 commits into from
Jan 23, 2018
Merged

21019 remove mc cache repository classdefault #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a9a9bb
https://pharo.fogbugz.com/f/cases/21019/
VincentBlondeau Jan 19, 2018
46ce728
https://pharo.fogbugz.com/f/cases/21019/
VincentBlondeau Jan 19, 2018
d1b9cd9
Merge remote-tracking branch 'origin/21019-Remove-MCCacheRepository-c…
VincentBlondeau Jan 19, 2018
4cbc0ab
Update ConfigurationOf.class.st
VincentBlondeau Jan 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/Metacello-Base/ConfigurationOf.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"
You must use a *configuration* when your project is stored in a
repository using `.mcz` files.
You must use a *configuration* when your project is stored in a repository using `.mcz` files.

If you are using a source code manager (SCM) like [git][1] and have
created a *baseline* (see the [**BaselineOf** class comment][3] for more info)
Expand Down Expand Up @@ -99,8 +98,8 @@ ConfigurationOf class >> bootstrapMetacelloFrom: repositoryUrl [
{ #category : #private }
ConfigurationOf class >> bootstrapPackage: aString from: aPath [
| repository version |
repository := (MCCacheRepository default includesVersionNamed: aString)
ifTrue: [ MCCacheRepository default ]
repository := (MCCacheRepository uniqueInstance includesVersionNamed: aString)
ifTrue: [ MCCacheRepository uniqueInstance ]
ifFalse: [ MCHttpRepository location: aPath user: '' password: '' ].
self
retry: [
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core/MetacelloMemberListSpec.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Class {
#superclass : #MetacelloSpec,
#instVars : [
'list',
'memberMap'
'memberMap'
],
#category : #'Metacello-Core-Members'
}
Expand Down
2 changes: 1 addition & 1 deletion src/Metacello-Core/MetacelloPlatform.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ MetacelloPlatform >> defaultDirectory [
MetacelloPlatform >> defaultPackageCache [
"Apparently the MCCacheRepository api is changing in Pharo"

^ MCCacheRepository default
^ MCCacheRepository uniqueInstance
]

{ #category : #attributes }
Expand Down
7 changes: 0 additions & 7 deletions src/Monticello/MCCacheRepository.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@ MCCacheRepository class >> cacheDirectory: directory [
default := self new directory: directory asFileReference.
]

{ #category : #accessing }
MCCacheRepository class >> default [
"This should be deleted as soon as Metacello is fixed"
self flag: #toBeDeleted.
^ self uniqueInstance
]

{ #category : #defaults }
MCCacheRepository class >> defaultDirectory [
| directories |
Expand Down
2 changes: 1 addition & 1 deletion src/Versionner-Core-Commands/VSCommand.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ VSCommand >> repositoryOfPackageNamed: packageName [
| mcPackage workingCopy repositories repository repositoryIndex |
mcPackage := MCPackage named: packageName.
workingCopy := mcPackage workingCopy.
repositories := workingCopy repositoryGroup repositories reject: [ :rep | rep == MCCacheRepository default ].
repositories := workingCopy repositoryGroup repositories reject: [ :rep | rep == MCCacheRepository uniqueInstance ].
repositories
ifEmpty: [ repository := MCTool newRepository.
workingCopy repositoryGroup addRepository: repository. ].
Expand Down