publish: fix bug in publish comment mark

[ixv]

Introduced by a stupid mistake I made in this PR: #2707 where I forgot that changes to a mark type definition need to include the old mark type. This should fix this issue: #2731

I've tested this fix by booting a ship from before #2707, making a notebook with comments, adding the code from #2707 and confirming the reproduction, then copying these changes in.

Apologies to everyone this issue has plagued.

[philipcmonk]

LGTM

[philipcmonk]

I used this to rescue a ship which had this bug. Since the bug breaks |mount, I ran this command to install the fix enough to mount:

*%/mar/publish/comment/hoon '/-  *publish\0a|_  com=?(comment-2 comment-3)\0a::\0a::\0a++  grow\0a  |%\0a  ++  mime\0a    :-  /text/x-publish-comments\0a    (as-octs:mimes:html (of-wain:format txt))\0a  ++  txt\0a    ^-  wain\0a    ?:  ?=(comment-2 com)\0a      :*  (cat 3 \'author: \' (scot %p author.com))\0a          (cat 3 \'date-created: \' (scot %da date-created.com))\0a          \'-----\'\0a          (to-wain:format content.com)\0a      ==\0a    ?>  ?=(comment-3 com)\0a    :*  (cat 3 \'author: \' (scot %p author.com))\0a        (cat 3 \'date-created: \' (scot %da date-created.com))\0a        \'-----\'\0a        (to-wain:format content.com)\0a    ==\0a  --\0a++  grab\0a  |%\0a  ++  mime\0a    |=  [mite:eyre p=octs:eyre]\0a    |^  (rash q.p both-parser)\0a    ++  key-val\0a      |*  [key=rule val=rule]\0a      ;~(sfix ;~(pfix key val) gaq)\0a    ++  old-parser\0a      ;~  plug\0a        (key-val (jest \'creator: ~\') fed:ag)\0a        (key-val (jest \'collection: \') sym)\0a        (key-val (jest \'post: \') sym)\0a        (key-val (jest \'date-created: ~\') (cook year when:so))\0a        (key-val (jest \'last-modified: ~\') (cook year when:so))\0a        ;~(pfix (jest (cat 3 \'-----\' 10)) (cook crip (star next)))\0a      ==\0a    ++  new-parser\0a      ;~  plug\0a        (key-val (jest \'author: ~\') fed:ag)\0a        (key-val (jest \'date-created: ~\') (cook year when:so))\0a        ;~(pfix (jest (cat 3 \'-----\' 10)) (cook crip (star next)))\0a      ==\0a    ++  both-parser\0a      ;~  pose\0a        %+  cook\0a          |=  [author=@ date-created=@da content=@t]\0a          ^-  comment\0a          [author date-created content %.n]\0a        new-parser\0a        %+  cook\0a          |=  [author=@ @ @ date-created=@da @ content=@t]\0a          ^-  comment\0a          [author date-created content %.n]\0a        old-parser\0a      ==\0a    --\0a  ++  noun  comment\0a  --\0a++  grad  %mime\0a--\0a'

Edit: @ixv notes that making this change without changing the app could break publish's read loop. Once the app has been committed (maybe by OTA), run :publish %reset-warp.

[ohAitch]

At risk of being a square, should a single broken mark perhaps not break |mount? Or at least, should there be a |mount =safe-mode & which only concerns itself with .hoon files?

…

On Sat, May 16, 2020 at 16:01, Philip Monk ***@***.***> wrote: I used this to rescue a ship which had this bug. Since the bug breaks |mount, I ran this command to install the fix enough to mount: *%/mar/publish/comment/hoon '/- *publish\0a|_ com=?(comment-2 comment-3)\0a::\0a::\0a++ grow\0a |%\0a ++ mime\0a :- /text/x-publish-comments\0a (as-octs:mimes:html (of-wain:format txt))\0a ++ txt\0a ^- wain\0a ?: ?=(comment-2 com)\0a :* (cat 3 \'author: \' (scot %p author.com))\0a (cat 3 \'date-created: \' (scot %da date-created.com))\0a \'-----\'\0a (to-wain:format content.com)\0a ==\0a ?> ?=(comment-3 com)\0a :* (cat 3 \'author: \' (scot %p author.com))\0a (cat 3 \'date-created: \' (scot %da date-created.com))\0a \'-----\'\0a (to-wain:format content.com)\0a ==\0a --\0a++ grab\0a |%\0a ++ mime\0a |= [mite:eyre p=octs:eyre]\0a |^ (rash q.p both-parser)\0a ++ key-val\0a |* [key=rule val=rule]\0a ;~(sfix ;~(pfix key val) gaq)\0a ++ old-parser\0a ;~ plug\0a (key-val (jest \'creator: ~\') fed:ag)\0a (key-val (jest \'collection: \') sym)\0a (key-val (jest \'post: \') sym)\0a (key-val (jest \'date-created: ~\') (cook year when:so))\0a (key-val (jest \'last-modified: ~\') (cook year when:so))\0a ;~(pfix (jest (cat 3 \'-----\' 10)) (cook crip (star next)))\0a ==\0a ++ new-parser\0a ;~ plug\0a (key-val (jest \'author: ~\') fed:ag)\0a (key-val (jest \'date-created: ~\') (cook year when:so))\0a ;~(pfix (jest (cat 3 \'-----\' 10)) (cook crip (star next)))\0a ==\0a ++ both-parser\0a ;~ pose\0a %+ cook\0a |= [author=@ ***@***.*** ***@***.***\0a ^- comment\0a [author date-created content %.n]\0a new-parser\0a %+ cook\0a |= [author=@ @ @ ***@***.*** @ ***@***.***\0a ^- comment\0a [author date-created content %.n]\0a old-parser\0a ==\0a --\0a ++ noun comment\0a --\0a++ grad %mime\0a--\0a' — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#2904 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAOFPBVHZCQPO7UDWANUEKDRR4LLRANCNFSM4NC6S6BQ> .

[ixv]

oh lord 😔

[ohAitch]

I suppose alternately you can always *%/mar/publish/comment/hoon .^(@t %cx /~someone-else==/mar/publish/comment/hoon

[philipcmonk]

Well, the Ford Fusion answer is "yes, a single bad mark should break |mount, but also it should kill the commit event so |mount will never actually be broken".

[ixv]

By the way, just changing the comment mark without the app changes may potentially break the read loop of publish. You should run :publish %reset-warp after committing the app.

[philipcmonk]

Would it be best for me to amend the above command to commit both files? I guess the app then the mark?

[ixv]

Yeah that may be safest.

[philipcmonk]

Actually the app is quite large, that may not be wise. Hmm...

[ixv]

I'll put the changes up on my ship and you can just reference them

[ohAitch]

That is certainly a coherent position, which would result in not being able to break |mount with a single bad mark!

[ixv]

Alright, the files are up on my ship

*%/app/publish/hoon .^(@t %cx /~novlud-padtyv/kids=/app/publish/hoon)
*%/mar/publish/comment/hoon .^(@t %cx /~novlud-padtyv/kids=/mar/publish/comment/hoon)

[philipcmonk]

Have you tried this .^ from another ship that's not a moon of ~novlud or otherwise synced from it? Some related operations don't work, but that might. I would check but ~wicdev is in drydock at the moment.

[ixv]

Hm, you might be right, tried to run it on another ship and it's been amesing for an awfully long time.

Oh well, this is just a precaution, I'm confident that the %reset-warp thing will work. Or we can tell people to |merge from my %kids desk.

[ixv]

I ran it again with |ames-verb %rcv on, and it just hangs 2 fragments short of finishing.

[philipcmonk]

I suspect it's compiling some new zuse. If that finishes it might succeed. I don't now that that won't be a problem in ford fusion, but the mechanics are all different, so it's not worth investigating here. Some problems are certainly fixed, like how on master you can't merge from a foreign desk into a new desk, it has to start from a local desk. On fusion this works fine.