Merge pull request #2595 from urbit/philip/clay-cancel-all

clay: add option to skip queue
This commit is contained in:
ixv 2020-03-24 15:03:25 -07:00 committed by GitHub
commit c94ba12c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 7 deletions

View File

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

View File

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

View File

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

View File

@ -4175,7 +4175,11 @@
~? ?=(^ act.ruf)
[%clay-cancelling hen -.req -.eval-data]:u.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 %pass /queued-request %b %wait now]~ ..^$]