mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-14 08:34:25 +03:00
clay: change %park interface to not take caches
Now a full commit is synchronous. -commit will be assimilated back into clay.
This commit is contained in:
Philip Monk
parent
e10bc43c4a
commit
fa0e019ddf
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:180cfdd68c9b438764bb5b79f4af9117eac66a81e3bf5b0888eee9f242cf8935
|
||||
size 13316363
|
||||
oid sha256:1031dc68b42322ae2ce2cd899895497d2eb575438cd09f4d5a674c23ca74808d
|
||||
size 13109651
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
::
|
||||
|_ own/mime
|
||||
++ grow
|
||||
^?
|
||||
|%
|
||||
++ jam `@`q.q.own
|
||||
--
|
||||
|
||||
@ -2115,6 +2115,10 @@
|
||||
::
|
||||
++ util
|
||||
|%
|
||||
:: Hash a page to get a lobe.
|
||||
::
|
||||
++ page-to-lobe |=(page (shax (jam +<)))
|
||||
::
|
||||
:: Takes a list of changed paths and finds those paths that are inside a
|
||||
:: mount point (listed in `mon`).
|
||||
::
|
||||
@ -2854,7 +2858,8 @@
|
||||
^- vase
|
||||
%+ slap
|
||||
(with-faces old+old sam+sam ~)
|
||||
(ream (cat 3 b ':~(grow old sam)'))
|
||||
%- ream
|
||||
:((cury cat 3) '!: ~! old=old ~! sam=sam ' b ':~(grow old sam)')
|
||||
:: try direct +grab
|
||||
::
|
||||
=^ new=vase nub (build-fit %mar b)
|
||||
@ -3410,22 +3415,19 @@
|
||||
::
|
||||
:: XX needs to check that head is ancestor of tako
|
||||
:: XX needs to check tako in rang
|
||||
:: XX needs to check that commit doesn't have same date
|
||||
::
|
||||
++ park
|
||||
:: |= [commit=yuki commit-store-adds=(map tako yaki) blob-store-adds=(map lobe blob)]
|
||||
|^
|
||||
|= [=tako =rang =ankh mim=(map path (unit mime))]
|
||||
|= [=yuki =rang]
|
||||
^+ ..park
|
||||
=: let.dom +(let.dom)
|
||||
hit.dom (~(put by hit.dom) +(let.dom) tako)
|
||||
hut.ran (~(uni by hut.rang) hut.ran)
|
||||
=: hut.ran (~(uni by hut.rang) hut.ran)
|
||||
lat.ran (~(uni by lat.rang) lat.ran)
|
||||
==
|
||||
=/ [deletes=(set path) changes=(map path (each page lobe))]
|
||||
=/ previous-yaki (aeon-to-yaki:ze (dec let.dom))
|
||||
=/ next-yaki (aeon-to-yaki:ze let.dom)
|
||||
(get-changes previous-yaki next-yaki)
|
||||
~| [let.dom deletes=deletes changes=~(key by changes)]
|
||||
=/ previous-yaki (aeon-to-yaki:ze let.dom)
|
||||
(get-changes q.previous-yaki q.yuki)
|
||||
~| [from=let.dom deletes=deletes changes=~(key by changes)]
|
||||
=. ..park (emil (print deletes ~(key by changes)))
|
||||
::
|
||||
:: promote ford cache
|
||||
@ -3437,8 +3439,30 @@
|
||||
=/ =args:ford:fusion
|
||||
[ank.dom deletes changes lat.ran fod.dom]
|
||||
::
|
||||
=^ change-cages ford-cache.args
|
||||
(checkout-changes args q.yuki)
|
||||
=/ new-blobs=(map lobe blob)
|
||||
%- malt
|
||||
%+ turn ~(tap by change-cages)
|
||||
|= [=path =lobe =cage]
|
||||
[lobe %direct lobe [p q.q]:cage]
|
||||
=/ data=(map path lobe)
|
||||
%- ~(urn by q.yuki)
|
||||
|= [=path value=(each page lobe)]
|
||||
?- -.value
|
||||
%| p.value
|
||||
%& lobe:(~(got by change-cages) path)
|
||||
==
|
||||
=/ =yaki (make-yaki p.yuki data now)
|
||||
=: let.dom +(let.dom)
|
||||
hit.dom (~(put by hit.dom) +(let.dom) r.yaki)
|
||||
hut.ran (~(put by hut.ran) r.yaki yaki)
|
||||
lat.ran (~(uni by new-blobs) lat.ran)
|
||||
==
|
||||
=. file-store.args lat.ran
|
||||
::
|
||||
=^ ankh ford-cache.args
|
||||
(checkout-ankh args deletes changes ank.dom)
|
||||
(checkout-ankh args deletes change-cages ank.dom)
|
||||
=. ankh.args ankh
|
||||
=. ank.dom ankh
|
||||
=^ mim ford-cache.args
|
||||
@ -3451,26 +3475,28 @@
|
||||
:: Find which files changed or were deleted
|
||||
::
|
||||
++ get-changes
|
||||
|= [old=yaki new=yaki]
|
||||
|= [old=(map path lobe) new=(map path (each page lobe))]
|
||||
=/ old=(map path (each page lobe))
|
||||
(~(run by old) |=(=lobe |+lobe))
|
||||
:* %- silt ^- (list path)
|
||||
%+ murn ~(tap by (~(uni by q.old) q.new))
|
||||
|= [=path =lobe]
|
||||
%+ murn ~(tap by (~(uni by old) new))
|
||||
|= [=path *]
|
||||
^- (unit ^path)
|
||||
=/ a (~(get by q.new) path)
|
||||
=/ b (~(get by q.old) path)
|
||||
=/ a (~(get by new) path)
|
||||
=/ b (~(get by old) path)
|
||||
?: |(=(a b) !=(~ a))
|
||||
~
|
||||
`path
|
||||
::
|
||||
%- silt ^- (list [path (each page lobe)])
|
||||
%+ murn ~(tap by (~(uni by q.old) q.new))
|
||||
|= [=path =lobe]
|
||||
^- (unit [^path (each page ^lobe)])
|
||||
=/ a (~(get by q.new) path)
|
||||
=/ b (~(get by q.old) path)
|
||||
?: |(=(a b) =(~ a))
|
||||
%+ murn ~(tap by (~(uni by old) new))
|
||||
|= [=path *]
|
||||
^- (unit [^path (each page lobe)])
|
||||
=/ a (~(get by new) path)
|
||||
=/ b (~(get by old) path)
|
||||
?: |(=(a b) ?=(~ a))
|
||||
~
|
||||
`[path |+lobe]
|
||||
`[path u.a]
|
||||
==
|
||||
::
|
||||
:: Keep any parts of the ford cache whose dependencies didn't change
|
||||
@ -3495,12 +3521,31 @@
|
||||
$(builds t.builds)
|
||||
(~(put by $(builds t.builds)) i.builds)
|
||||
::
|
||||
:: Updated q.yaki
|
||||
::
|
||||
++ checkout-changes
|
||||
|= [=ford=args:ford:fusion changes=(map path (each page lobe))]
|
||||
=/ cans=(list [=path change=(each page lobe)]) ~(tap by changes)
|
||||
|- ^- [(map path [=lobe =cage]) ford-cache]
|
||||
?~ cans
|
||||
[~ ford-cache.ford-args]
|
||||
=^ cage ford-cache.ford-args
|
||||
%- wrap:fusion
|
||||
(get-value:(ford:fusion ford-args) path.i.cans)
|
||||
=/ =lobe
|
||||
?- -.change.i.cans
|
||||
%| p.change.i.cans
|
||||
%& (page-to-lobe:util p.change.i.cans)
|
||||
==
|
||||
=^ so-far ford-cache.ford-args $(cans t.cans)
|
||||
[(~(put by so-far) path.i.cans lobe cage) ford-cache.ford-args]
|
||||
::
|
||||
:: Update ankh
|
||||
::
|
||||
++ checkout-ankh
|
||||
|= $: =ford=args:ford:fusion
|
||||
deletes=(set path)
|
||||
changes=(map path (each page lobe))
|
||||
changes=(map path [lobe cage])
|
||||
=ankh
|
||||
==
|
||||
^+ [ankh ford-cache.ford-args]
|
||||
@ -3528,7 +3573,7 @@
|
||||
outer-loop(dels t.dels)
|
||||
:: Add/change
|
||||
::
|
||||
=/ cans=(list [=path change=(each page lobe)]) ~(tap by changes)
|
||||
=/ cans=(list [=path =lobe =cage]) ~(tap by changes)
|
||||
|- ^+ [ankh ford-cache.ford-args]
|
||||
=* outer-loop $
|
||||
?~ cans
|
||||
@ -3542,31 +3587,9 @@
|
||||
path.i.cans t.path.i.cans
|
||||
ankh (~(gut by dir.ankh) i.path.i.cans *^ankh)
|
||||
==
|
||||
:- ankh(dir (~(put by dir.ankh) i.path.i.cans child-ankh))
|
||||
:- child-ankh(dir (~(put by dir.ankh) i.path.i.cans child-ankh))
|
||||
ford-cache.ford-args
|
||||
=^ cage ford-cache.ford-args
|
||||
?- -.change.i.cans
|
||||
%&
|
||||
%- wrap:fusion
|
||||
(page-to-cage:(ford:fusion ford-args) p.change.i.cans)
|
||||
::
|
||||
%|
|
||||
=^ page ford-cache.ford-args
|
||||
%- wrap:fusion
|
||||
(lobe-to-page:(ford:fusion ford-args) p.change.i.cans)
|
||||
(wrap:fusion (page-to-cage:(ford:fusion ford-args) page))
|
||||
==
|
||||
:_ ford-cache.ford-args
|
||||
%= ankh
|
||||
fil
|
||||
:- ~ :_ cage
|
||||
?- -.change.i.cans
|
||||
%| p.change.i.cans
|
||||
%&
|
||||
%- wrap:fusion
|
||||
(page-to-lobe:(ford:fusion ford-args) p.change.i.cans)
|
||||
==
|
||||
==
|
||||
[ankh(fil `[lobe.i.cans cage.i.cans]) ford-cache.ford-args]
|
||||
=. ankh new-ankh
|
||||
outer-loop(cans t.cans)
|
||||
::
|
||||
@ -5180,7 +5203,7 @@
|
||||
%park
|
||||
=^ mos ruf
|
||||
=/ den ((de our now ski hen ruf) our des.req)
|
||||
abet:(park:den [tak ran ank mim]:req)
|
||||
abet:(park:den [yuk ran]:req)
|
||||
[mos ..^$]
|
||||
::
|
||||
%perm
|
||||
|
||||
@ -567,8 +567,7 @@
|
||||
{$mont des/desk bem/beam} :: mount to unix
|
||||
{$dirk des/desk} :: mark mount dirty
|
||||
{$ogre pot/$@(desk beam)} :: delete mount point
|
||||
{$park des/desk tak/tako ran/rang ank/ankh mim/(map path (unit mime))}
|
||||
:: plumbing commit
|
||||
{$park des/desk yuk/yuki ran/rang} :: plumbing commit
|
||||
{$perm des/desk pax/path rit/rite} :: change permissions
|
||||
$>(%trim vane-task) :: trim state
|
||||
$>(%vega vane-task) :: report upgrade
|
||||
@ -693,6 +692,10 @@
|
||||
== ::
|
||||
++ urge |*(a/mold (list (unce a))) :: list change
|
||||
++ whom (each ship @ta) :: ship or named crew
|
||||
++ yuki :: commit
|
||||
$: p/(list tako) :: parents
|
||||
q/(map path (each page lobe)) :: namespace
|
||||
== ::
|
||||
++ yaki :: commit
|
||||
$: p/(list tako) :: parents
|
||||
q/(map path lobe) :: namespace
|
||||
|
||||
@ -11,56 +11,31 @@
|
||||
=/ m (strand ,vase)
|
||||
^- form:m
|
||||
::
|
||||
:: Cast to expected marks
|
||||
::
|
||||
;< our=@p bind:m get-our:strandio
|
||||
=/ cast-builds=(map path schematic:ford)
|
||||
%- ~(urn by changes)
|
||||
|= [=path =cage]
|
||||
[%cast [our desk] =>((flop path) ?~(. %$ i)) %$ cage]
|
||||
;< cast-results=(map path cage) bind:m (build-cages:strandio cast-builds)
|
||||
::
|
||||
:: Fetch current state
|
||||
::
|
||||
;< our=@p bind:m get-our:strandio
|
||||
;< now=@da bind:m get-time:strandio
|
||||
=+ .^(=dome %cv /(scot %p our)/[desk]/(scot %da now))
|
||||
::
|
||||
:: Apply changes to current state to create new yaki
|
||||
::
|
||||
=/ new-blobs=(map path blob)
|
||||
%- ~(run by cast-results)
|
||||
|= =cage
|
||||
=/ =page [p q.q]:cage
|
||||
[%direct (page-to-lobe page) page]
|
||||
:: Apply changes to current state to create new yuki
|
||||
::
|
||||
=/ parent-tako=tako (~(got by hit.dome) let.dome)
|
||||
=/ all-lobes=(map path lobe)
|
||||
=/ data=(map path (each page lobe))
|
||||
=+ .^ =parent=yaki %cs
|
||||
/(scot %p our)/[desk]/(scot %da now)/yaki/(scot %uv parent-tako)
|
||||
==
|
||||
=/ after-deletes
|
||||
%- ~(dif by q.parent-yaki)
|
||||
(malt (turn ~(tap in deletes) |=(=path [path *lobe])))
|
||||
%- ~(uni by after-deletes)
|
||||
(~(run by new-blobs) |=(=blob p.blob))
|
||||
=/ after=(map path (each page lobe))
|
||||
(~(run by after-deletes) |=(=lobe |+lobe))
|
||||
%- ~(uni by after)
|
||||
^- (map path (each page lobe))
|
||||
(~(run by changes) |=(=cage &+[p q.q]:cage))
|
||||
=/ =yuki [~[parent-tako] data]
|
||||
::
|
||||
:: XX should we be getting the time later, after all async?
|
||||
;< now=@da bind:m get-time:strandio
|
||||
=/ new-yaki=yaki (make-yaki ~[parent-tako] all-lobes now)
|
||||
::
|
||||
:: Apply new blobs and yaki to rang
|
||||
::
|
||||
=/ =rang
|
||||
:- (~(put by hut:*rang) r.new-yaki new-yaki)
|
||||
(malt (turn ~(tap by new-blobs) |=([=path =blob] [p.blob blob])))
|
||||
::
|
||||
:: Checkout ankh and mime cache (derived state)
|
||||
::
|
||||
=/ =ankh (checkout:clay-commit ank.dome deletes cast-results)
|
||||
;< mim=(map path (unit mime)) bind:m
|
||||
(checkout-cache:clay-commit our desk deletes cast-results)
|
||||
:: Send to clay
|
||||
::
|
||||
=/ args [desk r.new-yaki rang ankh mim]
|
||||
=/ args [desk yuki *rang]
|
||||
;< ~ bind:m (send-raw-card:strandio %pass /commit/[desk] %arvo %c %park args)
|
||||
(pure:m !>(~))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user