diff --git a/pkg/arvo/app/dbug.hoon b/pkg/arvo/app/dbug.hoon index 90c17c22d..4c5dbb42e 100644 --- a/pkg/arvo/app/dbug.hoon +++ b/pkg/arvo/app/dbug.hoon @@ -801,8 +801,8 @@ =/ heads=(list [tako desk]) %+ turn ~(tap in desks) |= =desk - =+ .^(=dome %cv /(scot %p our.bowl)/[desk]/(scot %da now.bowl)) - =/ =tako (~(got by hit.dome) let.dome) + =+ .^(=domo %cv /(scot %p our.bowl)/[desk]/(scot %da now.bowl)) + =/ =tako (~(got by hit.domo) let.domo) [tako desk] =/ yakis=(set yaki) %- silt diff --git a/pkg/arvo/gen/hood/start.hoon b/pkg/arvo/gen/hood/start.hoon index 50ef24778..b9174411b 100644 --- a/pkg/arvo/gen/hood/start.hoon +++ b/pkg/arvo/gen/hood/start.hoon @@ -16,6 +16,6 @@ ?> ((sane %tas) +<.arg) [-.arg +<.arg] =+ .^(=cone:clay %cx /(scot %p p.bec)//(scot %da now)/domes) -=/ =foam:clay (~(gut by cone) [p.bec des] *foam:clay) -=+ ((slog ?:(=(%live liv.foam) ~ ['kiln: desk not live' ~])) ~) -[%kiln-rein des (~(put by ren.foam) dap &)] +=/ =dome:clay (~(gut by cone) [p.bec des] *dome:clay) +=+ ((slog ?:(=(%live liv.dome) ~ ['kiln: desk not live' ~])) ~) +[%kiln-rein des (~(put by ren.dome) dap &)] diff --git a/pkg/arvo/gen/hood/tomb.hoon b/pkg/arvo/gen/hood/tomb.hoon index 6fbb10f61..d424afbdd 100644 --- a/pkg/arvo/gen/hood/tomb.hoon +++ b/pkg/arvo/gen/hood/tomb.hoon @@ -13,7 +13,7 @@ =/ =lobe u.fil.arch =+ .^(=rang %cx /(scot %p p.bec)//(scot %da now)/rang) =+ .^(=cone %cx /(scot %p p.bec)//(scot %da now)/domes) -=/ domes=(list [[=ship =desk] foam]) ~(tap by cone) +=/ domes=(list [[=ship =desk] dome]) ~(tap by cone) =/ norms |^ |- ^- (set [ship desk tako norm path]) @@ -30,7 +30,7 @@ (~(uni in paths) $(aeon +(aeon))) :: ++ draw-tako - |= [=ship =desk foam =tako] + |= [=ship =desk dome =tako] ^- (set [^ship ^desk ^tako norm path]) ~+ =/ =yaki (~(got by hut.rang) tako) diff --git a/pkg/arvo/gen/norms.hoon b/pkg/arvo/gen/norms.hoon index 835407b4e..d7ad191e2 100644 --- a/pkg/arvo/gen/norms.hoon +++ b/pkg/arvo/gen/norms.hoon @@ -8,7 +8,7 @@ %- flop ^- tang %- zing %+ turn ~(tap by cone) -|= [[=ship =desk] foam] +|= [[=ship =desk] dome] :- leaf+"{}/{}:" %+ turn ~(tap of nor) |= [=path keep=?] diff --git a/pkg/arvo/sys/lull.hoon b/pkg/arvo/sys/lull.hoon index 1f8304396..8ddc9d0c5 100644 --- a/pkg/arvo/sys/lull.hoon +++ b/pkg/arvo/sys/lull.hoon @@ -834,18 +834,34 @@ [%worn =ship =desk =tako =norm] :: set commit norm [%seek =ship =desk =cash] :: fetch source blobs == :: - +$ cone (map [ship desk] foam) :: domes - +$ foam :: - $: dome :: - tom=(map tako norm) :: - nor=norm :: - fod=flue :: - liv=zest :: - ren=(map dude:gall ?) :: + +$ cone (map [ship desk] dome) :: domes + :: + :: Desk state. + :: + :: Includes a checked-out ankh with current content, most recent version, map + :: of all version numbers to commit hashes (commits are in hut.rang), and map + :: of labels to version numbers. + :: + :: `mim` is a cache of the content in the directories that are mounted + :: to unix. Often, we convert to/from mime without anything really + :: having changed; this lets us short-circuit that in some cases. + :: Whenever you give an `%ergo`, you must update this. + :: + +$ dome + $: let=aeon :: top id + hit=(map aeon tako) :: versions by id + lab=(map @tas aeon) :: labels + tom=(map tako norm) :: tomb policies + nor=norm :: default policy + mim=(map path mime) :: mime cache + fod=flue :: ford cache + wic=(map weft yoki) :: commit-in-waiting + liv=zest :: running agents + ren=rein :: force agents on/off == :: +$ crew (set ship) :: permissions group +$ dict [src=path rul=real] :: effective permission - +$ dome :: project state + +$ domo :: project state $: let=@ud :: top id hit=(map @ud tako) :: changes by id lab=(map @tas @ud) :: labels diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 33d426991..e46008de9 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -138,7 +138,7 @@ :: `sto` stores the data needed to merge, and `bas` is the base :: beak for the merge. :: -+$ melt [bas=beak con=(list [beak germ]) sto=(map beak (unit dome:clay))] ++$ melt [bas=beak con=(list [beak germ]) sto=(map beak (unit domo))] :: :: Domestic desk state. :: @@ -153,30 +153,6 @@ fiz=melt :: state for mega merges == :: -:: Desk state. -:: -:: Includes a checked-out ankh with current content, most recent version, map -:: of all version numbers to commit hashes (commits are in hut.rang), and map -:: of labels to version numbers. -:: -:: `mim` is a cache of the content in the directories that are mounted -:: to unix. Often, we convert to/from mime without anything really -:: having changed; this lets us short-circuit that in some cases. -:: Whenever you give an `%ergo`, you must update this. -:: -+$ dome - $: let=aeon :: top id - hit=(map aeon tako) :: versions by id - lab=(map @tas aeon) :: labels - tom=(map tako norm) :: tomb policies - nor=norm :: default policy - mim=(map path mime) :: mime cache - fod=flue :: ford cache - wic=(map weft yoki) :: commit-in-waiting - liv=zest :: running agents - ren=rein :: force agents on/off - == :: -:: :: Over-the-wire backfill request/response :: +$ fill @@ -2265,9 +2241,9 @@ |= [bas=beak con=(list [beak germ])] ^- melt :+ bas con - %- ~(gas by *(map beak (unit dome:clay))) - :- [bas *(unit dome:clay)] - (turn con |=(a=[beak germ] [-.a *(unit dome:clay)])) + %- ~(gas by *(map beak (unit domo))) + :- [bas *(unit domo)] + (turn con |=(a=[beak germ] [-.a *(unit domo)])) :: ++ start-fuse |= [bas=beak con=(list [beak germ])] @@ -2290,7 +2266,7 @@ =/ discarded=tang %+ turn ~(tap in sto.fiz) - |= [k=beak v=(unit dome:clay)] + |= [k=beak v=(unit domo)] ^- tank =/ received=tape ?~(v "missing" "received") leaf+"{<(en-beam k ~)>} {received}" @@ -2317,17 +2293,17 @@ ((slog [leaf+"clay: got strange fuse response {}"]~) ..take-fuse) =. fiz :+ bas.fiz con.fiz - (~(put by sto.fiz) bec `!<(dome:clay q.r.u.riot)) + (~(put by sto.fiz) bec `!<(domo q.r.u.riot)) =/ all-done=flag %- ~(all by sto.fiz) - |= res=(unit dome:clay) + |= res=(unit domo) ^- flag !=(res ~) ?. all-done ..take-fuse =| rag=rang =/ clean-state ..take-fuse - =/ initial-dome=dome:clay (need (~(got by sto.fiz) bas.fiz)) + =/ initial-dome=domo (need (~(got by sto.fiz) bas.fiz)) =/ next-yaki=yaki (~(got by hut.ran) (~(got by hit.initial-dome) let.initial-dome)) =/ parents=(list tako) ~[(~(got by hit.initial-dome) let.initial-dome)] @@ -2338,7 +2314,7 @@ =. ..take-fuse (done-fuse clean-state %& ~) (park | & [%| next-yaki(p (flop parents))] rag) =/ [bec=beak g=germ] i.merges - =/ ali-dom=dome:clay (need (~(got by sto.fiz) bec)) + =/ ali-dom=domo (need (~(got by sto.fiz) bec)) =/ result (merge-helper p.bec q.bec g ali-dom `next-yaki) ?- -.result %| @@ -2404,10 +2380,10 @@ ^+ ..merge ?~ riot (done %| %ali-unavailable ~[>[ali-ship ali-desk germ]<]) - =/ ali-dome=dome:clay + =/ ali-dome=domo ?: &(?=(@ -.q.q.r.u.riot) !=(~ -.q.q.r.u.riot)) - !<(dome:clay q.r.u.riot) - +:!<([* dome:clay] q.r.u.riot) + !<(domo q.r.u.riot) + +:!<([* domo] q.r.u.riot) =/ result=(each (unit merge-result) (pair term tang)) (merge-helper ali-ship ali-desk germ ali-dome ~) ?- -.result @@ -2423,7 +2399,7 @@ +$ merge-result [conflicts=(set path) new=yoki lat=(map lobe page)] :: ++ merge-helper - |= [=ali=ship =ali=desk =germ ali-dome=dome:clay next-yaki=(unit yaki)] + |= [=ali=ship =ali=desk =germ ali-dome=domo next-yaki=(unit yaki)] ^- (each (unit merge-result) [term tang]) |^ ^- (each (unit merge-result) [term tang]) @@ -4300,17 +4276,17 @@ :: ++ read-v |= [yon=aeon pax=path] - ^- (unit (unit [%dome (hypo dome:clay)])) + ^- (unit (unit [%dome (hypo domo)])) ?: (lth yon let.dom) - :* ~ ~ %dome -:!>(*dome:clay) - ^- dome:clay + :* ~ ~ %dome -:!>(*domo) + ^- domo :* let=yon hit=(molt (skim ~(tap by hit.dom) |=([p=@ud *] (lte p yon)))) lab=(molt (skim ~(tap by lab.dom) |=([* p=@ud] (lte p yon)))) == == ?: (gth yon let.dom) ~ - ``[%dome -:!>(*dome:clay) [let hit lab]:dom] + ``[%dome -:!>(*domo) [let hit lab]:dom] :: :: Gets all cases refering to the same revision as the given case. :: @@ -5630,19 +5606,19 @@ %- ~(gas by *cone) %+ turn ~(tap by dos.rom.ruf) |= [=desk =dojo] - [[our desk] [[let hit lab] tom nor fod liv ren]:dom.dojo] + [[our desk] dom.dojo] =. domes %- ~(uni by domes) %- ~(gas by *cone) - ^- (list [[ship desk] foam]) + ^- (list [[ship desk] dome]) %- zing - ^- (list (list [[ship desk] foam])) + ^- (list (list [[ship desk] dome])) %+ turn ~(tap by hoy.ruf) |= [=ship =rung] - ^- (list [[^ship desk] foam]) + ^- (list [[^ship desk] dome]) %+ turn ~(tap by rus.rung) |= [=desk =rede] - [[ship desk] [[let hit lab] tom nor fod liv ren]:dom.rede] + [[ship desk] dom.rede] ``[%domes !>(`cone`domes)] :: ++ cult diff --git a/pkg/arvo/ted/diff.hoon b/pkg/arvo/ted/diff.hoon index e74caa15c..234eb1ee4 100644 --- a/pkg/arvo/ted/diff.hoon +++ b/pkg/arvo/ted/diff.hoon @@ -14,8 +14,8 @@ =/ [b-path=path shallow=flag] ?:(?=([^ *] b) b [`path`b |]) =/ a-beam (need (de-beam a-path)) =/ b-beam (need (de-beam b-path)) -;< a-dome=dome bind:m (get-from-clay a-beam dome %v) -;< b-dome=dome bind:m (get-from-clay b-beam dome %v) +;< a-domo=domo bind:m (get-from-clay a-beam domo %v) +;< b-domo=domo bind:m (get-from-clay b-beam domo %v) ;< diffs=(list diff-type) bind:m (diff-beams a-beam b-beam) %- pure:m !> ^- tang diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon index 785ea6abb..06ce86e5f 100644 --- a/pkg/base-dev/sur/hood.hoon +++ b/pkg/base-dev/sur/hood.hoon @@ -73,9 +73,9 @@ ?~ sink [hash]~ (mergebase-hashes our syd now her.u.sink sud.u.sink) =/ dek (~(got by tyr) syd) - =/ =foam (~(got by cone) our syd) + =/ =dome (~(got by cone) our syd) =/ [on=(list [@tas ?]) of=(list [@tas ?])] - (skid ~(tap by ren.foam) |=([* ?] +<+)) + (skid ~(tap by ren.dome) |=([* ?] +<+)) =/ sat ?- zest.dek %live "running" @@ -130,7 +130,7 @@ =/ syd (scot %tas desk) =/ yon (scot %ud aeon) :: - =/ dom .^(dome cv/~[her syd yon]) + =/ dom .^(domo cv/~[her syd yon]) =/ tak ~| aeons=~(key by hit.dom) (scot %uv (~(got by hit.dom) aeon)) =/ yak .^(yaki cs/~[her syd yon %yaki tak])