Merge pull request #970 from guillep/issue/961

Fix configuration of remotes

Iceberg-Plugin-GitHub.package/IceHttpsProtocol.extension/class/githubRequestUrlKey.st

@@ -0,0 +1,4 @@
+*Iceberg-Plugin-GitHub
+githubRequestUrlKey
+
+	^ #'clone_url'

Iceberg-Plugin-GitHub.package/IceHttpsProtocol.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "IceHttpsProtocol"
+}

Iceberg-Plugin-GitHub.package/IceSSHProtocol.extension/class/githubRequestUrlKey.st

@@ -0,0 +1,4 @@
+*Iceberg-Plugin-GitHub
+githubRequestUrlKey
+
+	^ #'ssh_url'

Iceberg-Plugin-GitHub.package/IceSSHProtocol.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "IceSSHProtocol"
+}

Iceberg-Plugin-GitHub.package/IceTipGitHubRepositoryPanel.class/instance/getGitHubRepository.st

@@ -1,10 +1,7 @@
 querying-github
 getGitHubRepository
-	"It will retry 3 times"
-	1 to: 3 do: [ :attempt | 
-		[ [ ^ IceGitHubAPI new
-				beAnonymous;
-				getRepository: self userName project: self projectName ]
-			on: IceAuthenticationError do: [ "I will retry." ] ]
-			on: LGitNoCredentialsProvided do: [ ^ nil ] ].
-	^ nil
+	[ ^ IceGitHubAPI new
+		beAnonymous;
+		getRepository: self userName project: self projectName ]
+		on: LGitNoCredentialsProvided
+		do: [ ^ nil ]

Iceberg-Plugin-GitHub.package/IceTipGitHubRepositoryPanel.class/instance/newRepository.st

@@ -11,7 +11,7 @@ newRepository
 			(githubRepository at: #fork)
 				ifTrue: [ | parent remote |
 					parent := githubRepository at: #parent.
-					remote := IceGitRemote name: ((parent at: #owner) at: #login) url: (parent at: #'ssh_url').
+					remote := IceGitRemote name: ((parent at: #owner) at: #login) url: (parent at: self selectedProtocol githubRequestUrlKey).
 					newRepository addRemote: remote.
 					remote fetch. ] ].
 	^ newRepository

Iceberg-Plugin-GitHub.package/IceUrlProtocol.extension/class/githubRequestUrlKey.st

@@ -0,0 +1,4 @@
+*Iceberg-Plugin-GitHub
+githubRequestUrlKey
+	"Return the key used in github REST responses to get the URL with the correct protocol"
+	self subclassResponsibility

Iceberg-Plugin-GitHub.package/IceUrlProtocol.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "IceUrlProtocol"
+}

Iceberg-TipUI.package/IceTipLocalRepositoryPanel.class/class/title.st

@@ -1,3 +1,3 @@
 specs
 title
-	^ 'Add local repository'
+	^ 'Import from existing clone'

Iceberg-TipUI.package/IceTipLocalRepositoryPanel.class/instance/newRepository.st

@@ -1,7 +1,7 @@
 accessing
 newRepository
 	UIManager default 
-		informUser: ('Adding repository {1}' format: { self location fullName })
+		informUser: ('Importing repository from {1}' format: { self location fullName })
 		during: [ 
 			^ IceRepositoryCreator new
 				repository: repository;

Iceberg-TipUI.package/monticello.meta/categories.st

@@ -13,4 +13,3 @@ SystemOrganization addCategory: #'Iceberg-TipUI-View-Branch'!
 SystemOrganization addCategory: #'Iceberg-TipUI-View-DataSource'!
 SystemOrganization addCategory: #'Iceberg-TipUI-View-RepositoryType'!
 SystemOrganization addCategory: #'Iceberg-TipUI-View-Versions'!
-ystemOrganization addCategory: #'Iceberg-TipUI-View-Versions'!