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

fixed some bugs

Browse Source
This commit is contained in:
Philip C Monk 2015-09-04 20:15:05 -04:00
parent 490798b908
commit 584dc5e9a9
1 changed files with 62 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
arvo/clay.hoon
View File

@ -20,7 +20,9 @@
++ kiss kiss-clay :: in request ->$ ++ kiss kiss-clay :: in request ->$
++ mery :: merge state ++ mery :: merge state
$: sor=(pair ship desk) :: merge source $: sor=(pair ship desk) :: merge source
hen=duct :: formal source
gem=germ :: strategy gem=germ :: strategy
wat=wait :: waiting on
cas=case :: ali's case cas=case :: ali's case
ali=yaki :: ali's commit ali=yaki :: ali's commit
bob=yaki :: bob's commit bob=yaki :: bob's commit
@ -34,6 +36,9 @@
erg=(map path ,?) :: ergoable changes erg=(map path ,?) :: ergoable changes
gon=(each (set path) (pair term (list tank))) :: return value gon=(each (set path) (pair term (list tank))) :: return value
== :: == ::
++ wait $? %null %ali %diff-ali %diff-bob :: what are we
%merge %build %checkout %ergo :: waiting for?
== ::
++ moot ,[p=case q=case r=path s=(map path lobe)] :: stored change range ++ moot ,[p=case q=case r=path s=(map path lobe)] :: stored change range
++ move ,[p=duct q=(mold note gift)] :: local move ++ move ,[p=duct q=(mold note gift)] :: local move
++ nako $: gar=(map aeon tako) :: new ids ++ nako $: gar=(map aeon tako) :: new ids
@ -924,23 +929,8 @@
^+ +> ^+ +>
(edit wen lem) (edit wen lem)
:: ::
++ exem :: execute merge :: Be careful to call ++wake if/when necessary. Every case
|= [wen=@da him=@p sud=@tas gem=germ] :: aka direct change :: must call it individually.
!!
:: ?. (gte p.mer let.dom) !! :: no
:: =. +>.$ %= +>.$
:: hut.ran (~(uni by hut.r.mer) hut.ran)
:: lat.ran (~(uni by lat.r.mer) lat.ran)
:: let.dom p.mer
:: hit.dom (~(uni by q.mer) hit.dom)
:: ==
:: =+ ^= hed :: head commit
:: =< q
:: %- ~(got by hut.ran)
:: %- ~(got by hit.dom)
:: let.dom
:: (echa:wake:(checkout-ankh hed))
::
++ take-foreign-update :: external change ++ take-foreign-update :: external change
|= [inx=@ud rut=(unit rand)] |= [inx=@ud rut=(unit rand)]
^+ +> ^+ +>
@ -955,7 +945,8 @@
== ==
?~ rut ?~ rut
=+ rav=`rave`q.u.ruv =+ rav=`rave`q.u.ruv
%= +>+.$ =< ?>(?=(^ ref) .)
%_ wake
lim lim
?.(&(?=(%many -.rav) ?=(%da -.q.q.rav)) lim `@da`p.q.q.rav) ?.(&(?=(%many -.rav) ?=(%da -.q.q.rav)) lim `@da`p.q.q.rav)
:: ::
@ -987,7 +978,7 @@
%null [[%atom %n] ~] %null [[%atom %n] ~]
%nako !>(~|([%harding [&1 &2 &3]:q.r.u.rut] ((hard nako) q.r.u.rut))) %nako !>(~|([%harding [&1 &2 &3]:q.r.u.rut] ((hard nako) q.r.u.rut)))
== ==
?. ?=(%nako p.r.u.rut) +>+.$ ?. ?=(%nako p.r.u.rut) [?>(?=(^ ref) .)]:wake
=+ rav=`rave`q.u.ruv =+ rav=`rave`q.u.ruv
?> ?=(%many -.rav) ?> ?=(%many -.rav)
|- ^+ +>+.^$ |- ^+ +>+.^$
@ -1012,7 +1003,8 @@
== ==
:: ::
%y %y
%_ +>+.$ =< ?>(?=(^ ref) .)
%_ wake
haw.u.ref haw.u.ref
%+ ~(put by haw.u.ref) %+ ~(put by haw.u.ref)
[p.p.u.rut q.p.u.rut q.u.rut] [p.p.u.rut q.p.u.rut q.u.rut]
@ -1020,7 +1012,7 @@
== ==
:: ::
%z %z
~| %its-prolly-reasonable-to-request-ankh-over-the-network-sorry ~| %its-prolly-not-reasonable-to-request-ankh-over-the-network-sorry
!! !!
== ==
:: ::
@ -1651,6 +1643,13 @@
|= [yon=aeon mun=mood] :: seek and read |= [yon=aeon mun=mood] :: seek and read
^- (unit (unit (each cage lobe))) ^- (unit (unit (each cage lobe)))
?: &(?=(%w p.mun) !?=(%ud -.q.mun)) :: NB only her speed ?: &(?=(%w p.mun) !?=(%ud -.q.mun)) :: NB only her speed
:: ~& :* %dude-someones-getting-curious
:: mun=mun
:: yon=yon
:: our=our
:: her=her
:: syd=syd
:: ==
?^(r.mun [~ ~] [~ ~ %& %aeon !>(yon)]) ?^(r.mun [~ ~] [~ ~ %& %aeon !>(yon)])
?: ?=(%u p.mun) ?: ?=(%u p.mun)
(read-u yon r.mun) (read-u yon r.mun)
@ -1716,13 +1715,31 @@
?~ mer ?~ mer
?: new ?: new
=+ *mery =+ *mery
`-(sor ali:+) `-(sor ali:+, hen hen:+, wat %null)
[%| %not-actually-merging] [%| %not-actually-merging]
?. new ?. new
?: =(ali sor.u.mer) ?: =(ali sor.u.mer)
`u.mer `u.mer
~& :* %already-merging-from-somewhere-else
ali=ali
sor=sor.u.mer
gem=gem.u.mer
wat=wat.u.mer
cas=cas.u.mer
hen=hen
henmer=hen.u.mer
==
[%| %already-merging-from-somewhere-else] [%| %already-merging-from-somewhere-else]
[%| %already-merging-weird] ~& :* %already-merging-from-somewhere
ali=ali
sor=sor.u.mer
gem=gem.u.mer
wat=wat.u.mer
cas=cas.u.mer
hen=hen
henmer=hen.u.mer
==
[%| %already-merging-from-somewhere]
?: ?=(%| -.dat) ?: ?=(%| -.dat)
~|(p.dat !!) ~|(p.dat !!)
=+ dat=p.dat =+ dat=p.dat
@ -1737,6 +1754,15 @@
++ route ++ route
|= [sat=term res=(each riot gage)] |= [sat=term res=(each riot gage)]
^+ +>.$ ^+ +>.$
?. =(sat wat.dat)
~| :* %hold-your-horses-merge-out-of-order
sat=sat
wat=wat.dat
ali=ali
bob=bob
hepres=-.res
==
!!
?+ +< ~|((crip <[%bad-stage sat ?~(-.res %riot %gage)]>) !!) ?+ +< ~|((crip <[%bad-stage sat ?~(-.res %riot %gage)]>) !!)
[%ali %& *] %.(p.res fetched-ali) [%ali %& *] %.(p.res fetched-ali)
[%diff-ali %| *] %.(p.res diffed-ali) [%diff-ali %| *] %.(p.res diffed-ali)
@ -1766,7 +1792,7 @@
:: ::
++ fetch-ali ++ fetch-ali
^+ . ^+ .
=- %_(+ tag [- tag]) =- %_(+ tag [- tag], wat.dat %ali)
:* hen %pass :* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ali ~] [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %ali ~]
%c %warp [p.bob p.ali] q.ali %c %warp [p.bob p.ali] q.ali
@ -1971,7 +1997,7 @@
:: ::
++ diff-ali ++ diff-ali
^+ . ^+ .
(diff-bas %ali ali.dat ali bob.dat) (diff-bas(wat.dat %diff-ali) %ali ali.dat ali bob.dat)
:: ::
++ diffed-ali ++ diffed-ali
|= res=gage |= res=gage
@ -2011,7 +2037,7 @@
:: ::
++ diff-bob ++ diff-bob
^+ . ^+ .
(diff-bas %bob bob.dat bob ali.dat) (diff-bas(wat.dat %diff-bob) %bob bob.dat bob ali.dat)
:: ::
++ diffed-bob ++ diffed-bob
|= res=gage |= res=gage
@ -2054,7 +2080,7 @@
|- ^+ +.$ |- ^+ +.$
?+ gem.dat ~| [%merge-weird-gem gem.dat] !! ?+ gem.dat ~| [%merge-weird-gem gem.dat] !!
?(%mate %meld) ?(%mate %meld)
=- %_(+.$ tag [- tag]) =- %_(+.$ tag [- tag], wat.dat %merge)
:* hen %pass :* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %merge ~] [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %merge ~]
%f %exec p.bob ~ [p.bob q.bob cas.dat] %tabl %f %exec p.bob ~ [p.bob q.bob cas.dat] %tabl
@ -2088,7 +2114,7 @@
:: ::
++ build ++ build
^+ . ^+ .
=- %_(+ tag [- tag]) =- %_(+ tag [- tag], wat.dat %build)
:* hen %pass :* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %build ~] [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %build ~]
%f %exec p.bob ~ [p.bob q.bob cas.dat] %tabl %f %exec p.bob ~ [p.bob q.bob cas.dat] %tabl
@ -2209,7 +2235,7 @@
:: ::
++ checkout ++ checkout
^+ . ^+ .
=- %_(+ tag [- tag]) =- %_(+ tag [- tag], wat.dat %checkout)
=+ val=?:(?=(%init gem.dat) ali bob) =+ val=?:(?=(%init gem.dat) ali bob)
:* hen %pass :* hen %pass
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %checkout ~] [%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %checkout ~]
@ -2249,7 +2275,7 @@
:: ::
++ ergo ++ ergo
^+ . ^+ .
=- %_(+ tag [- tag]) =- %_(+ tag [- tag], wat.dat %ergo)
=+ ^- sum=(set path) =+ ^- sum=(set path)
=+ (must-ergo (turn (~(tap by erg.dat)) head)) =+ (must-ergo (turn (~(tap by erg.dat)) head))
=+ (turn (~(tap by -)) (corl tail tail)) =+ (turn (~(tap by -)) (corl tail tail))
@ -2518,6 +2544,12 @@
%warp %warp
=^ mos ruf =^ mos ruf
=+ den=((de now hen ruf) p.q.hic p.q.q.hic) =+ den=((de now hen ruf) p.q.hic p.q.q.hic)
:: =- ~? ?=([~ %sing %w *] q.q.q.hic)
:: :* %someones-warping
:: rav=u.q.q.q.hic
:: mos=-<
:: ==
:: -
=< abet =< abet
?~ q.q.q.hic ?~ q.q.q.hic
ease:den ease:den