Re: [PATCH v3] nmbug: Add an 'init' command

diff --git a/7c/82a9ff9935e97142de146f1c06722f5782912c b/7c/82a9ff9935e97142de146f1c06722f5782912c
new file mode 100644 (file)
index 0000000..b092aa2
--- /dev/null
+++ b/7c/82a9ff9935e97142de146f1c06722f5782912c
@@ -0,0 +1,183 @@
+Return-Path: <sojkam1@fel.cvut.cz>\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 19D43431FBF\r
+       for <notmuch@notmuchmail.org>; Sat, 29 Nov 2014 02:17:09 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[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 LRSqvWindEKw for <notmuch@notmuchmail.org>;\r
+       Sat, 29 Nov 2014 02:17:00 -0800 (PST)\r
+Received: from smtp.nextra.cz (smtp.nextra.cz [212.65.193.3])\r
+       by olra.theworths.org (Postfix) with ESMTP id 98F00431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 29 Nov 2014 02:17:00 -0800 (PST)\r
+Received: from resox (unknown [213.29.198.144])\r
+       by smtp.nextra.cz (Postfix) with ESMTP id 5151C4A768;\r
+       Sat, 29 Nov 2014 11:16:50 +0100 (CET)\r
+Received: from wsh by resox with local (Exim 4.84)\r
+       (envelope-from <sojkam1@fel.cvut.cz>)\r
+       id 1XueVV-0007F1-VH; Sat, 29 Nov 2014 10:40:01 +0100\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3] nmbug: Add an 'init' command\r
+In-Reply-To:\r
+ <113512958b3fd64902517c1c55576faef816f852.1414532174.git.wking@tremily.us>\r
+References:\r
+ <113512958b3fd64902517c1c55576faef816f852.1414532174.git.wking@tremily.us>\r
+User-Agent: Notmuch/0.19~rc1+7~gdb5e73a (http://notmuchmail.org) Emacs/24.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 29 Nov 2014 10:40:01 +0100\r
+Message-ID: <87a93a5or2.fsf@resox.2x.cz>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\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: Sat, 29 Nov 2014 10:17:09 -0000\r
+\r
+Hi Trevor,\r
+\r
+On =C3=9At, =C5=99=C3=ADj 28 2014, W. Trevor King wrote:\r
+> For folks that want to start versioning a new tag-space, instead of\r
+> cloning one that someone else has already started.\r
+>\r
+> The empty-blob hash-object call avoids errors like:\r
+>\r
+>   $ nmbug commit\r
+>   error: invalid object 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 f=\r
+or\r
+> 'tags/...'\r
+>   fatal: git-write-tree: error building trees\r
+>   'git HASH(0x9ef3eb8) write-tree' exited with nonzero value\r
+>\r
+> David Bremner suggested [1]:\r
+>\r
+>   $ git hash-object -w /dev/null\r
+>\r
+> instead of my Python version of:\r
+>\r
+>   $ git hash-object -w --stdin <&-\r
+>\r
+> but I expect that closing stdin is more portable than the /dev/null\r
+> path (which doesn't exist on Windows, for example).\r
+>\r
+> [1]: id:87y4vu6uvf.fsf@maritornes.cs.unb.ca\r
+>      http://thread.gmane.org/gmane.mail.notmuch.general/18626/focus=3D187=\r
+20\r
+> ---\r
+> The only change since v2 [1] is a commit-message tweak:\r
+>\r
+> * Mention Windows as an OS with stdin but no /dev/null [2].\r
+>\r
+> Cheers,\r
+> Trevor\r
+>\r
+> [1]: id:eaa9cf1cb3c00c591dc675c0f314ca31909ff74c.1412965476.git.wking@tre=\r
+mily.us\r
+>      http://thread.gmane.org/gmane.mail.notmuch.general/19289\r
+> [2]: id:20141011071000.GB10926@odin.tremily.us\r
+>      http://article.gmane.org/gmane.mail.notmuch.general/19294\r
+>\r
+>  devel/nmbug/nmbug | 24 ++++++++++++++++++++++++\r
+>  1 file changed, 24 insertions(+)\r
+>\r
+> diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug\r
+> index 9402ead..23bac5c 100755\r
+> --- a/devel/nmbug/nmbug\r
+> +++ b/devel/nmbug/nmbug\r
+> @@ -373,6 +373,29 @@ def fetch(remote=3DNone):\r
+>      _git(args=3Dargs, wait=3DTrue)\r
+>=20=20\r
+>=20=20\r
+> +def init(remote=3DNone):\r
+> +    """\r
+> +    Create an empty nmbug repository.\r
+> +\r
+> +    This wraps 'git init' with a few extra steps to support subsequent\r
+> +    status and commit commands.\r
+> +    """\r
+> +    with _tempfile.TemporaryDirectory(prefix=3D'nmbug-init.') as workdir:\r
+> +        _spawn(\r
+> +            args=3D['git', 'init', '--separate-git-dir', NMBGIT, workdir=\r
+],\r
+> +            wait=3DTrue)\r
+> +        _git(args=3D['config', '--unset', 'core.worktree'], wait=3DTrue)\r
+> +        _git(args=3D['config', 'core.bare', 'true'], wait=3DTrue)\r
+\r
+Why do you create a non-bare repository and then make it bare? Before I\r
+discovered this patch, I created the nmbug repository by hand and it was\r
+possible to do it with bare repo from beginning. The following code\r
+seems to work and is a bit simpler:\r
+\r
+def init(remote=3DNone):\r
+    """\r
+    Create an empty nmbug repository.\r
+\r
+    This wraps 'git init' with a few extra steps to support subsequent\r
+    status and commit commands.\r
+    """\r
+    _spawn(\r
+        args=3D['git', '--git-dir', NMBGIT, 'init', '--bare'],\r
+        wait=3DTrue)\r
+    # create an empty blob (e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)\r
+    _git(args=3D['hash-object', '-w', '--stdin'], input=3D'', wait=3DTrue)\r
+    _git(\r
+        args=3D[\r
+            'commit', '--allow-empty', '-m', 'Start a new nmbug repository'\r
+            ],\r
+        additional_env=3D{'GIT_WORK_TREE': NMBGIT},\r
+        wait=3DTrue)\r
+\r
+Note that in the initial commit I set the work tree to NMBGIT. This is\r
+because 'git commit' needs some work tree, but in our case it doesn't\r
+matter which one because the commit is empty.\r
+\r
+-Michal\r
+\r
+\r
+> +        # create an empty blob (e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)\r
+> +        _git(args=3D['hash-object', '-w', '--stdin'], input=3D'', wait=\r
+=3DTrue)\r
+> +        _git(\r
+> +            args=3D[\r
+> +                'commit', '--allow-empty', '-m', 'Start a new nmbug repo=\r
+sitory'\r
+> +                ],\r
+> +            additional_env=3D{'GIT_WORK_TREE': workdir},\r
+> +            wait=3DTrue)\r
+> +\r
+> +\r
+>  def checkout():\r
+>      """\r
+>      Update the notmuch database from Git.\r
+> @@ -703,6 +726,7 @@ if __name__ =3D=3D '__main__':\r
+>              'clone',\r
+>              'commit',\r
+>              'fetch',\r
+> +            'init',\r
+>              'log',\r
+>              'merge',\r
+>              'pull',\r
+> --=20\r
+> 2.1.0.60.g85f0837\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r