Ticket #256: libscm_fix_1_of_1_rev_9bb1db01b5e9_Issue_256__fix_parsing_branch_list_when_branch_name_s__contains_spaces.patch

mercurial/HGCommand.st

@@ -1437 +1437 @@
     closed == true ifTrue:[
         stream nextPut:'--closed'
     ].
+    stream
+        nextPut:'--template';
+        nextPut:HGCommandParser templateBranches.
 
     "Created: / 27-11-2012 / 19:54:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-03-2019 / 11:03:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 parseError:stream

mercurial/HGCommandParser.st

@@ -76 +76 @@
 
 !HGCommandParser class methodsFor:'templates'!
 
+templateBranches
+    ^ '{branch}\0{rev}:{node}\0{ifeq(closed,''True'',''C'',ifeq(active,''False'',''I'',''A''))}\n'
+
+    "Created: / 07-03-2019 / 11:02:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 templateHeads
     ^'{rev}:{node}\n'
 
@@ -250 +256 @@
 !
 
 parseBranchesEntryAllowForInvalidBranchheadsMessage: allowForInvalidBrancheadsMessage
-    | name branch |
+    | name branch state |
 
-    name := self parseName.
-    stream skipSeparators.
+    name := self parseNameUpToNullOrNewLine.
     allowForInvalidBrancheadsMessage ifTrue:[ 
-        stream peek isDigit ifFalse:[ 
+        stream peek == Character null ifFalse:[ 
             | message |
 
             message := name , ' ', stream nextLine.
             self notify: message.  
-            name := self parseName.
-            stream skipSeparators.   
+            name := self parseNameUpToNullOrNewLine.
         ].
-    ].                
+    ].
     branch := HGBranch new.
     branch setName: name.
- 
+
+    self expect: Character null. 
     self parseNodeId.
-    stream peek == Character space ifTrue:[
-        stream next.
-        stream peek == $( ifFalse:[self error:'''('' expected but ''' , stream peek , ''' found'].
-        stream next.
-        stream peek == $i ifTrue:[
-            self expect:'inactive)'.
-            branch setActive: false.
-        ] ifFalse:[
-            stream peek == $c ifTrue:[
-                self expect:'closed)'.
-                branch setClosed: true.
-            ] ifFalse:[
-                self error:'Unexpected branch attribute (only ''closed'' and ''inactive'' supported)'''
-            ]
-        ].
-    ].
+    self expect: Character null. 
+    state := stream next.
+    state == $A ifTrue:[ 
+        branch setActive: true
+    ] ifFalse:[ state == $C ifTrue:[
+        branch setClosed: true
+    ] ifFalse:[ state == $I ifTrue:[
+        branch setActive: false
+    ] ifFalse:[ 
+        self error: 'Invalid branch state: ' , state
+    ]]].
     self expectLineEnd.
     ^branch
 
     "Created: / 08-10-2014 / 20:54:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-03-2019 / 12:17:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 parseConfig
@@ -509 +510 @@
     ].
 
     "Created: / 27-11-2012 / 20:21:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-03-2019 / 11:17:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 parseNameList
@@ -527 +529 @@
     "Created: / 27-11-2012 / 20:30:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+parseNameUpTo: terminator1 or: terminator2
+    ^String streamContents:[:out|
+        | c |    
+        [ c := stream peek. c == terminator1 or:[ c == terminator2] ] whileFalse:[
+            out nextPut:stream next
+        ]
+    ].
+
+    "Created: / 07-03-2019 / 12:16:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+parseNameUpToNullOrNewLine
+    ^ self parseNameUpTo: Character null or: Character cr.
+
+    "Created: / 07-03-2019 / 12:16:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+parseNameZ    
+    ^String streamContents:[:out|
+        [ stream peek == Character null ] whileFalse:[
+            out nextPut:stream next
+        ]
+    ].
+
+    "Created: / 07-03-2019 / 11:18:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 parseNodeId
     "Parses node id from stream and returns it. Support both,
      short and full node ids"

mercurial/HGCommandParserTests.st

@@ -110 +110 @@
 
     | branches |
 
-    branches := (HGCommandParser on: 'default                        5:f22945219f9be25a1fe436d81afece07b89330be
-branch1                        4:5bd21fb5eea8a7cb4adf45bccfea76cda11df84a (inactive)
-branch2                        3:32d32dee719fb422a69cfa6f7f8c1d8e299de2df (closed)
-') parseCommandBranches.
+    branches := (HGCommandParser on: (('default|5:f22945219f9be25a1fe436d81afece07b89330be|A
+branch1|4:5bd21fb5eea8a7cb4adf45bccfea76cda11df84a|I
+branch2|3:32d32dee719fb422a69cfa6f7f8c1d8e299de2df|C
+' copyReplaceAll: $| with: Character null))) parseCommandBranches.
 
     self assert: branches size == 3.
 
@@ -130 +130 @@
     self assert: branches third isClosed.
 
     "Created: / 27-11-2012 / 19:00:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-03-2019 / 12:12:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_cmd_branches_02
 
     | branches |
 
-    branches := (HGCommandParser on: 'invalid branchheads cache (visible): tip differs
-default                     5694:756610fa329d48cd8b225524016713485aefbb95
-jv                          5684:2c32b6c5d3543cd0381f9b346d62bfeabb95e6c6
-') parseCommandBranches.
+    branches := (HGCommandParser on: (('invalid branchheads cache (visible): tip differs
+default|5694:756610fa329d48cd8b225524016713485aefbb95|A
+jv|5684:2c32b6c5d3543cd0381f9b346d62bfeabb95e6c6|A
+')copyReplaceAll: $| with: Character null)) parseCommandBranches.
 
     self assert: branches size == 2.
 
@@ -152 +153 @@
     self assert: branches second isClosed not.
 
     "Created: / 08-10-2014 / 20:39:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-03-2019 / 12:08:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_cmd_branches_issue256b
+
+    | branches |
+
+    branches := (HGCommandParser on: (('default|6:6b8bef68bf9c6b8bef686b8bef68bf9c6b8bef68|A
+test branches issue256b  |5:9db0e56bb86e6b8bef686b8bef68bf9c6b8bef68|I
+') copyReplaceAll: $| with: Character null)) parseCommandBranches.
+
+    self assert: branches size == 2.
+
+    self assert: branches first name = 'default'.
+    self assert: branches first isActive.
+    self assert: branches first isClosed not.
+
+    self assert: branches second name = 'test branches issue256b  '.
+    self assert: branches second isActive not.
+    self assert: branches second isClosed not.
+
+    "Created: / 07-03-2019 / 10:21:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 07-03-2019 / 12:07:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 test_cmd_err_branches_01

mercurial/HGTests.st

@@ -479 +479 @@
     self assert:(repo branches contains: [:b|b name = 'test branches issue256a']).
 
     "Created: / 07-01-2019 / 22:42:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_branches_issue256b
+    "
+    Change branch with spaces & commit. Check whether commited changeset
+    has the branch set.
+    "
+
+    | repo wc |
+
+    repo := self repositoryNamed:'test_repo_01'.
+    wc := repo workingCopy.
+    self assert: repo branches size == 1.
+    wc branch: 'test branches issue256b'.
+
+    "Modify some file"
+    (wc / 'f1.txt') writingFileDo:[:s | s nextPutAll:'modified...' ].
+    wc commit: testSelector , ' - commit 01'.
+
+    self assert: wc changeset branches size == 1.
+    self assert: wc changeset branches anElement name = 'test branches issue256b'.
+    self assert: repo branches size == 2.       
+    self assert:(repo branches contains: [:b|b name = 'default']).
+    self assert:(repo branches contains: [:b|b name = 'test branches issue256b']).
+    
+    wc branch: 'default'.    
+    "Modify some file"
+    (wc / 'f1.txt') writingFileDo:[:s | s nextPutAll:'modified_default...' ].
+    wc commit: testSelector , ' - commit default branch 01'.
+    
+    self assert: wc changeset branches size == 1.
+    self assert: wc changeset branches anElement name = 'default'.
+
+    "Created: / 06-03-2019 / 10:32:50 / svestkap"
 ! !
 
 !HGTests methodsFor:'tests - changesets'!