diff --git a/lib/hood/kiln.hoon b/lib/hood/kiln.hoon index e9c12522f1..f793f060a7 100644 --- a/lib/hood/kiln.hoon +++ b/lib/hood/kiln.hoon @@ -70,7 +70,7 @@ {$poke wire dock pear} :: {$wipe wire @p $~} :: {$wait wire @da} :: - {$warp wire ship sock riff} :: + {$warp wire sock riff} :: == :: ++ pear :: poke fruit $% {$hall-command command:hall} :: @@ -222,7 +222,7 @@ ++ subscribe-next %- emit ^- card - :* %warp /kiln/autoload our [our our] %home ~ + :* %warp /kiln/autoload [our our] %home ~ %next %z da+now /sys == :: @@ -349,7 +349,7 @@ %- blab :_ ~ :* ust %warp /kiln/sync/[syd]/(scot %p her)/[sud] - our [our her] sud ~ + [our her] sud ~ == :: ++ start-track @@ -358,7 +358,7 @@ %- blab :~ :* ost %warp /kiln/sync/[syd]/(scot %p her)/[sud] - our [our her] sud ~ %sing %y ud+let / + [our her] sud ~ %sing %y ud+let / == == :: ++ start-sync @@ -367,11 +367,18 @@ %- blab :~ :* ost %warp [%kiln %sync syd (scot %p her) sud ?:(reset /reset /)] - our [our her] sud ~ %sing %w [%da now] / + [our her] sud ~ %sing %w [%da now] / == == :: ++ writ - |= {reset/? rot/riot} + |= $: reset/? + $= rot + %- unit + $: p/{p/?($d $p $u $v $w $x $y $z) q/case r/desk} + q/path + r/cage + == + == ?~ rot %^ spam leaf+"bad %writ response" @@ -414,7 +421,7 @@ %- blab :_ ~ :* ost %warp /kiln/sync/[syd]/(scot %p her)/[sud] - our [our her] sud ~ %sing %y ud+let / + [our her] sud ~ %sing %y ud+let / == -- :: diff --git a/sys/vane/clay.hoon b/sys/vane/clay.hoon index 8eb6451d2c..1d206bdc34 100644 --- a/sys/vane/clay.hoon +++ b/sys/vane/clay.hoon @@ -329,7 +329,8 @@ $: $c :: to %clay $% {$info p/@p q/@tas r/nori} :: internal edit {$merg p/@p q/@tas r/@p s/@tas t/case u/germ} :: merge desks - {$warp p/ship q/sock r/riff} :: + {$warp p/sock q/riff} :: + {$werp p/ship q/sock r/riff} :: == == :: $: $d :: $% {$flog p/{$crud p/@tas q/(list tank)}} :: to %dill @@ -2777,7 +2778,7 @@ %- emit(wat.dat %ali) :* hen %pass [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ali ~] - %c %warp p.bob [p.bob p.ali] q.ali + %c %warp [p.bob p.ali] q.ali `[%sing %v cas.dat /] == :: @@ -3707,9 +3708,16 @@ abet:(perm:den pax.q.hic rit.q.hic) [mos ..^$] :: - $warp + ?($warp $werp) + =^ for q.hic + ?: ?=($warp -.q.hic) + [~ q.hic] + :_ [%warp q.q.hic r.q.hic] + ?: =(p.q.hic p.q.q.hic) ~&([%huh-this-west-may-be-weird p.q.hic] ~) + `p.q.hic + ?> ?=($warp -.q.hic) =^ mos ruf - =+ den=((de now hen ruf) q.q.hic p.r.q.hic) + =+ den=((de now hen ruf) p.q.hic p.q.q.hic) :: =- ~? ?=([~ %sing %w *] q.r.q.hic) :: :* %someones-warping :: rav=u.q.r.q.hic @@ -3717,10 +3725,9 @@ :: == :: - =< abet - ?~ q.r.q.hic + ?~ q.q.q.hic cancel-request:den - =+ for=?:(=(p.q.hic p.q.q.hic) ~ `p.q.hic) - (start-request:den for u.q.r.q.hic) + (start-request:den for u.q.q.q.hic) [mos ..^$] :: $went @@ -3735,7 +3742,7 @@ :- hen :^ %pass [(scot %p p.p.q.hic) (scot %p q.p.q.hic) t.q.q.hic] %c - [%warp q.p.q.hic [p.p.q.hic p.p.q.hic] ryf] + [%werp q.p.q.hic [p.p.q.hic p.p.q.hic] ryf] == ?> ?=({$answer @ @ $~} q.q.hic) =+ syd=(slav %tas i.t.q.q.hic) diff --git a/sys/vane/dill.hoon b/sys/vane/dill.hoon index 43b423a455..3da18f3726 100644 --- a/sys/vane/dill.hoon +++ b/sys/vane/dill.hoon @@ -47,7 +47,7 @@ == :: ++ note-clay :: $% {$merg p/@p q/@tas r/@p s/@tas t/case u/germ:clay}:: merge desks - {$warp p/ship q/sock r/riff:clay} :: wait for clay hack + {$warp p/sock q/riff:clay} :: wait for clay hack == :: ++ note-dill :: note to self, odd $% {$crud p/@tas q/(list tank)} :: @@ -297,7 +297,7 @@ %pass / %c - [%warp our [our our] %base `[%sing %y [%ud 1] /]] + [%warp [our our] %base `[%sing %y [%ud 1] /]] == == :: diff --git a/sys/vane/ford.hoon b/sys/vane/ford.hoon index 0d31637fba..a30900366d 100644 --- a/sys/vane/ford.hoon +++ b/sys/vane/ford.hoon @@ -12,7 +12,7 @@ ++ move {p/duct q/(wind note gift:able)} :: local move ++ note :: out request $-> $% $: $c :: to %clay - $% {$warp p/ship q/sock r/riff:clay} :: + $% {$warp p/sock q/riff:clay} :: == == :: $: $f :: to %ford $% {$exec p/@p q/(unit bilk:ford)} :: @@ -294,7 +294,7 @@ |= {ren/care:clay bem/beam ask/?} :: ~& warp+[(en-beam bem) ask] :+ %pass [(scot %p our) ren (en-beam bem)] - [%c [%warp our [our p.bem] q.bem ?.(ask ~ `[%next ren r.bem (flop s.bem)])]] + [%c [%warp [our p.bem] q.bem ?.(ask ~ `[%next ren r.bem (flop s.bem)])]] :: :: ++ zo @@ -321,7 +321,7 @@ |= {van/vane ren/care:clay bem/beam} ^- (wind note gift:able) ?+ van ~|(stub-cancel+van !!) - $c [%pass (camp-wire +<) van [%warp our [our p.bem] q.bem ~]] + $c [%pass (camp-wire +<) van [%warp [our p.bem] q.bem ~]] $g [%pass (camp-wire +<) van [%deal [our p.bem] q.bem [%pull ~]]] == :: @@ -351,7 +351,7 @@ :: $c :+ %pass (camp-wire +<.$) - [%c [%warp our [our p.bem] q.bem [~ %sing ren r.bem (flop s.bem)]]] + [%c [%warp [our p.bem] q.bem [~ %sing ren r.bem (flop s.bem)]]] == == :: diff --git a/sys/zuse.hoon b/sys/zuse.hoon index 8dbcfafcfa..4ce04b6c97 100644 --- a/sys/zuse.hoon +++ b/sys/zuse.hoon @@ -408,7 +408,8 @@ {$dirk p/desk} :: mark mount dirty {$ogre p/$@(desk beam)} :: delete mount point {$perm our/ship des/desk pax/path rit/rite} :: change permissions - {$warp p/ship q/sock r/riff} :: file request. + {$warp p/sock q/riff} :: internal file req + {$werp p/ship q/sock r/riff} :: external file req {$wegh $~} :: report memory {$went p/sack q/path r/@ud s/coop} :: response confirm {$west p/sack q/path r/*} :: network request