Re: [PATCH v2] lib: Simplify close and codify aborting atomic section

diff --git a/64/534016a1dffb9e1ca3950b9e597aeb5367ea64 b/64/534016a1dffb9e1ca3950b9e597aeb5367ea64
new file mode 100644 (file)
index 0000000..c0b2bf5
--- /dev/null
+++ b/64/534016a1dffb9e1ca3950b9e597aeb5367ea64
@@ -0,0 +1,136 @@
+Return-Path: <wking@tremily.us>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 426FD431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Sep 2014 14:28:52 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Fl2uzYBgj2FH for <notmuch@notmuchmail.org>;\r
+       Wed, 24 Sep 2014 14:28:44 -0700 (PDT)\r
+Received: from resqmta-po-03v.sys.comcast.net (resqmta-po-03v.sys.comcast.net\r
+       [96.114.154.162])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7C3CB431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Sep 2014 14:28:44 -0700 (PDT)\r
+Received: from resomta-po-10v.sys.comcast.net ([96.114.154.234])\r
+       by resqmta-po-03v.sys.comcast.net with comcast\r
+       id v9UN1o00853iAfU019UhXK; Wed, 24 Sep 2014 21:28:41 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by resomta-po-10v.sys.comcast.net with comcast\r
+       id v9Ug1o008152l3L019Ugak; Wed, 24 Sep 2014 21:28:41 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+       id 8092113BA82D; Wed, 24 Sep 2014 14:28:39 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+       t=1411594119; bh=YAjWMlgfXWwq57BUOwEEgQh3JiuBWcT0T70CWrFcXWY=;\r
+       h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+       b=anMjYFbFo6fvb/GyJHalXiZwh7zQdA+rap09I7WUO8s3FZieCXPEtW3UexlBrC+p8\r
+       3Q63a7FTpDeie55p4Ot0YScl3rP3ZoGU6quv+V3QHRElu+/m4nlToo97/2v0A90O2E\r
+       wqwBfEYx+zoF3WYyaV8LqYjrTJ3TKexPeBQliqh0=\r
+Date: Wed, 24 Sep 2014 14:28:39 -0700\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: Austin Clements <aclements@csail.mit.edu>\r
+Subject: Re: [PATCH v2] lib: Simplify close and codify aborting atomic section\r
+Message-ID: <20140924212839.GE20130@odin.tremily.us>\r
+References: <1411400615-20934-1-git-send-email-amdragon@mit.edu>\r
+       <1411593623-8234-1-git-send-email-aclements@csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="bi5JUZtvcfApsciF"\r
+Content-Disposition: inline\r
+In-Reply-To: <1411593623-8234-1-git-send-email-aclements@csail.mit.edu>\r
+OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
+       url=http://tremily.us/pubkey.txt\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1411594121;\r
+       bh=rMOQ3yEKm3DgTw/zjJW/2c2TdT11KS0kq3ZJAivHI24=;\r
+       h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+       MIME-Version:Content-Type;\r
+       b=klce0uEmdiczhG4l0NFGAtXjPRS6ZVDuciFxXyPzKknO74f+fh3oqixe4PBb+Wl+Z\r
+       mWU3eX+zpO3qJZgjUW4krDEarEu8LGS9VPw/hP6k8yWXdbAuNT/7lcP5yE+SAO700C\r
+       D/q5+3pD/GP7fmhVvWjYBSo2eZXLWVIJm8h044n17qI/3rHtLTSJJlv/LhtDbSGXc2\r
+       kaLU5/37kyc6kB/mh69vqBzjwGr1ds4DfdoVHtgYaZWNbjfbArLApcNjgmp9MekCd+\r
+       fKmrH5hDCq+E3XTPFB88sGRtH625prYG1mlE+Qpd4V8eEMp2xDb3s9H3BVMJ9UYcUD\r
+       dKcgF7uBO9MUw==\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 24 Sep 2014 21:28:52 -0000\r
+\r
+\r
+--bi5JUZtvcfApsciF\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Wed, Sep 24, 2014 at 05:20:23PM -0400, Austin Clements wrote:\r
+> diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+> index fe2340b..5c40c67 100644\r
+> --- a/lib/notmuch.h\r
+> +++ b/lib/notmuch.h\r
+> @@ -292,6 +292,11 @@ notmuch_database_open (const char *path,\r
+>   * notmuch_database_close can be called multiple times.  Later calls\r
+>   * have no effect.\r
+>   *\r
+> + * If the caller is currently in an atomic section (there was a\r
+> + * notmuch_database_begin_atomic without a matching\r
+> + * notmuch_database_end_atomic), this will abort the atomic section,\r
+> + * discarding any modifications made in the atomic section.\r
+> + *\r
+>   * Return value:\r
+>   *\r
+>   * NOTMUCH_STATUS_SUCCESS: Successfully closed the database.\r
+\r
+Still no mention of =E2=80=9Ccommit=E2=80=9D or =E2=80=9Cif you're not in a=\r
+n atomic section=E2=80=9D\r
+;).\r
+\r
+Cheers,\r
+Trevor\r
+\r
+--=20\r
+This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
+For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
+\r
+--bi5JUZtvcfApsciF\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+Content-Description: OpenPGP digital signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2\r
+\r
+iQIcBAEBAgAGBQJUIzeFAAoJEG8/JgBt8ol8Tx0P/39hs7vds2rIYlcdwtD2CvAT\r
+eRzfIN7zYAFqvRolWkil7hc96Ylod2LFDr9xQRmugCuThk17TDlQ/MB3a71+VvK9\r
+UinuSgZy30zI1pJN/wSGERsBIKMmotW03nJKXFf8nRRsAD7yyycvRM0LLXgSbasu\r
+Gba8YT9IxN5Ko6mK28ETGP0tboJflqz9NDK3MIyfY0xsXCeAkYTLEVhec5VlzbJM\r
+JKlYZ5Hfm76GHuGOey8b404Ye6eQRI8ZbWld7IIBzCYAAnfV2KFrSH/Qa5VOWZ5b\r
+d7mhdpX7Wmmxvfly2DK51ItOO/oz5E87ZoFcnWbK3ESuKpGCmYV/R1EdCBY2Pba2\r
+2ORAIOw/QFxvPygIntuCsGt0T0WRJytcwcyN03Brr/aDZrWGcFuyZiW3n5j9yYEX\r
+B36+GUMDSJn9nVcHL1rM6ucudlULo667T1wNTSGYUL5mhuUs8m9ihsan/pYrWpyV\r
+syHVoeh/wjyoPLUj9WTcBUyf6VPAYZ0/MqzZB8NM83By+u9J9FY85Tztw62w6SvI\r
+rsEl7BardxRfs3qQbAc8JUzXgtv7mJnaggr5W13mAhciBemMgDwoQwYGORrhpAMm\r
+ZRAu04aF5Zgee9vVGSxM2IZNTcIlaYkXAh6o7AzRdG+wLZXIhBE4ppyos9v3yH0o\r
+7/y8isp/TIfvQWofZ9rp\r
+=+UBI\r
+-----END PGP SIGNATURE-----\r
+\r
+--bi5JUZtvcfApsciF--\r