Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes/improvements in changeset tools. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 13 Nov 2013 21:29:44 +0000
branchjv
changeset 13675 36933883999a
parent 13674 7cf98b160823
child 13676 b14ed2a36bae
Fixes/improvements in changeset tools.
Tools__ChangeSetBrowser2.st file | annotate | diff | comparison | revisions
Tools__ChangeSetDiffTool.st file | annotate | diff | comparison | revisions 
--- a/Tools__ChangeSetBrowser2.st	Tue Nov 12 21:47:38 2013 +0000
+++ b/Tools__ChangeSetBrowser2.st	Wed Nov 13 21:29:44 2013 +0000
@@ -33,10 +33,11 @@
 		selection1Holder list2 list2Holder selection2Holder classHolder
 		languageHolder codeAspectHolder showRemovedAspect showSameAspect
 		showTimestampHolder sourceView changeSourceHolder
-		imageSourceHolder targetPackage targetNamespace allowRemoveHolder
+		imageSourceHolder targetPackage allowRemoveHolder
 		allowAcceptHolder infoPanel updateChangeFileHolder
 		showFilterHolder showingRegularChangesetHolder isWorkingHolder
-		isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect'
+		isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
+		targetNameSpaceName'
 	classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages'
 	poolDictionaries:''
 	category:'Interface-Browsers-ChangeSet'
@@ -1351,6 +1352,10 @@
                   itemValue: changeMenuSelectCopyrightMethods:
                 )
                (MenuItem
+                  label: 'Select class initialize doIts'
+                  itemValue: changeMenuSelectClassInitializeDoIts:
+                )
+               (MenuItem
                   label: '-'
                 )
                (MenuItem
@@ -1396,8 +1401,6 @@
         nil
         nil
       )
-
-    "Modified (format): / 12-11-2013 / 17:36:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changeMenu1
@@ -1889,7 +1892,7 @@
 !
 
 targetNamespace:something
-    targetNamespace := something.
+    targetNameSpaceName := something.
 !
 
 targetPackage:something
@@ -2919,10 +2922,10 @@
 
     nsName := Dialog
 		requestNameSpace:'Namepace to load code into:'
-		initialAnswer:targetNamespace.
+		initialAnswer:targetNameSpaceName.
     nsName isEmptyOrNil ifTrue:[^self].
 
-    targetNamespace := nsName.
+    targetNameSpaceName := nsName.
     "/ self targetNamespaceNameHolder value:('Target-Namespace: ',targetNamespace).
 
     list1 list do:[:each |
@@ -3029,7 +3032,7 @@
     (changes conform:[:c | c isClassDefinitionChange]) ifTrue:[
         classes := (changes collect:[:c | c changeClass]).
         UserPreferences systemBrowserClass 
-            browseClasses:classes title:'selected monticello classes'.
+            browseClasses:classes label:'selected monticello classes'.
     ] ifFalse:[
         methods := OrderedCollection new.
         changes do:[:each |
@@ -3052,6 +3055,7 @@
 
     "Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 23-07-2012 / 13:13:37 / cg"
+    "Modified: / 13-11-2013 / 11:49:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changeMenuBrowseClass: changeList
@@ -3263,6 +3267,19 @@
     "Created: / 04-08-2011 / 17:29:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+changeMenuSelectClassInitializeDoIts: changeList
+
+    self changeMenuSelectIn: changeList suchThat:[:changeEntry|
+        | change |
+
+        change :=  changeEntry change.
+        change isDoIt 
+            and:[change source endsWith: ' initialize']
+    ]
+
+    "Created: / 13-11-2013 / 18:40:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 changeMenuSelectCopyrightMethods: changeList
 
     self changeMenuSelectIn: changeList suchThat:[:changeEntry|
@@ -3409,7 +3426,7 @@
 "/        [(Smalltalk at: aChange superClassName asSymbol)
 "/            ifNil:[^self error: 'Nil superclass']].
 
-    | nsQueries packageQueries hasMC apply |
+    | nsQueries packageQueries hasMC apply targetNameSpace |
 
     aChange removed ifTrue:[ ^ self ].
 
@@ -3431,24 +3448,25 @@
         ].
     ].
 
+    targetNameSpaceName notNil ifTrue:[
+        targetNameSpace := NameSpace name: targetNameSpaceName.
+        apply := [
+            nsQueries answer: targetNameSpace do:apply.
+        ]
+    ].
+
+    hasMC ifTrue:[
+        apply := [
+            MCInteractiveLoadingQuery answer: true do: apply
+        ].
+    ].
+
     self withWaitCursorDo:[
-        nsQueries 
-            answer:(NameSpace name:(targetNamespace ? 'Smalltalk'))
-            do: [
-                packageQueries 
-                    answer: self targetPackage
-                    do: [
-                        hasMC ifTrue:[
-                            MCInteractiveLoadingQuery answer: true do: apply
-                        ] ifFalse:[
-                            apply value.
-                        ]
-                    ].
-            ].
+        packageQueries answer: self targetPackage do: apply
     ].
 
     "Modified: / 07-09-2011 / 22:24:57 / cg"
-    "Modified: / 20-09-2013 / 10:41:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-11-2013 / 12:09:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 changeMenuApplyChanges: changesToApply
--- a/Tools__ChangeSetDiffTool.st	Tue Nov 12 21:47:38 2013 +0000
+++ b/Tools__ChangeSetDiffTool.st	Wed Nov 13 21:29:44 2013 +0000
@@ -2666,6 +2666,8 @@
     info isNil ifTrue:[
         info := ChangeSetDiffInfo new.
         info specMerge: ChangeSetSpec changeSet
+    ] ifFalse:[
+        info := info deepCopy.
     ].
     dlg diffInfo: info.
     dlg open ifFalse:[^self].
@@ -2673,7 +2675,7 @@
 
     ^self fileMenuOpenOnDiffInfo: info
 
-    "Modified: / 11-11-2013 / 11:26:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-11-2013 / 11:54:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 fileMenuOpenOnDiffInfo: info
hg/stx-libtool