urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'typedclay' into test

Browse Source
This commit is contained in:
Philip C Monk 2015-04-28 17:39:07 -04:00
commit e39cfecded
3 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/app/helm/core.hook
View File

@ -62,6 +62,7 @@
++ note-clay :: filesystem command ++ note-clay :: filesystem command
$% [%font p=@p q=@tas r=@p s=@tas] :: $% [%font p=@p q=@tas r=@p s=@tas] ::
[%info p=@p q=@tas r=nori] :: [%info p=@p q=@tas r=nori] ::
[%lynx p=@p q=@tas r=(unit ,?)] ::
[%merg p=@p q=@tas r=@p s=@tas t=germ] :: [%merg p=@p q=@tas r=@p s=@tas t=germ] ::
== :: == ::
++ note-dill :: system command ++ note-dill :: system command
@ -157,13 +158,21 @@
[ost %pass /reload %d %flog %veer tip pax txt] [ost %pass /reload %d %flog %veer tip pax txt]
:: ::
++ he-wish-sync ++ he-wish-sync
|= [syd=@tas her=@p sud=@tas ~] |= [syd=desk her=ship sud=desk ~]
%_ . %_ .
moz moz
:_ moz :_ moz
[ost %pass /sync %c %font our.hid syd her sud] [ost %pass /sync %c %font our.hid syd her sud]
== ==
:: ::
++ he-wish-unix
|= [syd=desk syn=(unit ,?)]
%_ .
moz
:_ moz
[ost %pass /unix %c %lynx our.hid syd syn]
==
::
++ he-wish-verb ++ he-wish-verb
%_ . %_ .
moz moz
@ -436,10 +445,15 @@
he-abet:merge-abet:(start:(he-wish-merge:(hoke ost her) syd) ali sud gem) he-abet:merge-abet:(start:(he-wish-merge:(hoke ost her) syd) ali sud gem)
:: ::
++ poke-helm-sync ++ poke-helm-sync
|= [ost=bone her=ship all=[@tas @p @tas ~]] |= [ost=bone her=ship all=[desk ship desk ~]]
~& %poke-helm-sync ~& %poke-helm-sync
he-abet:(he-wish-sync:(hake ost her) all) he-abet:(he-wish-sync:(hake ost her) all)
:: ::
++ poke-helm-unix
|= [ost=bone her=ship all=[desk (unit ,?)]]
~& %poke-helm-unix
he-abet:(he-wish-unix:(hake ost her) all)
::
++ poke-helm-begin ++ poke-helm-begin
|= [ost=bone you=ship begs] |= [ost=bone you=ship begs]
~& %poke-helm-begin ~& %poke-helm-begin

58
main/arvo/clay.hoon
View File

@ -15,6 +15,7 @@
dom=dome :: desk data dom=dome :: desk data
dok=(unit dork) :: outstanding diffs dok=(unit dork) :: outstanding diffs
mer=(map (pair ship desk) mery) :: outstanding merges mer=(map (pair ship desk) mery) :: outstanding merges
syn=? :: sync to unix
== :: == ::
++ gift :: out result <-$ ++ gift :: out result <-$
$% [%ergo p=@p q=@tas r=@ud s=(list ,[path (unit mime)])] $% [%ergo p=@p q=@tas r=@ud s=(list ,[path (unit mime)])]
@ -33,6 +34,7 @@
[%info p=@p q=@tas r=nori] :: internal edit [%info p=@p q=@tas r=nori] :: internal edit
[%init p=@p] :: report install [%init p=@p] :: report install
[%into p=@p q=@tas r=khan] :: external edit [%into p=@p q=@tas r=khan] :: external edit
[%lynx p=@p q=@tas r=(unit ,?)] :: sync to unix
[%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks [%merg p=@p q=@tas r=@p s=@tas t=germ] :: merge desks
[%plug p=@p q=@tas r=@p s=@tas] :: unset upstream [%plug p=@p q=@tas r=@p s=@tas] :: unset upstream
[%wart p=sock q=@tas r=path s=*] :: network request [%wart p=sock q=@tas r=path s=*] :: network request
@ -132,6 +134,7 @@
dom=dome :: revision state dom=dome :: revision state
dok=(unit dork) :: outstanding diffs dok=(unit dork) :: outstanding diffs
mer=(map (pair ship desk) mery) :: outstanding merges mer=(map (pair ship desk) mery) :: outstanding merges
syn=? :: sync to unix
== :: == ::
++ riff ,[p=desk q=(unit rave)] :: request/desist ++ riff ,[p=desk q=(unit rave)] :: request/desist
++ rind :: request manager ++ rind :: request manager
@ -165,7 +168,7 @@
mim=(map path mime) :: mime cache mim=(map path mime) :: mime cache
== :: == ::
-- => -- =>
:::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 4cA, filesystem logic :: :: section 4cA, filesystem logic ::
:: ::
:: ::
@ -296,6 +299,11 @@
fod.u.ref (~(put by fod.u.ref) hen inx) fod.u.ref (~(put by fod.u.ref) hen inx)
== ==
:: ::
++ lynx
|= sun=(unit ,?)
^+ +>
+>.$(syn ?~(sun !syn u.sun))
::
++ ease :: release request ++ ease :: release request
^+ . ^+ .
?~ ref ?~ ref
@ -722,6 +730,7 @@
=. ank.dom (checkout-ankh:ze (mo can)) =. ank.dom (checkout-ankh:ze (mo can))
:: ~& %checked-out :: ~& %checked-out
?~ hez +>.$(dok ~) ?~ hez +>.$(dok ~)
?. syn +>.$(dok ~)
=+ ^= ceq =+ ^= ceq
|= a=miso |= a=miso
?| ?=(%del -.a) ?| ?=(%del -.a)
@ -758,7 +767,8 @@
yel yel
[[hen %note '!' %rose [" " "" ""] leaf/"clay ergo failed" p.res] yel] [[hen %note '!' %rose [" " "" ""] leaf/"clay ergo failed" p.res] yel]
== ==
?~ hez ~& %no-sync-duct !! ?~ hez ~|(%no-sync-duct !!)
?. syn ~|(%sync-off !!)
=+ cay=p.res =+ cay=p.res
?@ p.cay ~| %patch-bad-marc !! ?@ p.cay ~| %patch-bad-marc !!
%= +>.$ %= +>.$
@ -1440,16 +1450,26 @@
:^ ~ ~ %arch :^ ~ ~ %arch
:- -:!>(*arch) :- -:!>(*arch)
^- arch ^- arch
:+ *@uvI =+ ^- descendants=(list (pair path lobe))
?.((~(has by q.yak) pax) ~ `0vfak.ehash) :: XX hash of lobes
^- (map span ,~)
%- mo ^- (list (pair span ,~))
%+ turn %+ turn
%+ skim (~(tap by (~(del by q.yak) pax))) %+ skim (~(tap by (~(del by q.yak) pax)))
|= [paf=path lob=lobe] |= [paf=path lob=lobe]
=(pax (scag len paf)) =(pax (scag len paf))
|= [paf=path lob=lobe] |= [paf=path lob=lobe]
[(snag len paf) ~] [(slag len paf) lob]
=+ us=(~(get by q.yak) pax)
:+ ?: &(?=(~ descendants) ?=(~ us))
*@uvI
%+ roll
^- (list (pair path lobe))
[[~ ?~(us *lobe u.us)] descendants]
|=([[path lobe] @uvI] (shax (jam +<)))
us
^- (map span ,~)
%- mo ^- (list (pair span ,~))
%+ turn descendants
|= [paf=path lob=lobe]
[?>(?=(^ paf) i.paf) ~]
:: ::
++ read-at-aeon :: read-at-aeon:ze ++ read-at-aeon :: read-at-aeon:ze
|= [yon=aeon mun=mood] :: seek and read |= [yon=aeon mun=mood] :: seek and read
@ -2132,6 +2152,8 @@
=. ank.dom ank.dat =. ank.dom ank.dat
?~ hez ?~ hez
(done:he ~) (done:he ~)
?. syn
(done:he ~)
ergo ergo
:: ::
++ ergo ++ ergo
@ -2185,6 +2207,8 @@
== ==
?~ hez ?~ hez
(error:he %ergo-no-hez ~) (error:he %ergo-no-hez ~)
?. syn
(error:he %ergo-sync-off ~)
?: ?=(%| -.gon.dat) ?: ?=(%| -.gon.dat)
+>.$ +>.$
%= +>.$ %= +>.$
@ -2270,7 +2294,7 @@
?^(rug u.rug *rung) ?^(rug u.rug *rung)
=+ ^= red ^- rede =+ ^= red ^- rede
=+ yit=(~(get by rus.rug) syd) =+ yit=(~(get by rus.rug) syd)
?^(yit u.yit `rede`[~2000.1.1 ~ [~ *rind] *dome ~ ~]) ?^(yit u.yit `rede`[~2000.1.1 ~ [~ *rind] *dome ~ ~ %|])
((de now hen ~ ~) [who him] syd red ran.ruf) ((de now hen ~ ~) [who him] syd red ran.ruf)
:: ::
++ posh ++ posh
@ -2293,7 +2317,7 @@
%_ +> %_ +>
ran.ruf run ran.ruf run
dos.yar dos.yar
(~(put by dos.yar) syd [qyx.red dom.red dok.red mer.red]) (~(put by dos.yar) syd [qyx.red dom.red dok.red mer.red syn.red])
== ==
:: ::
++ wake ++ wake
@ -2313,7 +2337,7 @@
%^ (de now hen hun.yar hez.yar) %^ (de now hen hun.yar hez.yar)
[who who] [who who]
syd syd
[[now qyx.saq ~ dom.saq dok.saq mer.saq] ran.ruf] [[now qyx.saq ~ dom.saq dok.saq mer.saq syn.saq] ran.ruf]
-- --
-- --
:::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -2406,6 +2430,19 @@
:~ [hen %slip %c %info p.q.hic q.q.hic %& p.cos one] :~ [hen %slip %c %info p.q.hic q.q.hic %& p.cos one]
[hen %slip %c %info p.q.hic q.q.hic %& p.cos two] [hen %slip %c %info p.q.hic q.q.hic %& p.cos two]
== ==
::
%lynx
?: =(%$ q.q.hic)
[~ ..^$]
=^ mos ruf
=+ une=(un p.q.hic now hen ruf)
=+ ^= zat
(lynx:(di:wake:une q.q.hic) r.q.hic)
=+ zot=abet.zat
:- -.zot
=. une (pish:une q.q.hic +.zot ran.zat)
abet:une
[mos ..^$]
:: ::
%merg :: direct state up %merg :: direct state up
?: =(%$ q.q.hic) ?: =(%$ q.q.hic)
@ -2474,6 +2511,7 @@
++ scry :: inspect ++ scry :: inspect
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit cage)) ^- (unit (unit cage))
~& > [%scrying ren=ren his=his syd=syd lot=lot tyl=tyl]
=+ got=(~(has by fat.ruf) his) =+ got=(~(has by fat.ruf) his)
=+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot)) =+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot))
?~ luk [~ ~] ?~ luk [~ ~]

1
main/arvo/ford.hoon
View File

@ -333,7 +333,6 @@
:^ %pass :^ %pass
[(scot %p our) (scot %ud num) (scot %ud p.kig) (tope bek ~)] [(scot %p our) (scot %ud num) (scot %ud p.kig) (tope bek ~)]
%c %c
~& >> [%camping bem]
[%warp [our p.bem] q.bem [~ %sing ren r.bem (flop s.bem)]] [%warp [our p.bem] q.bem [~ %sing ren r.bem (flop s.bem)]]
== ==
:: ::