From ae5e1d0046b63734698ec07c54837f05b1983867 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sat, 21 Mar 2015 10:28:05 +0200 Subject: [PATCH] Re: [PATCH v2] nmbug-status: Use 'show-ref --heads' for loading configs --- a6/592f18750c4d19f6bbe752e83d760adfa38a28 | 149 ++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 a6/592f18750c4d19f6bbe752e83d760adfa38a28 diff --git a/a6/592f18750c4d19f6bbe752e83d760adfa38a28 b/a6/592f18750c4d19f6bbe752e83d760adfa38a28 new file mode 100644 index 000000000..8020018f9 --- /dev/null +++ b/a6/592f18750c4d19f6bbe752e83d760adfa38a28 @@ -0,0 +1,149 @@ +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 045BC431FC2 + for ; Sat, 21 Mar 2015 01:28:34 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.438 +X-Spam-Level: ** +X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 + tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 YKGinrMA4FKm for ; + Sat, 21 Mar 2015 01:28:30 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 71A05431FAE + for ; Sat, 21 Mar 2015 01:28:30 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 9339810004A; + Sat, 21 Mar 2015 10:28:05 +0200 (EET) +From: Tomi Ollila +To: "W. Trevor King" , notmuch@notmuchmail.org +Subject: Re: [PATCH v2] nmbug-status: Use 'show-ref --heads' for loading + configs +In-Reply-To: + <5e97afaab6c01e980ca6194a1c04aa0310e28ab8.1426412504.git.wking@tremily.us> +References: + <5e97afaab6c01e980ca6194a1c04aa0310e28ab8.1426412504.git.wking@tremily.us> +User-Agent: Notmuch/0.19+53~gb45d2f9 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Sat, 21 Mar 2015 08:28:34 -0000 + +On Sun, Mar 15 2015, "W. Trevor King" wrote: + +> When loading configs from Git, the bare branch name (without a +> refs/heads/ prefix or similar) matches all branches of that name +> (including remote-tracking branches): +> +> .nmbug $ git show-ref config +> 48f3bbf1d1492e5f3d2f01de6ea79a30d3840f20 refs/heads/config +> 48f3bbf1d1492e5f3d2f01de6ea79a30d3840f20 refs/remotes/origin/config +> 4b6dbd9ffd152e7476f5101eff26747f34497cee refs/remotes/wking/config +> +> Instead of relying on the ordering of the matching references, use +> --heads to ensure we only match local branches. +> --- + +This looks OK, nmbug works as it used to be. I did not test cloning but +the oneline change in the patch looks good (just adds that config branch). + +The nmbug-status change also looks good... and it works (tried using --config +option as I did not have working tree of config branch checked out just now). + +But why is the NEWS brurb added deep into 0.19 NEWS content ? + + +Tomi + + +> This is v2 of [1], with the only changes being: +> +> * Relocate the NEWS blurb to fit into the current pending release +> (0.20). +> * Translate the 'nmbug' patch from Perl to Python. +> +> [1]: id:7ddcf7368895768aa0a2d37dac0d4f96e9666f16.1399749244.git.wking@tremily.us +> http://article.gmane.org/gmane.mail.notmuch.general/18306 +> +> NEWS | 12 ++++++++++++ +> devel/nmbug/nmbug | 1 + +> devel/nmbug/nmbug-status | 2 +- +> 3 files changed, 14 insertions(+), 1 deletion(-) +> +> diff --git a/NEWS b/NEWS +> index 70ad3f3..0441587 100644 +> --- a/NEWS +> +++ b/NEWS +> @@ -187,6 +187,18 @@ from the config file. Use something like: +> ... +> }, +> +> +`nmbug-status` now only matches local branches when reading +> +`status-config.json` from the `config` branch of the `NMBGIT` +> +repository. To help new users running `nmbug-status`, `nmbug clone` +> +now creates a local `config` branch tracking `origin/config`. Folks +> +who use `nmbug-status` with an in-Git config (i.e. you don't use the +> +`--config` option) who already have `NMBGIT` set up are encouraged to +> +run: +> + +> + git checkout config origin/config +> + +> +in their `NMBGIT` repository (usually `~/.nmbug`). +> + +> Python Bindings +> --------------- +> +> diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug +> index 932ec12..81f582c 100755 +> --- a/devel/nmbug/nmbug +> +++ b/devel/nmbug/nmbug +> @@ -308,6 +308,7 @@ def clone(repository): +> wait=True) +> _git(args=['config', '--unset', 'core.worktree'], wait=True) +> _git(args=['config', 'core.bare', 'true'], wait=True) +> + _git(args=['branch', 'config', 'origin/config'], wait=True) +> +> +> def _is_committed(status): +> diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status +> index 19dc48a..e845c2a 100755 +> --- a/devel/nmbug/nmbug-status +> +++ b/devel/nmbug/nmbug-status +> @@ -92,7 +92,7 @@ def read_config(path=None, encoding=None): +> +> # read only the first line from the pipe +> sha1_bytes = subprocess.Popen( +> - ['git', '--git-dir', nmbhome, 'show-ref', '-s', branch], +> + ['git', '--git-dir', nmbhome, 'show-ref', '-s', '--heads', branch], +> stdout=subprocess.PIPE).stdout.readline() +> sha1 = sha1_bytes.decode(encoding).rstrip() +> if not sha1: +> -- +> 1.8.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2