mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-12-15 18:12:47 +03:00
Merge pull request #800 from belisarius222/fix-reef
fix ford %reef dependency tracking
This commit is contained in:
Ted Blackman
GitHub
commit
7b4fd94318
@ -4608,24 +4608,6 @@
|
||||
~% %make-reef ..^^$ ~
|
||||
|= =disc
|
||||
^- build-receipt
|
||||
:: short-circuit to :pit if asked for current %home desk
|
||||
::
|
||||
:: This avoids needing to recompile the kernel if we're asked
|
||||
:: for the kernel we're already running. Note that this fails
|
||||
:: referential transparency if |autoload is turned off.
|
||||
::
|
||||
?: ?& |(=(disc [our %home]) =(disc [our %base]))
|
||||
:: is :date.build the latest commit on the %home desk?
|
||||
::
|
||||
?| =(now date.build)
|
||||
::
|
||||
=/ =beam [[our %home [%da date.build]] /hoon/hoon/sys]
|
||||
::
|
||||
.= (scry [%141 %noun] ~ %cw beam)
|
||||
(scry [%141 %noun] ~ %cw beam(r [%da now]))
|
||||
== ==
|
||||
::
|
||||
(return-result %success %reef pit)
|
||||
::
|
||||
=/ hoon-scry
|
||||
[date.build [%scry %c %x [disc /hoon/hoon/sys]]]
|
||||
@ -4658,6 +4640,24 @@
|
||||
::
|
||||
?. ?=([~ %success %scry *] zuse-scry-result)
|
||||
(wrap-error zuse-scry-result)
|
||||
:: short-circuit to :pit if asked for current %home desk
|
||||
::
|
||||
:: This avoids needing to recompile the kernel if we're asked
|
||||
:: for the kernel we're already running. Note that this fails
|
||||
:: referential transparency if |autoload is turned off.
|
||||
::
|
||||
?: ?& |(=(disc [our %home]) =(disc [our %base]))
|
||||
:: is :date.build the latest commit on the %home desk?
|
||||
::
|
||||
?| =(now date.build)
|
||||
::
|
||||
=/ =beam [[our %home [%da date.build]] /hoon/hoon/sys]
|
||||
::
|
||||
.= (scry [%141 %noun] ~ %cw beam)
|
||||
(scry [%141 %noun] ~ %cw beam(r [%da now]))
|
||||
== ==
|
||||
::
|
||||
(return-result %success %reef pit)
|
||||
:: omit case from path to prevent cache misses
|
||||
::
|
||||
=/ hoon-path=path
|
||||
|
||||
@ -3616,15 +3616,7 @@
|
||||
%- ford-call-with-comparator :*
|
||||
ford-gate
|
||||
now=~1234.5.6
|
||||
^= scry
|
||||
|= [* * =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
~| [term=term beam=beam]
|
||||
?> =(%cw term)
|
||||
?> =([[~nul %home [%da ~1234.5.6]] /hoon/hoon/sys] beam)
|
||||
::
|
||||
``[%cass !>(`cass:clay`[ud=1 da=~1234.5.6])]
|
||||
scry=(scry-reef ~1234.5.6)
|
||||
::
|
||||
^= call-args
|
||||
:* duct=~[/reef] type=~ %build ~nul live=%.n
|
||||
@ -5815,6 +5807,9 @@
|
||||
[%x /lib/gh/parse/hoon]
|
||||
[%x /lib/gh-parse/hoon]
|
||||
[%x /lib/connector/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
==
|
||||
::
|
||||
%+ expect-eq
|
||||
@ -5944,6 +5939,9 @@
|
||||
[%x /lib/gh/parse/hoon]
|
||||
[%x /lib/gh-parse/hoon]
|
||||
[%x /lib/connector/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
==
|
||||
::
|
||||
%+ expect-eq
|
||||
@ -6086,6 +6084,9 @@
|
||||
[%x /lib/gh/parse/hoon]
|
||||
[%x /lib/gh-parse/hoon]
|
||||
[%x /lib/connector/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
==
|
||||
::
|
||||
%+ expect-eq
|
||||
@ -6225,6 +6226,9 @@
|
||||
[%x /lib/gh/parse/hoon]
|
||||
[%x /lib/gh-parse/hoon]
|
||||
[%x /lib/connector/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
==
|
||||
::
|
||||
;: weld
|
||||
@ -6272,6 +6276,9 @@
|
||||
[%x /lib/gh/parse/hoon]
|
||||
[%x /lib/gh-parse/hoon]
|
||||
[%x /lib/connector/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
==
|
||||
::
|
||||
;: weld
|
||||
@ -6319,6 +6326,9 @@
|
||||
[%x /lib/gh/parse/hoon]
|
||||
[%x /lib/gh-parse/hoon]
|
||||
[%x /lib/connector/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
==
|
||||
::
|
||||
;: weld
|
||||
@ -6452,7 +6462,11 @@
|
||||
:* duct=~[/walk] %pass /~nul/clay-sub/~nul/home/~1234.5.6
|
||||
%c %warp [~nul ~nul] %home ~ %mult [%da ~1234.5.6]
|
||||
%- sy :~
|
||||
[%x /mar/two/hoon] [%x /mar/one/hoon]
|
||||
[%x /mar/two/hoon]
|
||||
[%x /mar/one/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
== == == ==
|
||||
::
|
||||
=^ results2 ford-gate
|
||||
@ -6497,8 +6511,13 @@
|
||||
:* duct=~[/walk] %pass /~nul/clay-sub/~nul/home/~1234.5.6
|
||||
%c %warp [~nul ~nul] %home ~ %mult [%da ~1234.5.6]
|
||||
%- sy :~
|
||||
[%x /mar/one/hoon] [%x /mar/two/hoon]
|
||||
[%x /mar/four/hoon] [%x /mar/five/hoon]
|
||||
[%x /mar/one/hoon]
|
||||
[%x /mar/two/hoon]
|
||||
[%x /mar/four/hoon]
|
||||
[%x /mar/five/hoon]
|
||||
[%x /sys/hoon/hoon]
|
||||
[%x /sys/arvo/hoon]
|
||||
[%x /sys/zuse/hoon]
|
||||
== == == ==
|
||||
::
|
||||
=^ results2 ford-gate
|
||||
@ -7037,13 +7056,16 @@
|
||||
!> 'post-b'
|
||||
vase.tail.tail.result
|
||||
==
|
||||
::
|
||||
:: +scry-with-results
|
||||
++ scry-with-results
|
||||
|= results=(map [=term =beam] cage)
|
||||
|= [* (unit (set monk)) =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
||||
::
|
||||
?^ reef=((scry-reef date) +<.$)
|
||||
reef
|
||||
::
|
||||
~| scry-with-results+[term=term beam=beam]
|
||||
::
|
||||
[~ ~ (~(got by results) [term beam])]
|
||||
@ -7054,6 +7076,11 @@
|
||||
|= [* (unit (set monk)) =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
||||
::
|
||||
?^ reef=((scry-reef date) +<.$)
|
||||
reef
|
||||
::
|
||||
~| scry-with-results+[term=term beam=beam]
|
||||
::
|
||||
[~ (~(got by results) [term beam])]
|
||||
@ -7064,6 +7091,9 @@
|
||||
|= [* (unit (set monk)) =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
?^ reef=((scry-reef date) +<.$)
|
||||
reef
|
||||
::
|
||||
~| scry-succeed+[beam+beam term+term]
|
||||
?> =(term %cx)
|
||||
?> =(beam [[~nul %desk %da date] /bar/foo])
|
||||
@ -7076,6 +7106,9 @@
|
||||
|= [* (unit (set monk)) =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
?^ reef=((scry-reef date) +<.$)
|
||||
reef
|
||||
::
|
||||
~| scry-fail+[beam+beam term+term]
|
||||
?> =(term %cx)
|
||||
?> =(beam [[~nul %desk %da date] /bar/foo])
|
||||
@ -7088,11 +7121,15 @@
|
||||
|= [* (unit (set monk)) =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
?^ reef=((scry-reef date) +<.$)
|
||||
reef
|
||||
::
|
||||
~| scry-block+[beam+beam term+term]
|
||||
?> =(term %cx)
|
||||
?> =(beam [[~nul %desk %da date] /bar/foo])
|
||||
::
|
||||
~
|
||||
:: +scry-blocks: block on a file at multiple dates; does not include %reef
|
||||
::
|
||||
++ scry-blocks
|
||||
|= dates=(set @da) ^- sley
|
||||
@ -7111,9 +7148,35 @@
|
||||
|= [* (unit (set monk)) =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
=/ date=@da ?>(?=(%da -.r.beam) p.r.beam)
|
||||
::
|
||||
?^ reef=((scry-reef date) +<.$)
|
||||
reef
|
||||
::
|
||||
~| scry-is-forbidden+[beam+beam term+term]
|
||||
!!
|
||||
::
|
||||
++ scry-reef
|
||||
|= date=@da ^- sley
|
||||
|= [* (unit (set monk)) =term =beam]
|
||||
^- (unit (unit cage))
|
||||
::
|
||||
=- ?~ res=(~(get by -) [term beam])
|
||||
~
|
||||
`res
|
||||
::
|
||||
%- ~(gas by *(map [^term ^beam] cage))
|
||||
:~ :- [%cx [[~nul %home %da date] /hoon/hoon/sys]]
|
||||
[%noun !>(~)]
|
||||
:- [%cx [[~nul %home %da date] /hoon/arvo/sys]]
|
||||
[%noun !>(~)]
|
||||
:- [%cx [[~nul %home %da date] /hoon/zuse/sys]]
|
||||
[%noun !>(~)]
|
||||
::
|
||||
:- [%cw [[~nul %home %da date] /hoon/hoon/sys]]
|
||||
[%cass !>([ud=0 da=date])]
|
||||
==
|
||||
::
|
||||
++ ford-call
|
||||
|= $: ford-gate=_ford-gate
|
||||
now=@da
|
||||
|
||||
Loading…
Reference in New Issue
Block a user