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

This commit is contained in:
Galen Wolfe-Pauly 2015-04-08 11:46:14 -07:00
commit 8e37b7608c
3 changed files with 28 additions and 7 deletions

View File

@ -142,6 +142,7 @@
== ::
++ note-dill :: note to self, odd
$% [%crud p=@tas q=(list tank)] ::
[%init p=ship] ::
[%text p=tape] ::
[%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path
@ -155,7 +156,7 @@
== ::
++ note ::
$% [%a note-ames] :: out request $->
[%c note-clay]
[%c note-clay] ::
[%d note-dill] ::
[%g note-gall] ::
== ::
@ -375,11 +376,15 @@
:_(..^$ [hen %pass ~ (note %a p.q.hic)]~)
?: ?=(%flog -.q.hic)
:: ~& [%dill-flog +.q.hic]
?: ?=([%crud %hax-init [%leaf *] ~] p.q.hic)
=+ him=(slav %p (crip p.i.q.p.q.hic))
:_(..^$ ?~(hey.all ~ [u.hey.all %give %init him]~))
:_(..^$ ?~(hey.all ~ [u.hey.all %slip %d p.q.hic]~))
=. hey.all ?^(hey.all hey.all `hen)
?: ?=(%init -.q.hic)
:: ~& [%call-init hen]
?: =(ore.all `p.q.hic)
[~ ..^$]
[[hen %give q.hic]~ ..^$]
=: ore.all `p.q.hic
dug.all ~
==
@ -392,7 +397,8 @@
[[fap %dojo] [fap %talk] ~]
[[p.q.hic %dojo] [p.q.hic %talk] ~]
=^ moz all abet:(need (ax (need hey.all) [%flow %sole flo]))
[moz ..^$]
?: |((lth p.q.hic 256) (gte p.q.hic (bex 64))) [moz ..^$] :: XX HORRIBLE
[:_(moz [(need hey.all) %give %init p.q.hic]) ..^$]
=+ nus=(ax hen q.hic)
?~ nus
~& [%dill-no-flow q.hic]
@ -423,8 +429,10 @@
^- [p=(list move) q=_..^$]
?: =(~ ore.all)
?: ?=([%a %init *] q.hin)
:: ~& [%take-init hen]
=. hey.all ?^(hey.all hey.all `hen)
[[[hen %give +.q.hin] ~] ..^$]
:: [~ ..^$]
~& [%take-back q.hin]
[~ ..^$]
?. (~(has by dug.all) hen)

View File

@ -26,7 +26,8 @@
$% [%reload p=(list term)] :: reload vanes
== ::
++ dill-flog :: sent to %dill
$% [%veer p=@ta q=path r=@t] :: install vane
$% [%crud p=%hax-init [%leaf p=tape] ~] :: initialize ship
[%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path
[%verb ~] :: verbose mode
== ::
@ -122,6 +123,13 @@
:_ moz
[ost %pass /verb %d %flog %verb ~]
==
++ he-wish-init
|= him=ship
%_ +>.$
moz
:_ moz
[ost %pass /init %d %flog %crud %hax-init leaf/(scow %p him) ~]
==
--
::
++ hake :: poke core
@ -139,6 +147,11 @@
~& %poke-helm-verb
he-abet:he-wish-verb:(hake ost her)
::
++ poke-helm-init
|= [ost=bone her=ship him=ship]
~& %poke-helm-init
he-abet:(he-wish-init:(hake ost her) him)
::
++ poke-helm-reload
|= [ost=bone her=ship all=(list term)]
~& %poke-helm-reload

View File

@ -324,10 +324,10 @@
|= num=@ud
^+ +>
=+ bun=(scow %ud num)
=+ pad=(sub 36 (lent bun))
=+ now=`@da`(dis lat.hid 0xffff.ffff.ffff.ffff.0000.0000.0000.0000)
:: =+ pad=(sub 36 (lent bun))
:: =+ now=`@da`(dis lat.hid 0xffff.ffff.ffff.ffff.0000.0000.0000.0000)
%+ sh-fact %txt
"----------------| [{bun}] {(runt [pad ' '] (scow %da now))}"
(runt [(sub 15 (lent bun)) '-'] "[{bun}]")
::
++ sh-repo-house-diff
|= [one=shelf two=shelf]