ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-22 07:59:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

autosync seems to be working

Browse Source
This commit is contained in:
Ubuntu 2014-10-28 01:50:07 +00:00
parent 35e5688b70
commit 8f1bf03d50
2 changed files with 99 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
arvo/clay.hoon
View File

@ -1,5 +1,5 @@
:: clay (4c), revision control :: clay (4c), revision control
:: !:
|= pit=vase |= pit=vase
=> |% => |%
++ cult (map duct rove) :: subscriptions ++ cult (map duct rove) :: subscriptions
@ -31,7 +31,8 @@
$% [%want p=sock q=path r=*] :: $% [%want p=sock q=path r=*] ::
== == :: == == ::
$: %c :: to %clay $: %c :: to %clay
$% [%warp p=sock q=riff] :: $% [%merg p=@p q=@tas r=mizu] ::
[%warp p=sock q=riff] ::
== == :: == == ::
$: %d :: $: %d ::
$% [%flog p=[%crud p=@tas q=(list tank)]] :: to %dill $% [%flog p=[%crud p=@tas q=(list tank)]] :: to %dill
@ -379,6 +380,49 @@
^- rove ^- rove
[%| p.p.rav q.p.rav r.p.rav ~] [%| p.p.rav q.p.rav r.p.rav ~]
:: ::
++ sync
|= [hen=duct her=@p rot=riot]
^+ +>.$
?~ rot
~& "autosync to {<syd>} on {<her>} stopped"
+>.$
?: ?=(%y p.p.u.rot)
%= +>.$
tag
:_ tag
:* hen /auto/(scot %p who)/(scot %p her)/[syd]/v
%c %warp [who her] syd
`[%& %v q.p.u.rot /]
==
==
?> ?=(%v p.p.u.rot)
=+ der=((hard dome) r.u.rot)
=+ ^= lum
^- (unit (unit mizu))
%^ ~(construct-merge ze now dom ran)
?:(=(0 let.dom) %init %fine)
who
:+ syd
`saba`[her syd [0 let.der] der]
now
?~ lum
~& "autosync to {<syd>} on {<her>} failed, please merge manually"
+>.$
?~ u.lum
~& "{<syd>} on {<her>} up to date"
+>.$
%= +>.$
tag
:_ :_ tag
:* hen /auto/(scot %p who)/(scot %p her)/[syd]/y
%c %warp [who her] syd
`[%& %y [%ud +(let.der)] /]
==
:* hen /auto/(scot %p who)/(scot %p her)/[syd]/merg
%c %merg who syd u.u.lum
==
==
::
++ wake :: update subscribers ++ wake :: update subscribers
^+ . ^+ .
=+ xiq=(~(tap by qyx) ~) =+ xiq=(~(tap by qyx) ~)
@ -500,7 +544,19 @@
^- [p=(list move) q=_..^$] ^- [p=(list move) q=_..^$]
?- -.q.hic ?- -.q.hic
%init %init
[~ ..^$(fat.ruf (~(put by fat.ruf) p.q.hic [hen ~ ~]))] :_ ..^$(fat.ruf (~(put by fat.ruf) p.q.hic [hen ~ ~]))
=+ bos=(sein p.q.hic)
~& [%bos bos p.q.hic]
?: =(bos p.q.hic) ~
^- (list move)
%- zing
%+ turn (limo ~[%main %arvo %try])
|= syd=@tas
:~ :* hen %pass /auto/(scot %p p.q.hic)/(scot %p bos)/[syd]/y
%c %warp [p.q.hic bos] syd
`[%& %y [%da now] /]
==
==
:: ::
%merg :: direct state up %merg :: direct state up
=^ mos ruf =^ mos ruf
@ -604,6 +660,18 @@
++ take :: accept response ++ take :: accept response
|= [tea=wire hen=duct hin=(hypo sign)] |= [tea=wire hen=duct hin=(hypo sign)]
^- [p=(list move) q=_..^$] ^- [p=(list move) q=_..^$]
?: ?=([%auto @ @ @ ?(%y %v) ~] tea)
~& %taking-auto
?> ?=(%writ -.+.q.hin)
~& %taking-auto-writ
=+ our=(slav %p i.t.tea)
=+ her=(slav %p i.t.t.tea)
=* syd i.t.t.t.tea
=+ une=(un our now ruf)
=+ wex=(di:une syd)
=+ wao=(sync:wex hen her p.q.hin)
=+ woo=abet:wao
[-.woo ..^$(ruf abet:(pish:une syd +.woo ran.wao))]
?- -.+.q.hin ?- -.+.q.hin
%crud %crud
[[[hen %slip %d %flog +.q.hin] ~] ..^$] [[[hen %slip %d %flog +.q.hin] ~] ..^$]

50
arvo/dill.hoon
View File

@ -39,6 +39,9 @@
$% $: %a :: $% $: %a ::
$% [%make p=(unit ,@t) q=@ud r=@ s=?] :: $% [%make p=(unit ,@t) q=@ud r=@ s=?] ::
[%sith p=@p q=@uw r=?] :: [%sith p=@p q=@uw r=?] ::
== == ::
$: %c ::
$% [%warp p=sock q=riff] ::
== == :: == == ::
::S $% $: %b :: to %batz ::S $% $: %b :: to %batz
::S $% [%hail ~] :: ::S $% [%hail ~] ::
@ -50,7 +53,7 @@
::S [%make p=(unit ,@t) q=@ud r=@ s=?] :: ::S [%make p=(unit ,@t) q=@ud r=@ s=?] ::
::S [%sith p=@p q=@uw r=?] :: ::S [%sith p=@p q=@uw r=?] ::
::S == == :: ::S == == ::
$: %d :: to %dill $: %d ::
$% [%crud p=@tas q=(list tank)] :: $% [%crud p=@tas q=(list tank)] ::
[%text p=tape] :: [%text p=tape] ::
== == :: == == ::
@ -61,6 +64,7 @@
$: %t :: $: %t ::
$% [%wait p=@da] :: $% [%wait p=@da] ::
== == == :: == == == ::
++ riff ,[p=desk q=(unit rave)] :: see %clay
++ sign :: in result $<- ++ sign :: in result $<-
$? $?
::S $: %b :: by %batz ::S $: %b :: by %batz
@ -77,6 +81,9 @@
::S [%vega p=path] :: ::S [%vega p=path] ::
::S [%warn p=tape] :: ::S [%warn p=tape] ::
::S == == :: ::S == == ::
$: %c ::
$% [%writ p=riot] ::
== == ::
$: %g :: $: %g ::
$% [%mean p=ares] :: $% [%mean p=ares] ::
[%nice ~] :: [%nice ~] ::
@ -94,9 +101,6 @@
[%sage p=path q=*] :: [%sage p=path q=*] ::
[%veer p=@ta q=path r=@t] :: [%veer p=@ta q=path r=@t] ::
[%vega p=path] :: [%vega p=path] ::
== == ::
$: %t ::
$% [%wake ~] ::
== == :: == == ::
$: @tas :: by any $: @tas :: by any
$% [%crud p=@tas q=(list tank)] :: $% [%crud p=@tas q=(list tank)] ::
@ -171,7 +175,7 @@
-- => -- =>
|% |%
++ dy ++ dy
|= [hen=duct dug=(map duct yard)] |= [hen=duct our=ship dug=(map duct yard)]
=+ ^= yar ^- yard =+ ^= yar ^- yard
=+ yur=(~(get by dug) hen) =+ yur=(~(get by dug) hen)
?^ yur u.yur ?^ yur u.yur
@ -401,11 +405,13 @@
::S +>(mos :_(mos [hen %give +.sih])) ::S +>(mos :_(mos [hen %give +.sih]))
?(%init %veer %vega %verb) :: drop-throughs ?(%init %veer %vega %verb) :: drop-throughs
+>(mos :_(mos [hen %give +.sih])) +>(mos :_(mos [hen %give +.sih]))
%wake %writ :: file exists
~& > %dill-writ
:: +>.$
%= +>.$ %= +>.$
mos mos
:_ mos :_ mos
[hen %pass / %g %show [~zod /terminal] ~zod /lines] :: XX ~zod %init [hen %pass / %g %show [our /terminal] our /lines]
== ==
== ==
:: ::
@ -483,9 +489,7 @@
%d ?: ?& =(0 bul.u.q.q.yar) %d ?: ?& =(0 bul.u.q.q.yar)
=(0 bus.u.q.q.yar) =(0 bus.u.q.q.yar)
== ==
~& %dill-kill-not-implemented
+>.$(mos :_(mos [hen %give %logo ~])) +>.$(mos :_(mos [hen %give %logo ~]))
::S +>.$(mos :_(mos [hen %pass ~ %b [%kill ~]])) :: XX send \c
$(kyz [%belt %del ~]) $(kyz [%belt %del ~])
%e (edit u.q.q.yar(bus bul.u.q.q.yar)) %e (edit u.q.q.yar(bus bul.u.q.q.yar))
%f $(kyz [%belt %aro %r]) %f $(kyz [%belt %aro %r])
@ -662,9 +666,10 @@
:: ::
%init %init
%= +>.$ %= +>.$
our p.kyz
mos mos
:_ mos :_ mos
[hen %slip %t %wait `@da`0] :: XX ~zod %init [hen %slip %c %warp [p.kyz p.kyz] %main `[%& %y [%ud 1] /]]
== ==
:: ::
%talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output %talk (furl (~(win re p.kyz) 0 p.q.yar)) :: program output
@ -674,17 +679,18 @@
++ poke ++ poke
|= msg=mess |= msg=mess
^- move ^- move
:^ hen %pass / :: XX ~zod %init :^ hen %pass /
:^ %g %mess [~zod /terminal] :^ %g %mess [our /terminal]
:- ~zod msg :- our msg
:: ::
++ yerk :: complete core ++ yerk :: complete core
^- [p=(list move) q=(map duct yard)] ^- [p=(list move) q=ship r=(map duct yard)]
:- (flop mos) :+ (flop mos) our
(~(put by dug) hen yar) (~(put by dug) hen yar)
-- --
-- --
=| $: %0 :: =| $: %0 ::
our=ship ::
dug=(map duct yard) :: dug=(map duct yard) ::
== :: == ::
|= [now=@da eny=@ ski=sled] :: current invocation |= [now=@da eny=@ ski=sled] :: current invocation
@ -708,8 +714,8 @@
:_ ..^$ :_ ..^$
%+ turn (~(tap by dug) *(list ,[p=duct q=yard])) %+ turn (~(tap by dug) *(list ,[p=duct q=yard]))
|=([a=duct b=yard] [a %slip %d p.q.hic]) |=([a=duct b=yard] [a %slip %d p.q.hic])
=^ moz dug yerk:(lear:(dy hen dug) q.hic) =+ res=yerk:(lear:(dy hen our dug) q.hic)
[moz ..^$] [-.res ..^$(our +<.res, dug +>.res)]
:: ::
++ doze ++ doze
|= [now=@da hen=duct] |= [now=@da hen=duct]
@ -717,19 +723,19 @@
~ ~
:: ::
++ load ++ load
|= old=[%0 dug=(map duct yard)] |= old=[%0 our=ship dug=(map duct yard)]
^+ ..^$ ^+ ..^$
..^$(dug dug.old) ..^$(our our.old, dug dug.old)
:: ::
++ scry ++ scry
|= [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 (pair mark ,*))) ^- (unit (unit (pair mark ,*)))
[~ ~ [%tank >dug<]] [~ ~ [%tank >dug<]]
:: ::
++ stay [%0 dug] ++ stay [%0 our dug]
++ take :: process move ++ take :: process move
|= [tea=wire hen=duct hin=(hypo sign)] |= [tea=wire hen=duct hin=(hypo sign)]
^- [p=(list move) q=_..^$] ^- [p=(list move) q=_..^$]
=^ moz dug yerk:(leap:(dy hen dug) tea q.hin) =+ res=yerk:(leap:(dy hen our dug) tea q.hin)
[moz ..^$] [-.res ..^$(our +<.res, dug +>.res)]
-- --