mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-17 20:01:32 +03:00
38 lines
929 B
Plaintext
38 lines
929 B
Plaintext
!:
|
|
:: /=try=/bin/merge/hoon
|
|
:: Call with two desks and an optional germ as a merge option
|
|
::
|
|
=> .(-< `who=@p`-<)
|
|
=> .(+ =>(+ ^/=/main/=/lib/pony))
|
|
|= [est=time eny=@uw]
|
|
|= $: pes=[ses=span des=span cas=span ~]
|
|
pen=[sen=span den=span can=span ~]
|
|
gem=$|([germ ~] ~)
|
|
==
|
|
=+ vsr=((hard dome) .^(%cv pes))
|
|
=+ ves=((hard dome) .^(%cv pen))
|
|
%- (posh (add ~s1 est))
|
|
|= tim=@da
|
|
^- bowl
|
|
:_ ~
|
|
^- (list gift)
|
|
:_ ~
|
|
=+ ran=((hard rang) .^(%cu /(scot %p who)/main/(scot %da tim)))
|
|
=+ ^= sab ^- saba :*
|
|
(need (slaw 'p' ses.pes))
|
|
des.pes
|
|
[0 let.vsr]
|
|
vsr
|
|
==
|
|
=+ ^= lum
|
|
%- ~(construct-merge ze est ves ran)
|
|
[?~(gem %fine -.gem) (need (slaw 'p' sen.pen)) den.pen sab est]
|
|
?~ lum
|
|
^- gift
|
|
:* %la %leaf
|
|
"{(trip des.pes)} failed to apply, please rerun with a merge option"
|
|
==
|
|
?~ u.lum
|
|
`gift`[%la %leaf "{(trip den.pen)} is up to date"]
|
|
`gift`[%og den.pen u.u.lum]
|