Merge branch 'master' of github.com:urbit/urbit

arvo/ames.hoon

@@ -1775,6 +1775,10 @@
       ?~  gys  ~
       =+  zet=zest:(ho:(~(um am [now fox]) our) his)
       [~ ?:(=(%show i.tyl) >zet< zet)]
+    ?:  ?=([%pals ~] tyl)
+      ?.  =(our his)
+        ~
+      [~ pals:(~(um am [now fox]) our)]
     ?.  ?=([%life ~] tyl)
       =+  muc=$(tyl [%life ~])
       (perm our his ?~(muc 0 (,@ud u.muc)) tyl)

arvo/hoon.hoon

@@ -5395,7 +5395,7 @@
   ++  rads                                              ::  random continuation
     |=  b=@
     =+  r=(rad b)
-    [+>.$(a (shas %og-s r)) r]
+    [r +>.$(a (shas %og-s r))]
   ++  raw                                               ::  random bits
     ~/  %raw
     |=  b=@  ^-  @
@@ -5412,7 +5412,7 @@
   ++  raws                                              ::  random bits continuation
     |=  b=@
     =+  r=(raw b)
-    [+>.$(a (shas %og-s r)) r]
+    [r +>.$(a (shas %og-s r))]
   --
 ++  shaz                                                ::  sha-512
   |=  ruz=@  ^-  @

main/bin/begin.hoon

@@ -4,7 +4,7 @@
 =>  .(-< `who=@p`-<)
 =>  .(+ =>(+ ^/===/lib/pony))
 |=  [est=time *]
-|=  arg=$|(~ [p=@p ~])
+|=  arg=$|(~ [p=@p q=$|(~ [p=@p ~])])
 =-  ^-  bowl
     ?^  arg  (fud p.arg)
     %+  pomp  ""
@@ -65,8 +65,10 @@
   %+  pomp  ""
   %+  pomp  "                  -- Bunting, _Chomei at Toyama_"
   %+  pogo  (pond ^:@/===doc%/warning/txt)
-  %+  (polo %text "Your ticket: ~" ~ ~)
-    fed:ag
+  =-  ?:  ?=([@ @ ~] arg)
+        (- ~ p.q.arg)
+      %+  (polo %text "Your ticket: ~" ~ ~)
+      fed:ag  -
   |=  [* tic=@p]
   %+  pogo  (pond ^:@/===doc%/entropy/txt)
   %+  (polo %pass "Entropy: " ~ ~)

main/bin/update.hoon

@@ -14,8 +14,11 @@
         =+  lum=(~(auld ze est owr) gem who des sab)
         ?~  lum
           ^-  gift
-          :+  %la  %leaf
-          "{(trip des)} failed to apply, please rerun with a merge option"
+          :^  %la  %rose  [": " "" ""]
+          :~  
+            leaf/"{(trip des)} failed to apply, please rerun with a merge option"
+            (skol -:!>(_germ))
+          ==
         ?~  u.lum
           `gift`[%la %leaf "{(trip des)} is up to date"]
         `gift`[%ok des u.u.lum]

main/sys/asset/ref/gate.hoon

@@ -1 +1 @@
-,[p=ship q=guid]
+,[p=ship q=@uwK]