equal
deleted
inserted
replaced
926 ]. |
926 ]. |
927 ^ self. |
927 ^ self. |
928 ]. |
928 ]. |
929 |
929 |
930 self activityNotification:'generating diffSet...'. |
930 self activityNotification:'generating diffSet...'. |
931 listHere := ChangeSet fromStream:(currentSource readStream). |
931 Error handle:[:ex | |
|
932 (Dialog confirm:(resources stringWithCRs:'An error was encountered while generating the current source of the class %1.\This might be due to some missing or corrupted source file.\You may proceed, but no information about the differences between your current version and the repositories version can be shown.\\Continue ?' |
|
933 with:currentClass name allBold) noLabel:'Cancel') ifFalse:[ |
|
934 AbortSignal raise |
|
935 ]. |
|
936 listHere := ChangeSet new |
|
937 ] do:[ |
|
938 listHere := ChangeSet fromStream:(currentSource readStream). |
|
939 ]. |
932 listRep := ChangeSet fromStream:(sourceToLoad readStream). |
940 listRep := ChangeSet fromStream:(sourceToLoad readStream). |
933 |
941 |
934 versionMethodsHere := listHere select:[:change | (change isMethodChange |
942 versionMethodsHere := listHere select:[:change | (change isMethodChange |
935 and:[change selector == #version |
943 and:[change selector == #version |
936 and:[change changeClass isMeta]])]. |
944 and:[change changeClass isMeta]])]. |
1140 eachClass changed:#projectOrganization. |
1148 eachClass changed:#projectOrganization. |
1141 ]. |
1149 ]. |
1142 Smalltalk changed:#projectOrganization. |
1150 Smalltalk changed:#projectOrganization. |
1143 |
1151 |
1144 "Modified: / 07-02-2001 / 18:18:32 / ps" |
1152 "Modified: / 07-02-2001 / 18:18:32 / ps" |
1145 "Modified: / 15-10-2007 / 12:01:45 / cg" |
1153 "Modified: / 15-10-2007 / 14:11:51 / cg" |
1146 ! |
1154 ! |
1147 |
1155 |
1148 checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge using:aSourceCodeManager |
1156 checkoutExtensionMethodsForPackage:packageToCheckOut askForRevision:askForRevision askForMerge:askForMerge using:aSourceCodeManager |
1149 "check-out a class from the source repository. |
1157 "check-out a class from the source repository. |
1150 If askForRevision is false, check-out the newest version." |
1158 If askForRevision is false, check-out the newest version." |
2870 ! ! |
2878 ! ! |
2871 |
2879 |
2872 !SourceCodeManagerUtilities class methodsFor:'documentation'! |
2880 !SourceCodeManagerUtilities class methodsFor:'documentation'! |
2873 |
2881 |
2874 version |
2882 version |
2875 ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.160 2007-10-15 10:00:28 cg Exp $' |
2883 ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.161 2007-10-15 14:27:14 cg Exp $' |
2876 ! ! |
2884 ! ! |