[PATCH 1/3] nmbug-status: simplify config file read from nmbug git

diff --git a/e1/d9e78bb3d4111ab91b58e56f8232481587d723 b/e1/d9e78bb3d4111ab91b58e56f8232481587d723
new file mode 100644 (file)
index 0000000..c5f9735
--- /dev/null
+++ b/e1/d9e78bb3d4111ab91b58e56f8232481587d723
@@ -0,0 +1,100 @@
+Return-Path: <jani@nikula.org>\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 789DC429E51\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Apr 2013 02:44:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 BSz56q8DBGvL for <notmuch@notmuchmail.org>;\r
+       Mon,  1 Apr 2013 02:44:16 -0700 (PDT)\r
+Received: from mail-la0-f41.google.com (mail-la0-f41.google.com\r
+       [209.85.215.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D101E429E55\r
+       for <notmuch@notmuchmail.org>; Mon,  1 Apr 2013 02:44:12 -0700 (PDT)\r
+Received: by mail-la0-f41.google.com with SMTP id fo12so1989160lab.0\r
+       for <notmuch@notmuchmail.org>; Mon, 01 Apr 2013 02:44:09 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references:in-reply-to:references:x-gm-message-state;\r
+       bh=MzdJyvHgpK95WMmwkD5Kr8CXmCCl/zx0jM1n9yaxVao=;\r
+       b=All8NXZaEx+DZNuCFBEKHElKIL5t6iYMm+dDYJMFYrAICLJuwvAd2TsfBqV35C/c3X\r
+       OwwCwUOzilQinQ2hiXWPDK/qxeY8TB9cBya5neeCKjyu9YhwBeyonIMBMGV9cJaXzHG3\r
+       fngY9i/dmeHXe0ZW+btn+AbKg3iZNjomksACtVQb2/ti7hPYdo/Ck3lwfPGbPZbFSvoy\r
+       qaqyBGiVRP4CGK2TfKaoEZNY1EebrJTEKH/IW91Eu5RfPshZDjJEcB2CJkRCbEnABzn1\r
+       eN6+HyQN7NjF3GPPsGLlpBQqjMN36yC9h47oL/9FOEC55aatoXe1RSAi4V/M2nBgD7oj\r
+       urIg==\r
+X-Received: by 10.152.132.138 with SMTP id ou10mr5412514lab.56.1364809448575; \r
+       Mon, 01 Apr 2013 02:44:08 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id pk1sm5312387lab.0.2013.04.01.02.44.06\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Mon, 01 Apr 2013 02:44:07 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] nmbug-status: simplify config file read from nmbug git\r
+Date: Mon,  1 Apr 2013 12:44:00 +0300\r
+Message-Id:\r
+ <41d8f64a00a516faaa51871e2cb060bb1d0c8a8a.1364809172.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1364809172.git.jani@nikula.org>\r
+References: <cover.1364809172.git.jani@nikula.org>\r
+In-Reply-To: <cover.1364809172.git.jani@nikula.org>\r
+References: <cover.1364809172.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnfDtMdEt8zCEeWpbm95kFB2C4UcUOEqfmCUhyB7Iz/TFJ2e9ZlVAOQBjKlvy/vbjA9twtn\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Mon, 01 Apr 2013 09:44:18 -0000\r
+\r
+This should be functionally the same as before.\r
+---\r
+ devel/nmbug/nmbug-status |   10 +---------\r
+ 1 file changed, 1 insertion(+), 9 deletions(-)\r
+\r
+diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status\r
+index d08ca08..0283013 100755\r
+--- a/devel/nmbug/nmbug-status\r
++++ b/devel/nmbug/nmbug-status\r
+@@ -32,16 +32,8 @@ if args.config != None:\r
+     fp = open(args.config)\r
+ else:\r
+     nmbhome = os.getenv('NMBGIT', os.path.expanduser('~/.nmbug'))\r
+-\r
+-    # read only the first line from the pipe\r
+-    sha1 = subprocess.Popen(['git', '--git-dir', nmbhome,\r
+-                             'show-ref', '-s', 'config'],\r
+-                            stdout=subprocess.PIPE).stdout.readline()\r
+-\r
+-    sha1 = sha1.rstrip()\r
+-\r
+     fp = subprocess.Popen(['git', '--git-dir', nmbhome,\r
+-                           'cat-file', 'blob', sha1+':status-config.json'],\r
++                           'show', 'config:status-config.json'],\r
+                           stdout=subprocess.PIPE).stdout\r
+ \r
+ config = json.load(fp)\r
+-- \r
+1.7.10.4\r
+\r