urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-03 05:43:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge .plan files

Browse Source
This commit is contained in:
Anton Dyudin 2016-03-24 14:34:19 -07:00
parent ccc01741a3
commit 1f83b56fb1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mar/plan.hoon
View File

@ -44,5 +44,20 @@
|- ^+ all
?~ del all
$(del t.del, all (~(del by all) p.i.del))
::
++ can-join
|= {ali/plan-diff bob/plan-diff} ^- ?
?& =(~ (~(int by `(map knot *)`del.ali) put.bob)) :: no del-put
=(~ (~(int by `(map knot *)`put.ali) del.bob)) :: conflicts
.= (~(int by put.ali) put.bob) :: and all put
(~(int by put.bob) put.ali) :: values match
==
::
++ join
|= {ali/plan-diff bob/plan-diff}
^- (unit plan-diff)
?. (can-join ali bob)
~
(some [(~(uni by del.ali) del.bob) (~(uni by put.ali) put.bob)])
--
--