--- a/MCRepositoryBrowser.st Mon Aug 12 02:59:30 2013 +0200
+++ b/MCRepositoryBrowser.st Fri Aug 16 13:01:51 2013 +0200
@@ -1,14 +1,14 @@
"{ Package: 'stx:goodies/monticello' }"
ApplicationModel subclass:#MCRepositoryBrowser
- instanceVariableNames:'repositoriesHolder packagesHolder versionsHolder
- selectedVersionHolder worker selectedVersionDetailsHolder
- selectedRepositoryHolder targetPackage targetNamespace
- lastPackage targetPackageHolder targetNamespaceNameHolder
- updateChangefileHolder selectedPackageHolder'
- classVariableNames:'LastAddedRepository'
- poolDictionaries:''
- category:'SCM-Monticello-St/X UI'
+ instanceVariableNames:'repositoriesHolder packagesHolder versionsHolder
+ selectedVersionHolder worker selectedVersionDetailsHolder
+ selectedRepositoryHolder targetPackage targetNamespace
+ lastPackage targetPackageHolder targetNamespaceNameHolder
+ updateChangefileHolder selectedPackageHolder'
+ classVariableNames:'LastAddedRepository LastAddedURLString'
+ poolDictionaries:''
+ category:'SCM-Monticello-St/X UI'
!
@@ -918,7 +918,7 @@
repositoryAdd
|repStr rep url initialURL|
- initialURL := 'http://www.squeaksource.com/project'.
+ initialURL := LastAddedURLString ? 'http://www.squeaksource.com/project'.
repStr := Dialog
request:'Repository to add (file- or HTTP-URL):'
initialAnswer:initialURL
@@ -926,12 +926,22 @@
repStr isEmptyOrNil ifTrue:[^ self].
+ (repStr startsWith:'www.') ifTrue:[
+ repStr := 'http://',repStr.
+ ].
+
Error handle:[:ex |
+ LastAddedURLString := repStr.
Dialog warn:'Invalid URL (',ex description,')'.
^ self
] do:[
url := URL fromString:repStr.
].
+ url isNil ifTrue:[
+ LastAddedURLString := repStr.
+ Dialog warn:'Invalid URL'.
+ ^ self
+ ].
url method = 'http' ifTrue:[
rep := MCHttpRepository
@@ -944,7 +954,8 @@
].
].
rep isNil ifTrue:[
- Dialog warn:'cannot figure out access scheme.'.
+ LastAddedURLString := repStr.
+ Dialog warn:'Cannot figure out access scheme from URL.'.
^ self.
].
self addRepository:rep
@@ -1231,15 +1242,15 @@
!MCRepositoryBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.29 2013-06-03 10:39:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.30 2013-08-16 11:01:51 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.29 2013-06-03 10:39:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/goodies/monticello/MCRepositoryBrowser.st,v 1.30 2013-08-16 11:01:51 cg Exp $'
!
version_SVN
- ^ '$Id: MCRepositoryBrowser.st,v 1.29 2013-06-03 10:39:59 cg Exp $'
+ ^ '$Id: MCRepositoryBrowser.st,v 1.30 2013-08-16 11:01:51 cg Exp $'
! !