Merge remote-tracking branch 'origin/master' into philip/kale

bin/brass.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5debf91880c73d052429ca487555aa60aa2ee4f173c9f059e30b61372689910e
-size 7118127
+oid sha256:8f0e4a88d79980bbbe49776f76e8212ed15c87c9cf068903f7cfbb7bf1e4244d
+size 10059881

bin/ivory.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b1571c0f3039a71a900fc968052cd2f9a2245f0f7ac727be722c4ce002fbc8a
-size 4803678
+oid sha256:d77f1b019165a2efee9109206b608961a9eede56cf99cf791ac928d795c506aa
+size 5026254

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38f3248052e057fcea95b240a4c586cef5ba9bce06568203a692312a9cfcb4cf
-size 9731837
+oid sha256:166c9cb6e57c1a063d1f0df5a26940b64976bb31789ceeb1b26d029f466b630e
+size 12567624

nix/ops/solid/builder.sh

@@ -15,8 +15,9 @@ cleanup () {
 
 trap cleanup EXIT
 
-# update pill strategy to ensure correct staging
+#  update pill strategy to ensure correct staging
 #
+
 herb ./pier -p hood -d "+hood/mount /=home="
 
 until [ -d ./pier/home ]
@@ -24,14 +25,36 @@ do
   sleep 1
 done
 
-cp $ARVO/app/lens.hoon ./pier/home/app/
-cp $ARVO/lib/pill.hoon ./pier/home/lib/
-chmod -R u+rw ./pier/home/lib/
+#  update :lens, :dojo and dependencies
+#
+#    XX reduce this list
+#
+cp $ARVO/app/lens.hoon   ./pier/home/app/      2>/dev/null || true
+cp $ARVO/app/dojo.hoon   ./pier/home/app/      2>/dev/null || true
+cp $ARVO/lib/base64.hoon ./pier/home/lib/      2>/dev/null || true
+cp $ARVO/lib/server.hoon ./pier/home/lib/      2>/dev/null || true
+cp $ARVO/lib/sole.hoon   ./pier/home/lib/      2>/dev/null || true
+mkdir -p ./pier/home/mar/lens/
+cp $ARVO/mar/lens/*      ./pier/home/mar/lens/ 2>/dev/null || true
+
+cp $ARVO/sur/lens.hoon   ./pier/home/sur/      2>/dev/null || true
+cp $ARVO/sur/sole.hoon   ./pier/home/sur/      2>/dev/null || true
+
+#  update +solid and its dependencies
+#
+cp $ARVO/lib/pill.hoon   ./pier/home/lib/      2>/dev/null || true
+cp $ARVO/gen/solid.hoon  ./pier/home/gen/      2>/dev/null || true
+
+chmod -R u+rw ./pier/home/
 
 herb ./pier -p hood -d "+hood/commit %home"
 herb ./pier -p hood -d "+hood/unmount %home"
 
-# stage new desk for pill contents
+#  XX horrible hack to ensure the update is applied first
+#
+sleep 10
+
+#  stage new desk for pill contents
 #
 herb ./pier -p hood -d '+hood/merge %stage our %home'
 herb ./pier -p hood -d "+hood/mount /=stage="

pkg/arvo/app/talk.hoon

@@ -716,8 +716,12 @@
       ++  circ                                          ::  circle
         ;~  pose
           (cold incir col)
-          ;~(pfix cen (stag self urs:ab))
           ;~(pfix net (stag (^sein:title self) urs:ab))
+          ;~  pfix  cen
+            %+  stag  self
+            %+  sear  |=(circ=name ?:(=('' circ) ~ (some circ)))
+            urs:ab
+          ==
         ::
           %+  cook
             |=  {a/@p b/(unit term)}

pkg/arvo/lib/pill.hoon

@@ -117,7 +117,7 @@
   =?  hav  ?=(^ fil.lon)
       ::  XX  this whitelist needs to be reviewed
       ::
-      ?.  ?=  ?($css $hoon $json $md $txt $udon $umd)
+      ?.  ?=  ?($css $hoon $html $js $json $md $png $txt $udon $umd)
           -.tyl
         ::
         ::  install only files with whitelisted marks

pkg/arvo/lib/tapp.hoon

@@ -254,10 +254,10 @@
       ::  XX use only for development may break contracts!
       ::  XX if active clam contracts only to abort transaction?
       ::
-      ~&  [%tapp-reset dap.bowl]
-      `this-tapp
-      ::  ~|  [%tapp-load-incompatible dap.bowl]
-      ::  !!
+      ::  ~&  [%tapp-reset dap.bowl]
+      ::  `this-tapp
+      ~|  [%tapp-load-incompatible dap.bowl]
+      !!
     ::
     ::  because the clam replaces the active continuation with
     ::  the bunt of its mold, we must fail the transaction

pkg/arvo/sys/zuse.hoon

@@ -7046,6 +7046,10 @@
         =.  size.queue   +(size.queue)
         ::
         [~ queue]
+      ::  max is zero, the oldest item to return is the one which just went in.
+      ::
+      ?:  =(~ queue.queue)
+        [`item queue]
       ::  we're at max capacity, so pop before pushing; size is unchanged
       ::
       =^  oldest  queue.queue  ~(get to queue.queue)

pkg/arvo/tests/sys/zuse/contain/capped-queue.hoon

@@ -125,4 +125,29 @@
     results1
     results2
   ==
+::
+++  test-put-zero
+  ::
+  =|  q=(capped-queue @u)
+  =.  max-size.q  0
+  ::  specialize type
+  ::
+  =+  to-capped-queue=(to-capped-queue @u)
+  ::  push enough values to evict one
+  ::
+  ::
+  =^  maybe1  q  (~(put to-capped-queue q) 5)
+  =/  results1
+    %+  expect-eq
+      !>  [~ 5]
+      !>  maybe1
+  =/  results2
+    %+  expect-eq
+      !>  0
+      !>  size.q
+  ::
+  ;:  weld
+    results1
+    results2
+  ==
 --