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

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

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-07-24 11:16:50 -07:00
commit f9e53c2541
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arvo/ames.hoon
View File

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

4
arvo/hoon.hoon
View File

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

8
main/bin/begin.hoon
View File

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

7
main/bin/update.hoon
View File

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

2
main/sys/asset/ref/gate.hoon
View File

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