From 74966d9ff292720cf3ed7594abfe21e33f6e08cc Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 19 Jan 2015 16:40:10 +1600 Subject: [PATCH] [PATCH v4] nmbug: Add an 'init' command --- dd/ea54c35a4c6ae6d8f90baacd85eb04d31604cb | 151 ++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 dd/ea54c35a4c6ae6d8f90baacd85eb04d31604cb diff --git a/dd/ea54c35a4c6ae6d8f90baacd85eb04d31604cb b/dd/ea54c35a4c6ae6d8f90baacd85eb04d31604cb new file mode 100644 index 000000000..863a6a534 --- /dev/null +++ b/dd/ea54c35a4c6ae6d8f90baacd85eb04d31604cb @@ -0,0 +1,151 @@ +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 8F2C4431FAF + for ; Sun, 18 Jan 2015 16:40:23 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.338 +X-Spam-Level: ** +X-Spam-Status: No, score=2.338 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + DNS_FROM_AHBL_RHSBL=2.438, RCVD_IN_DNSWL_NONE=-0.0001] + 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 jcyQCVynEcuw for ; + Sun, 18 Jan 2015 16:40:19 -0800 (PST) +Received: from resqmta-po-10v.sys.comcast.net (resqmta-po-10v.sys.comcast.net + [96.114.154.169]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D8A5B431FAE + for ; Sun, 18 Jan 2015 16:40:18 -0800 (PST) +Received: from resomta-po-18v.sys.comcast.net ([96.114.154.242]) + by resqmta-po-10v.sys.comcast.net with comcast + id hcfo1p0075E3ZMc01cgGbR; Mon, 19 Jan 2015 00:40:16 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by resomta-po-18v.sys.comcast.net with comcast + id hcgF1p00M152l3L01cgFya; Mon, 19 Jan 2015 00:40:16 +0000 +Received: by odin.tremily.us (Postfix, from userid 1000) + id F04D215A0222; Sun, 18 Jan 2015 16:40:14 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin; + t=1421628014; bh=tqAGPv0AIQtPv7JIH04q4Ykx3GdWkSagxJIjIDaaZTU=; + h=From:To:Cc:Subject:Date; + b=h8D3zjD73Bx59MGIllwx76S8JcoZKoT/mF/lIbw2prt+kbM/95K6uHGM6TQf+U1JP + xioztBJtTf62gb4V7YccW7+VRn2jaWJjuQ5apmYg4g91FTAIISxIMxOlIDnQxCtubp + 18DzlTbpJ1cUI/D40c0dmuyVr8xMOKmtFJ0OQQdY= +From: "W. Trevor King" +To: notmuch@notmuchmail.org +Subject: [PATCH v4] nmbug: Add an 'init' command +Date: Sun, 18 Jan 2015 16:40:10 -0800 +Message-Id: + +X-Mailer: git-send-email 2.0.4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +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, 19 Jan 2015 00:40:23 -0000 + +For folks that want to start versioning a new tag-space, instead of +cloning one that someone else has already started. + +The empty-blob hash-object call avoids errors like: + + $ nmbug commit + error: invalid object 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 for +'tags/...' + fatal: git-write-tree: error building trees + 'git HASH(0x9ef3eb8) write-tree' exited with nonzero value + +David Bremner suggested [1]: + + $ git hash-object -w /dev/null + +instead of my Python version of: + + $ git hash-object -w --stdin <&- + +but I expect that closing stdin is more portable than the /dev/null +path (which doesn't exist on Windows, for example). + +The --bare init and use of NMBGIT as the work tree (what could go +wrong with an empty commit?) are suggestions from Michal Sojka [2]. + +[1]: id:87y4vu6uvf.fsf@maritornes.cs.unb.ca + http://thread.gmane.org/gmane.mail.notmuch.general/18626/focus=18720 +[2]: id:87a93a5or2.fsf@resox.2x.cz + http://thread.gmane.org/gmane.mail.notmuch.general/19495/focus=19767 +--- +Since v3 [1] I've incorporated Michal's suggestions [2]: + +* Start with 'git --git-dir {NMBGIT} init --bare +* Use NMBGIT instead of a temporary workdir when creating the initial + “Start a new nmbug repository” commit. + +As well as the core.logallrefupdates tweak I turned up in testing [3]. + +[1]: id:113512958b3fd64902517c1c55576faef816f852.1414532174.git.wking@tremily.us + http://thread.gmane.org/gmane.mail.notmuch.general/19495 +[2]: id:87a93a5or2.fsf@resox.2x.cz + http://thread.gmane.org/gmane.mail.notmuch.general/19495/focus=19767 +[3]: id:20141129201829.GI4062@odin.tremily.us + http://thread.gmane.org/gmane.mail.notmuch.general/19495/focus=19774 + + devel/nmbug/nmbug | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug +index 932ec12..1297345 100755 +--- a/devel/nmbug/nmbug ++++ b/devel/nmbug/nmbug +@@ -374,6 +374,25 @@ def fetch(remote=None): + _git(args=args, wait=True) + + ++def init(remote=None): ++ """ ++ Create an empty nmbug repository. ++ ++ This wraps 'git init' with a few extra steps to support subsequent ++ status and commit commands. ++ """ ++ _spawn(args=['git', '--git-dir', NMBGIT, 'init', '--bare'], wait=True) ++ _git(args=['config', 'core.logallrefupdates', 'true'], wait=True) ++ # create an empty blob (e69de29bb2d1d6434b8b29ae775ad8c2e48c5391) ++ _git(args=['hash-object', '-w', '--stdin'], input='', wait=True) ++ _git( ++ args=[ ++ 'commit', '--allow-empty', '-m', 'Start a new nmbug repository' ++ ], ++ additional_env={'GIT_WORK_TREE': NMBGIT}, ++ wait=True) ++ ++ + def checkout(): + """ + Update the notmuch database from Git. +@@ -725,6 +744,7 @@ if __name__ == '__main__': + 'commit', + 'fetch', + 'help', ++ 'init', + 'log', + 'merge', + 'pull', +-- +2.1.0.60.g85f0837 + -- 2.26.2