--- mercurial/HGRevisionInfo.st	Wed Jan 14 10:02:24 2015 +0100

+++ mercurial/HGRevisionInfo.st	Fri Jan 16 10:40:29 2015 +0000

@@ -80,75 +87,31 @@

     s skipSeparators.

     s peek == $H ifTrue:[

         "Some rubbish $Header: /cvs/stx/stx/libscm/mercurial/HGRevisionInfo.st.rej,v 1.1 2015-01-16 14:42:08 vrany Exp $?"

-        (s next: 6) ~= 'Header' ifTrue:[^aBlock value].

+        (s next: 6) ~= 'Header' ifTrue:[ ^aBlock value ].

         id := HGChangesetId null.

     ] ifFalse:[

-        (s next: 10) ~= 'Changeset:' ifTrue:[^aBlock value].

+    s peek == $I ifTrue:[  

+        "Some rubbish $Id: HGRevisionInfo.st.rej,v 1.1 2015-01-16 14:42:08 vrany Exp $?"

+        (s next: 2) ~= 'Id' ifTrue:[ ^aBlock value ].

+        id := HGChangesetId null.

+    ] ifFalse:[ 

+        (s next: 10) ~= 'Changeset:' ifTrue:[ ^aBlock value ].

         s skipSeparators.

         s peek == $< ifTrue:[

-            "/Not expanded...

-            id := HGChangesetId null.

+            (s next: 14) ~= '<not expanded>' ifTrue:[ ^ aBlock value ].

+            ^ RevisionInfoNotExpanded new.

         ] ifFalse:[

             id := HGChangesetId fromHexString: (s next: 40).    

         ].

-    ].

+    ]].

     ^self new changesetId: id

     "Created: / 20-11-2012 / 00:33:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"

-    "Modified: / 04-12-2012 / 13:17:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"

+    "Modified: / 26-12-2014 / 23:43:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"

 ! !

 !HGRevisionInfo methodsFor:'accessing'!

-at:aKey

-    "backward compatible dictionary-like accessing"

-

-    (self respondsTo:aKey) ifTrue:[

-        ^ self perform:aKey

-    ].

-    ^ self errorKeyNotFound:aKey

-

-    "

-     self new at:#binaryRevision

-     self new at:#foo

-    "

-

-    "Modified: / 22-10-2008 / 20:23:31 / cg"

-!

-

-at:aKey ifAbsent:replacement

-    "backward compatible dictionary-like accessing"

-

-    (self respondsTo:aKey) ifTrue:[

-        ^ (self perform:aKey) ? replacement

-    ].

-    ^ replacement

-

-    "

-     self new at:#binaryRevision

-     self new at:#foo ifAbsent:#bar

-    "

-

-    "Created: / 22-10-2008 / 20:19:42 / cg"

-!

-

-at:aKey put:value

-    "backward compatible dictionary-like accessing"

-

-    (self respondsTo:aKey) ifTrue:[

-        self perform:(aKey asMutator) with:value.

-        ^ value "/ sigh

-    ].

-    ^ self errorKeyNotFound:aKey

-

-    "

-     self new at:#binaryRevision put:#bar

-     self new at:#foo put:#bar

-    "

-

-    "Created: / 22-10-2008 / 20:20:54 / cg"

-!

-

 changesetId

     ^ changesetId

 !