From ed2d30b65e2cae4dd9921dd58067d6d74a83e59a Mon Sep 17 00:00:00 2001
From: ryjm <jraydermiller@gmail.com>
Date: Sun, 6 Nov 2022 00:58:45 -0400
Subject: [PATCH 1/4] kiln: recursive `|rm`

Increments the commit number every time, is there a better way to do
this?
---
 pkg/arvo/lib/hood/kiln.hoon | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon
index c8edd21d7..fd67382ca 100644
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@@ -1200,6 +1200,15 @@
     abet:(spam leaf+mez ~)
   abet:(emit:(spam leaf+mez ~) %pass /kiln %arvo %c [%info u.tor])
 ::
+++  poke-infos
+  |=  [mez=tape mor=(list (unit toro))]
+  =<  abet
+  %-  emil:(spam leaf+mez ~)
+  %+  murn  mor
+  |=  tor=(unit toro)
+  ?~  tor  ~
+  `[%pass /kiln %arvo %c [%info u.tor]]
+::
 ++  poke-install
   |=  [loc=desk her=ship rem=desk]
   abet:abet:(install:vats +<)
@@ -1256,11 +1265,15 @@
 ::
 ++  poke-rm
   |=  a=path
+  =|  c=(list (unit toro))
+  %+  poke-infos  "removed: {<a>}"
+  |-  ^-  (list (unit toro))
   =+  b=.^(arch %cy a)
-  ?~  fil.b
-    =+  ~[leaf+"No such file:" leaf+"{<a>}"]
-    abet:(spam -)
-  (poke-info "removed" `(fray a))
+  ?^  fil.b  (snoc c `(fray a))
+  %-  zing
+  %+  turn  ~(tap by dir.b)
+  |=  [kid=@ta ~]
+  ^$(a (weld a /[kid]))
 ::
 ++  poke-schedule
   |=  [where=path tym=@da eve=@t]

From 586c24a5f29a5f0a586d64b01f48c351e9ebcd3c Mon Sep 17 00:00:00 2001
From: ryjm <jraydermiller@gmail.com>
Date: Sun, 6 Nov 2022 01:18:40 -0500
Subject: [PATCH 2/4] kiln: combine toros

---
 pkg/arvo/lib/hood/kiln.hoon | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon
index fd67382ca..898d68b8d 100644
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@@ -1200,15 +1200,6 @@
     abet:(spam leaf+mez ~)
   abet:(emit:(spam leaf+mez ~) %pass /kiln %arvo %c [%info u.tor])
 ::
-++  poke-infos
-  |=  [mez=tape mor=(list (unit toro))]
-  =<  abet
-  %-  emil:(spam leaf+mez ~)
-  %+  murn  mor
-  |=  tor=(unit toro)
-  ?~  tor  ~
-  `[%pass /kiln %arvo %c [%info u.tor]]
-::
 ++  poke-install
   |=  [loc=desk her=ship rem=desk]
   abet:abet:(install:vats +<)
@@ -1266,7 +1257,10 @@
 ++  poke-rm
   |=  a=path
   =|  c=(list (unit toro))
-  %+  poke-infos  "removed: {<a>}"
+  %+  poke-info  "removed: {<a>}"
+  =-  %+  roll  -
+  |=  [a=(unit toro) b=(unit toro)]
+  (clap a b furl)
   |-  ^-  (list (unit toro))
   =+  b=.^(arch %cy a)
   ?^  fil.b  (snoc c `(fray a))

From f2577efe42b3a0b3ef8380223f846deaf7f645c9 Mon Sep 17 00:00:00 2001
From: ryjm <jake@tlon.io>
Date: Tue, 8 Nov 2022 23:56:54 -0500
Subject: [PATCH 3/4] kiln: indentation

---
 pkg/arvo/lib/hood/kiln.hoon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon
index 898d68b8d..7fbe1b922 100644
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@@ -1259,8 +1259,8 @@
   =|  c=(list (unit toro))
   %+  poke-info  "removed: {<a>}"
   =-  %+  roll  -
-  |=  [a=(unit toro) b=(unit toro)]
-  (clap a b furl)
+      |=  [a=(unit toro) b=(unit toro)]
+      (clap a b furl)
   |-  ^-  (list (unit toro))
   =+  b=.^(arch %cy a)
   ?^  fil.b  (snoc c `(fray a))

From 82148b0528475e64f09a3502b15955ba638b0aee Mon Sep 17 00:00:00 2001
From: ryjm <jraydermiller@gmail.com>
Date: Thu, 10 Nov 2022 02:03:18 -0500
Subject: [PATCH 4/4] kiln: fil and dir not ~

---
 pkg/arvo/lib/hood/kiln.hoon | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon
index 7fbe1b922..810023ac0 100644
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@@ -1263,7 +1263,8 @@
       (clap a b furl)
   |-  ^-  (list (unit toro))
   =+  b=.^(arch %cy a)
-  ?^  fil.b  (snoc c `(fray a))
+  ?:  ?=([^ ~] b)  (snoc c `(fray a))  
+  =?  c  ?=(^ fil.b)  (snoc c `(fray a))
   %-  zing
   %+  turn  ~(tap by dir.b)
   |=  [kid=@ta ~]