From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 31 Mar 2021 18:36:59 +0000 (+0100)
Subject: Revert "cmd updates: Restart updates when insert follows delete"
X-Git-Tag: otter-0.5.0~346
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5258eb7dde77f002e31e16f1fad5c420d1c9e535;p=otter.git

Revert "cmd updates: Restart updates when insert follows delete"

This is not sufficient - it happens just too late.

This reverts commit 0dd82eda76f4750e39ca18b586c7f7a1cf8ed9c7.
---

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 1556e5e0..b7dfdd67 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -924,7 +924,6 @@ 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>,
 }
@@ -953,15 +952,6 @@ 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) {