Merge branch 'dist' of github.com:urbit/urbit into dist

2024-12-18 15:55:00 +03:00 · 2021-09-27 15:10:31 -05:00 · 2021-09-27 15:10:31 -05:00 · 8d5e4e797d
commit 8d5e4e797d
parent e8d6e28ae8 4785dbbee5
9 changed files with 84 additions and 19 deletions
--- a/bin/multi.pill
+++ b/bin/multi.pill
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdd83de4458a3fbd9fd079fd2664d112c20e60ea1ecb65ac9256cebbda8ac60b
-size 14970372
+oid sha256:4b66468b2a748bb4337722776c009263bc7d99ea5394d5d918e9a4abf51f4633
+size 14973033
--- a/pkg/arvo/lib/desk-jam.hoon
+++ b/pkg/arvo/lib/desk-jam.hoon
@ -4,10 +4,17 @@
  |=  [our=ship =desk now=@da]
  ~>  %slog.0^leaf/"jamming desk {<desk>}"
  %-  jam
+  %-  ?:(=(%base desk) remove-tmp-dir same)
  %-  ankh-to-map
  =<  ank
  .^(dome:clay %cv /(scot %p our)/[desk]/(scot %da now))
 ::
++  remove-tmp-dir
+  |=  fiz=(map path page)
+  ^-  (map path page)
+  %-  ~(gas by *(map path page))
+  (skip ~(tap by fiz) |=([p=path *] ?=([%tmp *] p)))
+::
 ++  ankh-to-map
  =|  res=(map path page)
  =|  pax=path
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@ -248,6 +248,9 @@
  =.  ..on-init  abet:(install-local:vats %base)
  =?  ..on-init  ?=(?(%earl %duke %king) (clan:title our))
    abet:(install:vats %base sop %kids)
+  ::
+  ::  watch for gall reloading
+  =.  ..on-init  abet:gall-lyv:vats
  ::  install other desks
  ::
  =/  dez=(list desk)  ~(tap in desks)
@ -337,10 +340,12 @@
    abet:(install:vats %base our %base)
  =?  kiln  ?=(^ old-ota)
    abet:(install:vats %base [her sud]:u.old-ota)
-  =.  kiln
-    =/  kel  (fall wef zuse/zuse)
+  =?  kiln  (lth old-version %7)
+    abet:gall-lyv:vats
+  =?  kiln  ?=(^ wef)
+    ::  $% is a hack to workaround an initialization bug
    =/  except=(set desk)  (sy %base %kids ~)
-    (bump:vats kel except force=%.n)
+    (bump:vats u.wef except force=%.n)
  =.  wef  ~
  abet:kiln
 ::
@ -416,6 +421,18 @@
    ++  sync-da   (warp %sync [%sing %w da+now /])
    ++  sync-ud   (warp %sync [%sing %w ud+aeon:ral /])
    ++  download  (warp %download [%sing %v ud+aeon:ral /])
+    ++  gall-lyv
+      =/  paths=(set [care:clay path])
+        %-  sy
+        :~  [%z /sys/hoon/hoon]
+            [%z /sys/arvo/hoon]
+            [%z /sys/lull/hoon]
+            [%z /sys/zuse/hoon]
+            [%z /sys/vane/gall/hoon]
+        ==
+      %+  clay-card  %gall-lyv
+      [%warp our %base ~ %mult da+now paths]
+      ::
    ++  warp
      |=  [s=term r=rave]
      (clay-card s %warp ship:ral desk:ral `r)
@ -521,6 +538,11 @@
    =/  rel  ral
    =.  rail.rak  `rel(paused &, aeon 0)
    vats
+  ::
+  ::  +gall-lyv: watch gall source for reloading
+  ++  gall-lyv
+    =.  vats  (abed %base)
+    (emit gall-lyv:pass)
  ::  +remove-upstream: stop listening to an upstream for changes
  ::
  ++  remove-upstream
@ -674,6 +696,7 @@
      %download    (take-download syn)
      %merge-main  (take-merge-main syn)
      %merge-kids  (take-merge-kids syn)
+      %gall-lyv    (take-gall-lyv syn)
    ==
  ::
  ++  take-find
@ -712,6 +735,10 @@
      ~>  %slog.(fmt "cancelled (2) install into {here}, retrying")
      reset
    ~>  %slog.(fmt "finished downloading update for {here}")
+    ?.  (get-remote-diff our loc now [ship desk aeon]:ral)
+      ~>  %slog.(fmt "remote is identical to {here}, skipping")
+      =.  rail.rak  `%*(. ral aeon +(aeon:ral))
+      (emit sync-ud:pass)
    =/  old-weft  `weft`[%zuse zuse]
    =/  new-weft
      ?:  =(our ship:ral)
@ -825,9 +852,9 @@
      =.  vats  (emit (diff:give %merge-fail loc rak p.p.syn))
      vats
    =.  vats  take-commit
-    ~>  %slog.(fmt "merging %base into %kids at {<kel>}")
    ?.  =(%base loc)
      vats
+    ~>  %slog.(fmt "merging %base into %kids at {<kel>}")
    (emit merge-kids:pass)
  ::
  ++  take-merge-kids
@ -845,6 +872,17 @@
          (emit (diff:give %merge-fail %kids rak p.p.syn))
    ==
  ::
+  ++  take-gall-lyv
+    |=  syn=sign-arvo
+    ^+  vats
+    =.  vats  gall-lyv
+    =/  vets  ~(tap in ~(key by ark))
+    |-
+    ?~  vets  vats
+    =.  vats  (abed i.vets)
+    =.  vats  update-running-dudes
+    $(vets t.vets)
+  ::
  ++  take-onto
    |=  [=wire syn=sign-arvo]
    ^+  kiln
--- a/pkg/arvo/tmp/base.jam
+++ b/pkg/arvo/tmp/base.jam
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ac4896ee455b4e585f537a16d9702e76487481a58a57c7c195805c4fe18213e
-size 9794654
+oid sha256:77a1db934f8fe10b1ec2a2cdb91f6293a705a6a1fcae8c065e53223dfe0a3e59
+size 3425897
--- a/pkg/arvo/tmp/bitcoin.jam
+++ b/pkg/arvo/tmp/bitcoin.jam
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccd2d45a3dd0a74a0800015bd56f718ab1898649c9bde7ee0bdb69031a78e3e6
-size 456440
+oid sha256:0ed5eb6e5e3a65e6133f41ee1a3b42f491c6e330e9706e9739c985c82a7bfba9
+size 456352
--- a/pkg/arvo/tmp/garden.jam
+++ b/pkg/arvo/tmp/garden.jam
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16f1233c0172427b70693e5f1c212a2c9e18099dc89fc40a0b1729491588f2ff
-size 375684
+oid sha256:b4df7900d4c90f1253528942c38ae6ed421fff55364ab5062605fde115e1ada8
+size 376647
--- a/pkg/arvo/tmp/webterm.jam
+++ b/pkg/arvo/tmp/webterm.jam
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7aa48cb58d18657d60626eb2c75b5f596dc2366db8475fa174f0e0263dba3035
-size 306530
+oid sha256:a91c88c06d38020cf6d733dc2466578e636c57b102b66b7fd0c9872883b918ca
+size 306442
--- a/pkg/base-dev/sur/hood.hoon
+++ b/pkg/base-dev/sur/hood.hoon
@ -152,6 +152,8 @@
 ++  read-bill
  |=  [our=ship =desk now=@da] 
  =/  pax  (en-beam [our desk da+now] /desk/bill)
+  ?.  (~(has in .^((set ^desk) cd/~[(scot %p our) ~ (scot %da now)])) desk)
+    *(list dude)
  ?.  .^(? cu/pax)
    *(list dude)
  .^((list dude) cx/pax)
@ -171,12 +173,18 @@
    ?~  upstream
      (read-bill local)
    ?:  =(ship.u.upstream our.local)
-      (read-bill local)
+      (read-bill local(desk desk.u.upstream))
    (read-bill-foreign u.upstream)
  =/  want  (get-apps-want all rein)
  =/  have  (get-apps-live local)
  [want (skip have ~(has in (sy want)))]
 ::
++  get-remote-diff
+  |=  [our=ship here=desk now=@da her=ship there=desk when=aeon]
+  =+  .^(our-hash=@uv cz/[(scot %p our) here (scot %da now) ~])
+  =+  .^(her-hash=@uv cz/[(scot %p her) there (scot %ud when) ~])
+  !=(our-hash her-hash)
+::
 ++  get-apps-live
  |=  [our=ship =desk now=@da]
  ^-  (list dude)
--- a/pkg/garden/app/docket.hoon
+++ b/pkg/garden/app/docket.hoon
@ -251,7 +251,6 @@
          ?.  ?=([%suspend ~ *] chad.charge)
            [%install ~]
          [%glob u.glob.chad.charge]
-        ~&  %rev
        :_(state [add-fact fetch-glob]:cha)
      ==
    ==
@ -329,9 +328,14 @@
        ?+    p.cage.sign  `state
            %thread-fail
          =+  !<([=term =tang] q.cage.sign)
-          =.  charges  (new-chad:cha hung+'glob-failed')
-          :-  ~[add-fact:cha]
-          ((slog leaf+"docket: thread failed; will retry" leaf+<term> tang) state)
+          ?.  =(term %cancelled)
+            =.  charges  (new-chad:cha hung+'glob-failed')
+            :-  ~[add-fact:cha]
+            ((slog leaf+"docket: thread failed;" leaf+<term> tang) state)
+          %-  (slog leaf+"docket: thread cancelled; retrying" leaf+<term> tang)
+          =.  charges  (new-chad:cha %install ~)
+          :_   state
+          [leave-glob:cha add-fact:cha fetch-glob:cha]
        ::
            %thread-done
          =+  !<(=glob q.cage.sign)
@ -647,6 +651,14 @@
    %+  ~(put by charges)  desk
    [d chad:(~(gut by charges) desk *charge)]
  ++  new-chad  |=(c=chad (~(jab by charges) desk |=(charge +<(chad c))))
+  ++  leave-glob
+    ^-  card
+    =/  =charge
+      ~|  desk/desk
+      (~(got by charges) desk)
+    ?>  ?=(%glob -.href.docket.charge)
+    =/  ref  glob-reference.href.docket.charge
+    (leave-our:(pass (glob-wire ref)) %spider)
  ++  fetch-glob
    ^-  (list card)
    =/  =charge