cmd updates: Restart updates when insert follows delete

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index b7dfdd6730ebbf2007307b6dfd86f7520c0a0447..1556e5e0634dcbe7f3a0ff4773e6bbd2baf65638 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -924,6 +924,7 @@ fn execute_for_game<'cs, 'igr, 'ig: 'igr>(
 #[derive(Debug,Default)]
 struct UpdateHandlerBulk {
   pieces: HashMap<PieceId, PieceUpdateOp<(),()>>,
+  have_deleted: bool,
   logs: bool,
   raw: Vec<PreparedUpdateEntry>,
 }
@@ -952,6 +953,15 @@ impl UpdateHandler {
     match self {
       Bulk(bulk) => {
         for (upiece, uuop) in updates.pcs {
+          match uuop {
+            Insert(()) if bulk.have_deleted => {
+              UpdateHandler::Bulk(mem::take(bulk)).complete(g, who)?;
+            },
+            Delete() => {
+              bulk.have_deleted = true;
+            },
+            _ => { },
+          }
           use PieceUpdateOp::*;
           let oe = bulk.pieces.get(&upiece);
           let ne = match (oe, uuop) {