ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-24 15:34:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

clay: add option to skip queue

Browse Source 
Makes it so that |cancel %force skips the next thing in the queue if
you're not in the middle of something.  If you are in the middle of
something, it skips the thing you're in the middle of (just like naked
|cancel).

This should resolve issues where |cancel doesn't drain the queue.
This commit is contained in:
Philip Monk 2020-03-23 15:50:01 -07:00
parent 7415a2f66a
commit 1599937c81
No known key found for this signature in database
GPG Key ID: B66E1F02604E44EC
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/solid.pill
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4fb8003d603f01ed63813d04b0049fe145be0ee2509fbc8ac16bedf5fca8a335 oid sha256:ad8493489fa46102c2fe05a633b344c6d40cd98c5fc2c1f6af491902a75a2458
size 13073371 size 13082944

4
pkg/arvo/gen/hood/cancel.hoon
View File

@ -7,5 +7,5 @@
:::: ::::
:: ::
:- %say :- %say
|= * |= [* a=$@(~ [@tas ~]) *]
[%kiln-cancel ~] [%kiln-cancel ?@(a %foo -.a)]

4
pkg/arvo/lib/hood/kiln.hoon
View File

@ -154,8 +154,8 @@
abet:abet:(merge:(work syd) ali sud cas gim) abet:abet:(merge:(work syd) ali sud cas gim)
:: ::
++ poke-cancel ++ poke-cancel
|= ~ |= a=@tas
abet:(emit %pass /cancel %arvo %c [%drop %foo]) abet:(emit %pass /cancel %arvo %c [%drop a])
:: ::
++ poke-info ++ poke-info
|= {mez/tape tor/(unit toro)} |= {mez/tape tor/(unit toro)}

6
pkg/arvo/sys/vane/clay.hoon
View File

@ -4175,7 +4175,11 @@
~? ?=(^ act.ruf) ~? ?=(^ act.ruf)
[%clay-cancelling hen -.req -.eval-data]:u.act.ruf [%clay-cancelling hen -.req -.eval-data]:u.act.ruf
=. act.ruf ~ =. act.ruf ~
?~ cue.ruf ?: =(~ cue.ruf)
[~ ..^$]
?: =(%force des.req)
=^ queued cue.ruf ~(get to cue.ruf)
~& [%dropping-hard [duct -.task]:p.queued cue-length=~(wyt in cue.ruf)]
[~ ..^$] [~ ..^$]
=/ =duct duct:(need ~(top to cue.ruf)) =/ =duct duct:(need ~(top to cue.ruf))
[[duct %pass /queued-request %b %wait now]~ ..^$] [[duct %pass /queued-request %b %wait now]~ ..^$]