Tools__ChangeSetBrowser2.st
branchjv
changeset 12312 451b0a9fdc0d
parent 12306 9dc69e54fdd6
child 12314 0cbf76168690
--- a/Tools__ChangeSetBrowser2.st	Mon Dec 03 17:37:49 2012 +0000
+++ b/Tools__ChangeSetBrowser2.st	Wed Dec 05 11:42:11 2012 +0000
@@ -2657,18 +2657,23 @@
     | cs fn |
 
     self showProgress: 'Reading ' , (fn := aStringOrFilename asFilename) baseName while:[
-	cs := ChangeSet fromFile: aStringOrFilename.
-	((fn suffix = 'chg') or:[fn pathName = ObjectMemory nameForChanges]) ifTrue:[
-	    self list scrollToBottom: true.
-	    self showingRegularChangesetHolder value: true.
-	] ifFalse:[
-	    self showingRegularChangesetHolder value: false.
-	].
-	self allowRemove: false."/true.
-	self doOpen: cs.
+        [
+            cs := ChangeSet fromFile: aStringOrFilename.
+        ] on: ChangeSet::InvalidChangeChunkError do:[:ex|
+            ex proceed.
+        ].
+        ((fn suffix = 'chg') or:[fn pathName = ObjectMemory nameForChanges]) ifTrue:[
+            self list scrollToBottom: true.
+            self showingRegularChangesetHolder value: true.
+        ] ifFalse:[
+            self showingRegularChangesetHolder value: false.
+        ].
+        self allowRemove: false."/true.
+        self doOpen: cs.
     ].
 
     "Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-12-2012 / 11:38:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doOpenNew
@@ -3778,7 +3783,7 @@
 !ChangeSetBrowser2 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8071 2012-11-16 10:56:44Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8078 2012-12-05 11:42:11Z vranyj1 $'
 !
 
 version_CVS
@@ -3786,5 +3791,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__ChangeSetBrowser2.st 8071 2012-11-16 10:56:44Z vranyj1 $'
+    ^ '$Id: Tools__ChangeSetBrowser2.st 8078 2012-12-05 11:42:11Z vranyj1 $'
 ! !