Merge remote-tracking branch 'origin/lf/agent-clay-fe' into philip/agent-clay

This commit is contained in:
Philip Monk 2022-11-01 22:08:56 -07:00
commit da15339c3b
4 changed files with 44 additions and 2 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef778204240c9a812f485d53339ff8e7a722ebeacd199a7172be8ce796edc514
size 7296213
oid sha256:65f2c81d703b83dd6f48f98c071948b41734c5004bbdbddab7e13f8b782b03e2
size 5703567

View File

@ -501,6 +501,15 @@
::
[%x %kiln %syncs ~] ``noun+!>(zyn)
[%x %kiln %sources ~] ``noun+!>(sources)
[%x %kiln %pikes ~]
=+ .^(=rock:tire %cx /(scot %p our)//(scot %da now)/tire)
=- ``noun+!>(-)
%- ~(rut by rock)
|= [=desk =zest wic=(set weft)]
^- pike
=+ .^(hash=@uv %cz /(scot %p our)/[desk]/(scot %da now))
=/ sync (~(get by sources) desk)
[sync hash zest wic]
==
::
:: +get-germ: select merge strategy into local desk

View File

@ -0,0 +1,24 @@
/- h=hood
|_ =pikes:h
++ grad %noun
++ grow
|%
++ noun pikes
++ json
=, enjs:format
%- pairs
%+ turn ~(tap by pikes)
|= [=desk =pike:h]
:- desk
%- pairs
:~ sync/?~(sync.pike ~ =,(u.sync.pike (pairs ship/s/(scot %p ship) desk/s/desk ~)))
hash/s/(scot %uv hash.pike)
zest/s/zest.pike
wefts/a/(turn ~(tap in wic.pike) weft:enjs:h)
==
--
++ grab
|%
++ noun pikes:h
--
--

View File

@ -1,6 +1,15 @@
=, clay
=* dude dude:gall
|%
+$ pike
$: sync=(unit [=ship =desk])
hash=@uv
=zest
wic=(set weft)
==
::
+$ pikes (map desk pike)
::
:: $rung: reference to upstream commit
::
+$ rung [=aeon =weft]