Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id F32AE429E21 for ; Sun, 11 Sep 2011 18:03:44 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X3SGUgWbRGfF for ; Sun, 11 Sep 2011 18:03:44 -0700 (PDT) Received: from mail-yx0-f181.google.com (mail-yx0-f181.google.com [209.85.213.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 87507431FB6 for ; Sun, 11 Sep 2011 18:03:44 -0700 (PDT) Received: by yxk30 with SMTP id 30so2378678yxk.26 for ; Sun, 11 Sep 2011 18:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; bh=q4OoP+EE9J39d2nZMnSReFIuNsd0Bvi5PZJCaJUZdSg=; b=K8zdjVW3/w+MJ9cQCQxw8CLFTOXwy0hi1bCdZ9OtYTSRwGJT0IccAuMdPEixOxEMy9 DA9W0JYG4nmIOTxu9eIe3/MvHaYmnRwvo7yhwFsICf/tWfapsRhKfPZRE1tjgcQBG85B 8GHwpM89goAUKts8CQtX+PPc8mN6H3Md9ftm4= Received: by 10.150.212.12 with SMTP id k12mr3645970ybg.413.1315789423047; Sun, 11 Sep 2011 18:03:43 -0700 (PDT) Received: from [192.168.5.100] (mcd2436d0.tmodns.net [208.54.36.205]) by mx.google.com with ESMTPS id o39sm12342663ani.17.2011.09.11.18.03.37 (version=SSLv3 cipher=OTHER); Sun, 11 Sep 2011 18:03:41 -0700 (PDT) Subject: Re: Patch: Flush and Reopen From: Martin Owens To: Austin Clements In-Reply-To: <20110912002327.GC23603@mit.edu> References: <1315445674.32058.183.camel@delen> <1315536861.2435.34.camel@delen> <87obyuj7q1.fsf@zancas.localnet> <1315590950.2435.59.camel@delen> <1315615433.2435.62.camel@delen> <20110912002327.GC23603@mit.edu> Content-Type: text/plain; charset="UTF-8" Date: Sun, 11 Sep 2011 21:03:23 -0400 Message-ID: <1315789403.2435.74.camel@delen> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Content-Transfer-Encoding: 7bit Cc: Notmuch developer list X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2011 01:03:45 -0000 On Sun, 2011-09-11 at 20:23 -0400, Austin Clements wrote: > BTW, in the future, you should send patches inline (see the patch > formatting guide I linked to earlier for easy ways to do this). It > makes them much easier to review and reply to. I tried to do this, my email client doesn't allow this sort of mucking about. sorry guys bare with the patch file. > I assume you've tested it? Absolutely, I have my testing framework and it would fail quite badly if either flush or reopen failed to work in either py binding or lib. > Notmuch is quite consistent about indentation, though the rule may not > be something you'd expect coming from Python. It uses four space > indentation, but each group of eight spaces is replaced with a tab, so > for example I see, I'm going to forgo the rage and just do it. > Even if you found the above two changes necessary, they shouldn't be > included in this patch because they aren't related to reopen/flush. There were intended to be removed. Should be gone now. > Both catch blocks should set notmuch->exception_reported = TRUE; > (notmuch_database_close happens to be the one exception to this since > it's closing the database; see other catch blocks in lib/database.cc). Added. > The catch block in notmuch_database_flush shouldn't appear as changed > in the diff; you should leave the spacing the way it originally was. The spacing is mostly the same now, I removed a word from the error message deliberately before I noticed it was in the original text. But it shouldn't be too important. Regards, Martin Owens