mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-19 21:02:01 +03:00
waypoint
This commit is contained in:
Philip C Monk
parent
bee28f639a
commit
9d4daa1e2c
@ -1332,11 +1332,11 @@
|
|||||||
=+ cay=q.p.res
|
=+ cay=q.p.res
|
||||||
?@ p.cay
|
?@ p.cay
|
||||||
+>.$(gon ``[%diff-bob-bad-marc >ali< >bob< >p.cay< ~])
|
+>.$(gon ``[%diff-bob-bad-marc >ali< >bob< >p.cay< ~])
|
||||||
=| dal=(map path (unit cage))
|
=| dob=(map path (unit cage))
|
||||||
=>
|
=>
|
||||||
|- ^+ +
|
|- ^+ +
|
||||||
?~ p.p.cay
|
?~ p.p.cay
|
||||||
+.$(dal ~)
|
+.$(dob ~)
|
||||||
=+ tal=%_($ cay [[%tabl t.p.p.cay] (slot 3 q.cay)])
|
=+ tal=%_($ cay [[%tabl t.p.p.cay] (slot 3 q.cay)])
|
||||||
?^ gon.tal
|
?^ gon.tal
|
||||||
tal
|
tal
|
||||||
@ -1348,8 +1348,8 @@
|
|||||||
?@ q.coy
|
?@ q.coy
|
||||||
+.$(gon ``[%diff-bob-strange-coy >ali< >bob< ~])
|
+.$(gon ``[%diff-bob-strange-coy >ali< >bob< ~])
|
||||||
%_ +.$
|
%_ +.$
|
||||||
dal
|
dob
|
||||||
%+ ~(put by dal:tal)
|
%+ ~(put by dob:tal)
|
||||||
((hard path) -.q.coy)
|
((hard path) -.q.coy)
|
||||||
?: ?=(%null q.i.p.p.cay)
|
?: ?=(%null q.i.p.p.cay)
|
||||||
~
|
~
|
||||||
@ -1357,16 +1357,17 @@
|
|||||||
==
|
==
|
||||||
?^ gon
|
?^ gon
|
||||||
+>.$
|
+>.$
|
||||||
=. dob.dat dal
|
=. dob.dat dob
|
||||||
merge
|
merge
|
||||||
::
|
::
|
||||||
++ merge
|
++ merge
|
||||||
^+ .
|
^+ .
|
||||||
|
|-
|
||||||
?+ gem.dat ~| %merge-weird-gem !!
|
?+ gem.dat ~| %merge-weird-gem !!
|
||||||
%meet
|
%meet
|
||||||
=+ (~(int by dal.dat) dob.dat)
|
=+ bof=(~(int by dal.dat) dob.dat)
|
||||||
?^ -
|
?^ bof
|
||||||
+(gon ``[%meet-conflict >ali< >bob< >[-]< ~])
|
+.$(gon ``[%meet-conflict >ali< >bob< >bof< ~])
|
||||||
=^ new lat.ran
|
=^ new lat.ran
|
||||||
^- [(map path lobe) (map lobe blob)]
|
^- [(map path lobe) (map lobe blob)]
|
||||||
%+ roll (~(tap by (~(uni by dal.dat) dob.dat)))
|
%+ roll (~(tap by (~(uni by dal.dat) dob.dat)))
|
||||||
@ -1400,13 +1401,90 @@
|
|||||||
`(map path ,?)`(~(run by new) |=(lobe %&))
|
`(map path ,?)`(~(run by new) |=(lobe %&))
|
||||||
checkout
|
checkout
|
||||||
::
|
::
|
||||||
?(%mate %meld) .(gon ``[%merge-not-implemented ~])
|
%mate
|
||||||
|
=+ bof=(~(int by dal.dat) dob.dat)
|
||||||
|
?~ bof
|
||||||
|
$(gem.dat %meet)
|
||||||
|
=- %_(+.$ tag [- tag])
|
||||||
|
:* hen
|
||||||
|
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali - ~]
|
||||||
|
%f %exec p.bob ~ %tabl
|
||||||
|
^- (list (pair silk silk))
|
||||||
|
%+ murn (~(tap by u.bof))
|
||||||
|
|= [pax=path cay=(unit cage)]
|
||||||
|
^- (unit (pair silk silk))
|
||||||
|
=+ cal=(~(got by dal.dat) pax)
|
||||||
|
=+ cob=(~(got by dob.dat) pax)
|
||||||
|
?~ cal
|
||||||
|
?~ cob
|
||||||
|
~ :: both delete
|
||||||
|
~ :: conflict
|
||||||
|
?~ cob
|
||||||
|
~ :: conflict
|
||||||
|
:- ~
|
||||||
|
:- [%done ~ %path !>(pax)]
|
||||||
|
[%join for [%done ~ u.cal] [%done ~ u.cob]]
|
||||||
|
==
|
||||||
|
::
|
||||||
|
%meld .(gon ``[%meld-not-implemented ~])
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
++ merged
|
++ merged
|
||||||
|= res=(each bead (list tank))
|
|= res=(each bead (list tank))
|
||||||
^+ +>
|
^+ +>
|
||||||
+>.$(gon ``[%merged-not-implemented ~])
|
?+ gem.dat ~| %merge-weird-gem !!
|
||||||
|
%mate
|
||||||
|
?: ?=(%| -.res)
|
||||||
|
+>.$(gon ``[%merge-bad-made leaf/"merging failed" p.res])
|
||||||
|
=+ cay=q.p.res
|
||||||
|
?@ p.cay
|
||||||
|
+>.$(gon ``[%merge-bad-marc >ali< >bob< >p.cay< ~])
|
||||||
|
=| bof=(map path cage)
|
||||||
|
=>
|
||||||
|
|- ^+ +
|
||||||
|
?~ p.p.cay
|
||||||
|
+.$(bof ~)
|
||||||
|
=+ tal=%_($ cay [[%tabl t.p.p.cay] (slot 3 q.cay)])
|
||||||
|
?^ gon.tal
|
||||||
|
tal
|
||||||
|
?. ?=(%path p.i.p.p.cay)
|
||||||
|
+.$(gon ``[%merge-strange-marc-a >ali< >bob< >p.i.p.p.cay< ~])
|
||||||
|
?. ?=(@ q.i.p.p.cay)
|
||||||
|
+.$(gon ``[%merge-strange-marc-b >ali< >bob< >q.i.p.p.cay< ~])
|
||||||
|
=+ coy=(slot 2 q.cay)
|
||||||
|
?@ q.coy
|
||||||
|
+.$(gon ``[%merge-strange-coy >ali< >bob< ~])
|
||||||
|
%_ +.$
|
||||||
|
bof
|
||||||
|
%+ ~(put by bof:tal)
|
||||||
|
((hard path) -.q.coy)
|
||||||
|
[q.i.p.p.cay (slot 3 coy)]
|
||||||
|
==
|
||||||
|
?^ gon
|
||||||
|
+>.$
|
||||||
|
=+ ^- con=(set path)
|
||||||
|
%- sa
|
||||||
|
=- %- (~(run by -) |=([pax *] +<-))
|
||||||
|
%+ skim (~(tap by u.bof))
|
||||||
|
|= [pax=path cay=(unit cage)]
|
||||||
|
=+ cal=(~(got by dal.dat) pax)
|
||||||
|
=+ cob=(~(got by dob.dat) pax)
|
||||||
|
?| &(?=(~ cal) ?=(^ cob))
|
||||||
|
&(?=(^ cal) ?=(~ cob))
|
||||||
|
==
|
||||||
|
!!
|
||||||
|
::
|
||||||
|
%meld
|
||||||
|
+>.$(gon ``[%meld-not-implemented ~])
|
||||||
|
==
|
||||||
|
|
||||||
|
:: %+ skim (~(tap by u.bof))
|
||||||
|
:: |= [pax=path cay=(unit cage)]
|
||||||
|
:: =+ cal=(~(got by dal.dat) pax)
|
||||||
|
:: =+ cob=(~(got by dob.dat) pax)
|
||||||
|
:: ?| &(?=(~ cal) ?=(^ cob))
|
||||||
|
:: &(?=(^ cal) ?=(~ cob))
|
||||||
|
:: ==
|
||||||
::
|
::
|
||||||
++ checkout
|
++ checkout
|
||||||
^+ .
|
^+ .
|
||||||
|
|||||||
@ -679,7 +679,9 @@
|
|||||||
(slap (slap pro [%cnzy %grad]) [%cnzy %join])
|
(slap (slap pro [%cnzy %grad]) [%cnzy %join])
|
||||||
(slop q.cay q.coy)
|
(slop q.cay q.coy)
|
||||||
|= [cof=cafe dif=vase]
|
|= [cof=cafe dif=vase]
|
||||||
(fine cof p.cay dif)
|
?@ q.dif
|
||||||
|
(fine cof %null dif)
|
||||||
|
(fine cof u.fom (slot 3 dif))
|
||||||
==
|
==
|
||||||
::
|
::
|
||||||
++ kale :: mutate
|
++ kale :: mutate
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
(lurk txt dif)
|
(lurk txt dif)
|
||||||
++ join
|
++ join
|
||||||
|= [ali=(urge cord) bob=(urge cord)]
|
|= [ali=(urge cord) bob=(urge cord)]
|
||||||
^- (urge cord)
|
^- (unit (urge cord))
|
||||||
ali
|
ali
|
||||||
--
|
--
|
||||||
--
|
--
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user