ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-06 23:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

desk-jams: update

Browse Source 
Also cleans docket back up.
This commit is contained in:
Fang 2021-09-28 19:30:07 +04:00
parent 6277213079
commit d0091baa62
No known key found for this signature in database
GPG Key ID: EB035760C1BBA972
6 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/arvo/tmp/base.jam
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:5c11b58b242c1a9ecc6a38b4a973b649e6e4cdb8564750c77eca43bb4a8b2673 oid sha256:422a24262e4b833c37bcd9b4e7cb791988c60b7dfdd1717cf26f00527dbee274
size 3435011 size 3437147

4
pkg/arvo/tmp/bitcoin.jam
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:0ed5eb6e5e3a65e6133f41ee1a3b42f491c6e330e9706e9739c985c82a7bfba9 oid sha256:0b47b70d327dd15f0404eb997f5bb01540bf20a2dce7a3c5ef60e1d6b14b4323
size 456352 size 460354

4
pkg/arvo/tmp/garden.jam
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:41adc2a69b36c4789ad0d03f0bd013bdf590fbaec5764931864a09573b6dda10 oid sha256:0ee64f5d743f70ffd86bcb0d5a939730437f6edbd3ba6dd952bb2d2dea7a5e8f
size 375596 size 374466

4
pkg/arvo/tmp/landscape.jam
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:21faf972905f76b7c0f78872b902f92c159beb068a07e46e2070fdf04fb18d47 oid sha256:5f36c76aefedee3f5cb181eef6e45639220a635c2a5960f0631f7bfcddec20b8
size 1808522 size 1810008

4
pkg/arvo/tmp/webterm.jam
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a91c88c06d38020cf6d733dc2466578e636c57b102b66b7fd0c9872883b918ca oid sha256:05bf8142e0ea53397bd9fbf28304743fe332b8ad4b1b2e7bd68ec1872bf9c2c9
size 306442 size 305573

18
pkg/garden/app/docket.hoon
View File

@ -36,6 +36,7 @@
def ~(. (default-agent this %|) bowl) def ~(. (default-agent this %|) bowl)
cc ~(. +> bowl) cc ~(. +> bowl)
ch ch:cc ch ch:cc
cg cg:cc
:: ::
++ on-init ++ on-init
^- (quip card _this) ^- (quip card _this)
@ -88,7 +89,6 @@
++ install ++ install
|= [=ship =desk] |= [=ship =desk]
^- (quip card _state) ^- (quip card _state)
~& [dap.bowl %install ship desk]
=+ .^(=treaty:treaty %gx (scry:io %treaty /treaty/(scot %p ship)/[desk]/noun)) =+ .^(=treaty:treaty %gx (scry:io %treaty /treaty/(scot %p ship)/[desk]/noun))
?: (~(has by charges) desk) ?: (~(has by charges) desk)
~| bad-install-desk/desk ~| bad-install-desk/desk
@ -102,7 +102,6 @@
++ uninstall ++ uninstall
|= =desk |= =desk
^- (quip card _state) ^- (quip card _state)
~& [dap.bowl %uninstall desk]
=/ =charge ~|(no-charge-installed+desk (~(got by charges) desk)) =/ =charge ~|(no-charge-installed+desk (~(got by charges) desk))
=. charges (~(del by charges) desk) =. charges (~(del by charges) desk)
=? by-base ?=(%glob -.href.docket.charge) =? by-base ?=(%glob -.href.docket.charge)
@ -135,7 +134,7 @@
~| [%glob-unavailable requested=hash have=have] ~| [%glob-unavailable requested=hash have=have]
?> =(hash have) ?> =(hash have)
:_ state :_ state
(fact-init-kick:io (glob:cg:cc glob.chad.charge)) (fact-init-kick:io (glob:cg glob.chad.charge))
== ==
[cards this] [cards this]
:: ::
@ -163,7 +162,7 @@
:: ::
[%x %charges ~] [%x %charges ~]
:- ~ :- ~ :- ~ :- ~
%- charge-update:cg:cc %- charge-update:cg
:- %initial :- %initial
%- ~(gas by *(map desk charge)) %- ~(gas by *(map desk charge))
%+ turn ~(tap by charges) %+ turn ~(tap by charges)
@ -185,24 +184,21 @@
:: ::
++ take-kiln ++ take-kiln
^- (quip card _state) ^- (quip card _state)
~& [dap.bowl %take-kiln -.sign]
?+ -.sign (on-agent:def:cc wire sign) ?+ -.sign (on-agent:def:cc wire sign)
%kick [(~(watch-our pass /kiln) %hood /kiln/vats)^~ state] %kick [(~(watch-our pass /kiln) %hood /kiln/vats)^~ state]
:: ::
%fact %fact
~& [dap.bowl %kiln-fact p.cage.sign]
?. ?=(%kiln-vats-diff-0 p.cage.sign) `state ?. ?=(%kiln-vats-diff-0 p.cage.sign) `state
=+ !<(=diff:hood q.cage.sign) =+ !<(=diff:hood q.cage.sign)
~& [dap.bowl %kiln-diff -.diff]
=* cha ~(. ch desk.diff) =* cha ~(. ch desk.diff)
?- -.diff ?- -.diff
?(%block %reset %merge-sunk %merge-fail) ?(%block %reset %merge-sunk %merge-fail)
~& [dap.bowl %ignoring-kiln-diff -.diff] ::TODO removeme
`state `state
:: ::
%commit %commit
=* cha ~(. ch desk.diff) ?. docket-exists:cha
?. docket-exists:cha `state ~& [dap.bowl %no-docket-file-for desk.diff]
`state
:: always update the docket in state to match clay's :: always update the docket in state to match clay's
:: ::
=/ =docket docket:cha =/ =docket docket:cha
@ -218,7 +214,6 @@
=. by-base (~(put by by-base) base.href.docket desk.diff) =. by-base (~(put by by-base) base.href.docket desk.diff)
:: if the glob specification is unchanged, keep it :: if the glob specification is unchanged, keep it
:: ::
::
?: &(?=(^ pre) =(href.docket.u.pre href.docket)) ?: &(?=(^ pre) =(href.docket.u.pre href.docket))
[~[add-fact:cha] state] [~[add-fact:cha] state]
:: if the glob spec changed, but we already host it, keep it :: if the glob spec changed, but we already host it, keep it
@ -354,6 +349,7 @@
++ on-fail on-fail:def ++ on-fail on-fail:def
++ on-leave on-leave:def ++ on-leave on-leave:def
-- --
::
|_ =bowl:gall |_ =bowl:gall
++ io ~(. agentio bowl) ++ io ~(. agentio bowl)
++ pass pass:io ++ pass pass:io