From 484772e2b7981314539d2fcd24149f6aca8d8686 Mon Sep 17 00:00:00 2001 From: Yaseen Date: Wed, 26 Jan 2022 11:41:22 -0500 Subject: [PATCH] story: misc changes --- pkg/arvo/gen/hood/story-remove.hoon | 2 +- pkg/arvo/gen/hood/story-set.hoon | 4 ++-- pkg/base-dev/mar/story.hoon | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/arvo/gen/hood/story-remove.hoon b/pkg/arvo/gen/hood/story-remove.hoon index 48e86be846..9296cd5243 100644 --- a/pkg/arvo/gen/hood/story-remove.hoon +++ b/pkg/arvo/gen/hood/story-remove.hoon @@ -10,7 +10,7 @@ :: Remove a commit message to a given case on a given desk :: =/ our p.bec -:: XX should `base` here be syd or q.bec +:: XX should `base` here be syd or q.bec =/ tak .^(tako:clay %cs /(scot %p our)/base/(scot %ud aeon)/tako/~) =/ tale=story .^(story %cx /(scot %p our)/[syd]/(scot %da now)/story) =. tale (~(del ju tale) tak) diff --git a/pkg/arvo/gen/hood/story-set.hoon b/pkg/arvo/gen/hood/story-set.hoon index ae48c26338..f08d7a16de 100644 --- a/pkg/arvo/gen/hood/story-set.hoon +++ b/pkg/arvo/gen/hood/story-set.hoon @@ -11,8 +11,8 @@ :: =/ our p.bec =? cas =(*case cas) [%da now] :: set current commit when cas not provided -=/ tak .^(tako:clay %cs /(scot %p our)/[syd]/(scot cas)/tako/~) +=/ tak .^(tako:clay %cs /(scot %p our)/[syd]/(scot cas)/tako/~) =/ tale=story .^(story %cx /(scot %p our)/[syd]/(scot %da now)/story) -=. tale (~(put ju tale) tak prose) +=. tale (~(put ju tale) tak prose) :- %helm-pass [%c [%info syd %& [/story %ins story+!>(tale)]~]] \ No newline at end of file diff --git a/pkg/base-dev/mar/story.hoon b/pkg/base-dev/mar/story.hoon index 9a4b8bb447..ac2c79f39b 100644 --- a/pkg/base-dev/mar/story.hoon +++ b/pkg/base-dev/mar/story.hoon @@ -151,6 +151,8 @@ (just '\0a') :: parse trailing newline == :: + :: XX TODO: implement parsing in conflicts + =/ proses-parse ~ =/ title-parser ;~ sfix :: throw away trailing newlines (cook crip (star prn)) :: parse any number of ascii characters, turn into cord