real text merge

arvo/clay.hoon

@@ -1486,15 +1486,15 @@
           ==
         ?:  ?=(%| -.gon.dat)
           +>.$
-        =+  ^-  con=(map path ,*)
+        =+  ^-  con=(map path ,*)                       ::  2-change conflict
             %-  mo
             %+  skim  (~(tap by bof))
             |=([pax=path cay=(unit cage)] ?=(~ cay))
-        =+  ^-  cas=(map path lobe)
+        =+  ^-  cas=(map path lobe)                     ::  conflict base
             %-  ~(urn by con)
             |=  [pax=path *] 
             (~(got by q.bas.dat) pax)
-        =.  con
+        =.  con                                         ::  add/del conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list ,[path *])
           %+  skim  (~(tap by old.dal.dat))
@@ -1503,7 +1503,7 @@
             ~|  %strange-add-and-del
             !!
           (~(has by can.dob.dat) pax)
-        =.  con
+        =.  con                                         ::  add/del conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list ,[path *])
           %+  skim  (~(tap by old.dob.dat))
@@ -1512,7 +1512,7 @@
             ~|  %strange-del-and-add
             !!
           (~(has by can.dal.dat) pax)
-        =.  con
+        =.  con                                         ::  add/add conflict
           %-  ~(uni by con)
           %-  mo  ^-  (list ,[path *])
           %+  skip  (~(tap by (~(int by new.dal.dat) new.dob.dat)))
@@ -1521,18 +1521,23 @@
         ?:  &(?=(%mate gem.dat) ?=(^ con))
           =+  (turn (~(tap by `(map path ,*)`con)) |=([path *] >[+<-]<))
           (error:he %mate-conflict -)
-        =+  ^-  old=(map path lobe)
+        =+  ^-  old=(map path lobe)                     ::  oldies but goodies
             %+  roll  (~(tap by (~(uni by old.dal.dat) old.dob.dat)))
             =<  .(old q.bas.dat)
             |=  [[pax=path ~] old=(map path lobe)]
             (~(del by old) pax)
-        =+  ^-  can=(map path cage)
+        =+  ^-  can=(map path cage)                     ::  content changes
             %-  ~(uni by can.dal.dat)
             %-  ~(uni by can.dob.dat)
-            %-  ~(run by bof)
-            |=  cay=(unit cage)
-            (need cay)
-        =^  hat  lat.ran
+            %-  mo
+            ^-  (list (pair path cage))
+            %+  murn  (~(tap by bof))
+            |=  [pax=path cay=(unit cage)]
+            ^-  (unit (pair path cage))
+            ?~  cay
+              ~
+            `[pax u.cay]
+        =^  hat  lat.ran                                ::  new content
           ^-  [(map path lobe) (map lobe blob)]
           %+  roll  (~(tap by can))
           =<  .(lat lat.ran)
@@ -1544,12 +1549,12 @@
                 !!
               (make-delta u.- cay)
           [(~(put by hat) pax p.bol) (~(put by lat) p.bol bol)]
-        =.  hat
+        =.  hat                                         ::  all the content
           %-  ~(uni by old)
           %-  ~(uni by new.dal.dat)
           %-  ~(uni by new.dob.dat)
-          %-  ~(uni by cas)
-          hat
+          %-  ~(uni by hat)
+          cas
         =+  ^-  del=(map path ,?)
             (~(run by (~(uni by old.dal.dat) old.dob.dat)) |=(~ %|))
         =.  gon.dat  [%& (sa (turn (~(tap by con)) |=([path *] +<-)))]

main/mar/md/door.hook

@@ -7,13 +7,19 @@
 ++  grow
   |%
   ++  mime  [/text/x-markdown (taco mud)]
+  ++  txt
+    (lore (cat 3 mud '\0a'))
   --
 ++  grab
   |%
   ++  mime  |=([p=mite q=octs] q.q)
+  ++  txt
+    |=  wan=wain
+    =+  (role wan)
+    (end 3 (dec (met 3 -)) -)
   --
 ++  grad
   |%
-  ++  sted  %mime
+  ++  sted  %txt
   --
 --

main/mar/txt/door.hook

@@ -31,6 +31,58 @@
   ++  join
     |=  [ali=(urge cord) bob=(urge cord)]
     ^-  (unit (urge cord))
-    `ali
+    |^
+    =.  ali  (clean ali)
+    =.  bob  (clean bob)
+    |-  ^-  (unit (urge cord))
+    ?~  ali  `bob
+    ?~  bob  `ali
+    ?-    -.i.ali
+        %&
+      ?-    -.i.bob
+          %&
+        ?:  =(p.i.ali p.i.bob)
+          %+  bind  $(ali t.ali, bob t.bob)
+          |=(cud=(urge cord) [i.ali cud])
+        ?:  (gth p.i.ali p.i.bob)
+          %+  bind  $(p.i.ali (sub p.i.ali p.i.bob), bob t.bob)
+          |=(cud=(urge cord) [i.bob cud])
+        %+  bind  $(ali t.ali, p.i.bob (sub p.i.bob p.i.ali))
+        |=(cud=(urge cord) [i.ali cud])
+          %|
+        ?:  =(p.i.ali (lent p.i.bob))
+          %+  bind  $(ali t.ali, bob t.bob)
+          |=(cud=(urge cord) [i.bob cud])
+        ?:  (gth p.i.ali (lent p.i.bob))
+          %+  bind  $(p.i.ali (sub p.i.ali (lent p.i.bob)), bob t.bob)
+          |=(cud=(urge cord) [i.bob cud])
+        ~
+      ==
+        %|
+      ?-  -.i.bob
+          %|  ~
+          %&
+        ?:  =(p.i.bob (lent p.i.ali))
+          %+  bind  $(ali t.ali, bob t.bob)
+          |=(cud=(urge cord) [i.ali cud])
+        ?:  (gth p.i.bob (lent p.i.ali))
+          %+  bind  $(ali t.ali, p.i.bob (sub p.i.bob (lent p.i.ali)))
+          |=(cud=(urge cord) [i.ali cud])
+        ~
+      ==
+    ==
+    ++  clean                                          ::  clean
+      |=  wig=(urge cord)
+      ^-  (urge cord)
+      ?~  wig  ~
+      ?~  t.wig  wig
+      ?:  ?=(%& -.i.wig)
+        ?:  ?=(%& -.i.t.wig)
+          $(wig [[%& (add p.i.wig p.i.t.wig)] t.t.wig])
+        [i.wig $(wig t.wig)]
+      ?:  ?=(%| -.i.t.wig)
+        $(wig [[%| (welp p.i.wig p.i.t.wig) (welp q.i.wig q.i.t.wig)] t.t.wig])
+      [i.wig $(wig t.wig)]
+    --
   --
 --