Skip to content

Commit

Permalink
Fix #1261 and #1260
Browse files Browse the repository at this point in the history
  • Loading branch information
guillep committed Jun 9, 2020
1 parent 0aba4f4 commit 1aa2bf3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Iceberg/Iceberg.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Iceberg class >> enableMetacelloIntegration: anObject [
EnableMetacelloIntegration := anObject
]

{ #category : #'as yet unclassified' }
{ #category : #accessing }
Iceberg class >> icebergRepositoriesURLs [
^ {
'[email protected]:pharo-vcs/iceberg.git'.
Expand All @@ -98,7 +98,7 @@ Iceberg class >> initializeSettings [
class updateSettingNodes: nodes ]
]

{ #category : #'as yet unclassified' }
{ #category : #accessing }
Iceberg class >> mcRepositoryFor: aLocationString [
^ (IceMetacelloRepositoryType for: aLocationString) mcRepository
]
Expand Down Expand Up @@ -157,7 +157,8 @@ Iceberg class >> settingsOn: aBuilder [
description: 'When creating an Iceberg repository out of a github:// URL choose whether you want to user an SCP URL (i.e. with the form ''[email protected]:<username>/<project>.git'') or an HTTPS URL (i.e. with the form ''https://github.com/<username>/<project>.git''';
domainValues:
{('SCP ([email protected]:<username>/<project>.git)' -> #scpUrl).
('HTTPS (https://github.com/<username>/<project>.git)' -> #httpsUrl)} ] ]
('HTTPS (https://github.com/<username>/<project>.git)' -> #httpsUrl).
('HTTP (http://github.com/<username>/<project>.git)' -> #httpUrl)} ] ]
]

{ #category : #settings }
Expand Down
12 changes: 12 additions & 0 deletions Iceberg/MCGitBasedNetworkRepository.extension.st
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,15 @@ MCGitBasedNetworkRepository >> getOrCreateIcebergRepository [
remote := IceGitRemote url: remoteUrl.
self createIcebergRepositoryWithFallbackFor: remote url: remoteUrl ]
]

{ #category : #'*Iceberg' }
MCGitBasedNetworkRepository >> httpUrl [

^ self httpsUrl copyReplaceAll: 'https://' with: 'http://'
]

{ #category : #'*Iceberg' }
MCGitBasedNetworkRepository >> httpsUrl [

self subclassResponsibility
]

0 comments on commit 1aa2bf3

Please sign in to comment.