equal
deleted
inserted
replaced
390 |
390 |
391 | rev branches line message adds copies deletions modifications | |
391 | rev branches line message adds copies deletions modifications | |
392 |
392 |
393 rev := HGChangeset new. |
393 rev := HGChangeset new. |
394 rev setId: self parseNodeId. self expectLineEnd. |
394 rev setId: self parseNodeId. self expectLineEnd. |
395 branches := self parseNameList. self expectLineEnd. |
395 branches := Array with: stream nextLine. |
396 rev setBranches: branches. |
396 rev setBranches: branches. |
397 rev setParent1Id: self parseNodeId. self expectSpace. |
397 rev setParent1Id: self parseNodeId. self expectSpace. |
398 rev setParent2Id: self parseNodeId. self expectSpace. self expectLineEnd. |
398 rev setParent2Id: self parseNodeId. self expectSpace. self expectLineEnd. |
399 "rev setChildren: self parseNodeIdList." self expectLineEnd. |
399 "rev setChildren: self parseNodeIdList." self expectLineEnd. |
400 |
400 |
428 rev setNonLazy. |
428 rev setNonLazy. |
429 |
429 |
430 ^rev |
430 ^rev |
431 |
431 |
432 "Created: / 13-11-2012 / 09:45:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
432 "Created: / 13-11-2012 / 09:45:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
433 "Modified: / 19-03-2014 / 23:23:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
433 "Modified: / 07-01-2019 / 22:51:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
434 ! |
434 ! |
435 |
435 |
436 parseMergeLocalChanged: info |
436 parseMergeLocalChanged: info |
437 "Parses |
437 "Parses |
438 |
438 |