--- a/extensions.st Fri Feb 17 02:51:19 2012 +0100
+++ b/extensions.st Fri Feb 17 11:46:22 2012 +0100
@@ -6,12 +6,12 @@
| cmd |
- cmd := UserPreferences current svnDiff2Command.
+ cmd := UserPreferences current svnDiff3Command.
^cmd notEmptyOrNil
and:[(OperatingSystem canExecuteCommand: cmd)
and:[self hasSubversionWorkingCopySelected]].
- "Modified: / 17-02-2012 / 01:37:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 17-02-2012 / 10:18:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!AbstractFileBrowser methodsFor:'menu actions-scm-svn'!
@@ -305,159 +305,6 @@
)
! !
-!AbstractFileBrowser class methodsFor:'menu specs-scm'!
-
-svnMenu
- "This resource specification was automatically generated
- by the MenuEditor of ST/X."
-
- "Do not manually edit this!! If it is corrupted,
- the MenuEditor may not be able to read the specification."
-
-
- "
- MenuEditor new openOnClass:AbstractFileBrowser andSelector:#svnMenu
- (Menu new fromLiteralArrayEncoding:(AbstractFileBrowser svnMenu)) startUp
- "
-
- <resource: #menu>
-
- ^
- #(Menu
- (
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Commit'
- itemValue: svnCommit
- translateLabel: true
- labelImage: (ResourceRetriever #'SVN::IconLibrary' commit 'Commit')
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Update'
- itemValue: svnUpdate
- translateLabel: true
- )
- (MenuItem
- enabled: svnUpdateWithExternalDiff3
- label: 'Update (external diff3) '
- itemValue: svnUpdateWithExternalDiff3
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Add'
- itemValue: svnAdd
- translateLabel: true
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Remove'
- itemValue: svnRemove
- translateLabel: true
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Revert'
- itemValue: svnRevert
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Status'
- itemValue: svnStatus
- translateLabel: true
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Status (show updates)'
- itemValue: svnStatusShowUpdates
- translateLabel: true
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Info'
- itemValue: svnInfo
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: false
- label: 'Merge...'
- itemValue: svnMerge
- translateLabel: true
- )
- (MenuItem
- enabled: false
- label: 'Merge (with external diff3)'
- itemValue: svnMergeWithExternalDiff3
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Compare'
- itemValue: svnCompareWithBASE
- translateLabel: true
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Compare with HEAD'
- itemValue: svnCompareWithHEAD
- translateLabel: true
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Compare with Revision...'
- itemValue: svnCompare
- translateLabel: true
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Diff (svn diff ...)'
- itemValue: svnDiff
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Debug'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasSubversionWorkingCopySelected
- label: 'Open Working Copy Browser'
- itemValue: svnDebugOpenWorkingCopyBrowser
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- )
- nil
- nil
- )
-! !
-
!ChangeSet methodsFor:'utilities'!
condenseChangesForPackage2:aPackageSymbol
@@ -1595,18 +1442,6 @@
!UserPreferences methodsFor:'accessing-scm-subversion'!
-svnConfigurations
- "subversion source control configurations"
-
- ^(self at:#'libsvn.configurations' ifAbsent:[^nil])
- collect:[:cfg|cfg decodeAsLiteralArray]
-
- "Created: / 03-10-2008 / 11:14:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 19-08-2009 / 12:08:44 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!UserPreferences methodsFor:'accessing-scm-subversion'!
-
svnConfigurations2
"subversion source control configurations"
@@ -1644,30 +1479,6 @@
!UserPreferences methodsFor:'accessing-scm-subversion'!
-svnConfigurations: aCollection
- "subversion source control configurations"
-
- (SVN::RepositoryManager notNil
- and:[ SVN::RepositoryManager isLoaded ]) ifTrue:[
- SVN::RepositoryManager allInstances do:[:e|
- e configurations: aCollection
- ]
- ].
-
- ^ self
- at: #'libsvn.configurations'
- put: (aCollection asArray collect:[:cfg|cfg literalArrayEncoding])
-
- "
- UserPreferences current svnConfigurations: #()
- "
-
- "Created: / 03-10-2008 / 11:14:01 / Jan Vrany <vranyj1@fel.cvut.cz>"
- "Modified: / 19-08-2009 / 12:09:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
-! !
-
-!UserPreferences methodsFor:'accessing-scm-subversion'!
-
svnCurrentConfiguration
| name confs conf |