From: W. Trevor King Date: Sun, 6 Jul 2014 20:40:18 +0000 (+1700) Subject: [PATCH 0/4] nmbug without an upstream repository (and init) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1ce620b216d13e4e2d7424f7ac133e9f716ae2fa;p=notmuch-archives.git [PATCH 0/4] nmbug without an upstream repository (and init) --- diff --git a/9f/9a40d9615b8d9bc454ed5249dd7fdd7ad8f5db b/9f/9a40d9615b8d9bc454ed5249dd7fdd7ad8f5db new file mode 100644 index 000000000..acf225d0b --- /dev/null +++ b/9f/9a40d9615b8d9bc454ed5249dd7fdd7ad8f5db @@ -0,0 +1,97 @@ +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 7D668431FD5 + for ; Sun, 6 Jul 2014 13:41:09 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, 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 y3U-dTZKNLNR for ; + Sun, 6 Jul 2014 13:41:03 -0700 (PDT) +Received: from qmta14.westchester.pa.mail.comcast.net + (qmta14.westchester.pa.mail.comcast.net [76.96.59.212]) + by olra.theworths.org (Postfix) with ESMTP id 6C7F5431FBD + for ; Sun, 6 Jul 2014 13:41:03 -0700 (PDT) +Received: from omta23.westchester.pa.mail.comcast.net ([76.96.62.74]) + by qmta14.westchester.pa.mail.comcast.net with comcast + id P8RP1o0051c6gX85E8h2wW; Sun, 06 Jul 2014 20:41:02 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta23.westchester.pa.mail.comcast.net with comcast + id P8h01o00C152l3L3j8h1ir; Sun, 06 Jul 2014 20:41:02 +0000 +Received: from mjolnir.tremily.us (unknown [192.168.0.140]) + by odin.tremily.us (Postfix) with ESMTPS id 41AA512700E3; + Sun, 6 Jul 2014 13:40:59 -0700 (PDT) +Received: (nullmailer pid 1893 invoked by uid 1000); + Sun, 06 Jul 2014 20:40:27 -0000 +From: "W. Trevor King" +To: notmuch@notmuchmail.org +Subject: [PATCH 0/4] nmbug without an upstream repository (and init) +Date: Sun, 6 Jul 2014 13:40:18 -0700 +Message-Id: +X-Mailer: git-send-email 1.9.1.353.gc66d89d +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20140121; t=1404679262; + bh=+cvP3cYrvsGHloVpSmmVfUpoZxNmetpSLWzFLIH6iW0=; + h=Received:Received:Received:Received:From:To:Subject:Date: + Message-Id; + b=i+EBZdrUqp68ZzXQw9ziZcYHtyZUW/BNzFHrwosKE87oysbGP+o48WtKuf2Y3/Cdr + 3ESp91Qil4yl2GoNhP3ORluE5DfnwR+IE0H7WbNHfh4G46r6nKLHt3zf50KDem4NLa + vRSQBeIWxInJGiw5VpmWkPc2vSM1IXSP3GOyqE80uhbnQECIZYDpB3ZSGmEvMVt+r4 + kU8jeMKpUo9GJBVrR7UDwckBmBh16KKtP+ho33iVgl6SQrNt4g9YKYQETliFYy0/xv + 0BwyislI3pJZHXRW9mEbUX9W1fHNZAelvmtP4iwu5ZNA7F7nTWIaVj5b91A1QWWQJe + p2IEgFH8380sQ== +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: Sun, 06 Jul 2014 20:41:09 -0000 + +Currently 'nmbug status' errors out if there is no @{upstream} branch. +To support folks who are just using nmbug locally, add exit code +checking and stderr catching to handle this case appropriately. The +final commit isn't closely related, but it allows folks to easily +initialize nmbug repositories (e.g. if they want to version-controll +*all* their tags, or tags for a different project). After this +series, you can run something like: + + export NMBGIT=/tmp/nmbug + nmbug init + export NMBPREFIX='' + nmbug status + nmbug commit + +to create a new repository with all your tags. Replace the NMBPREFIX +with something else (e.g. NMBPREFIX='myproject::') to only track tags +for a particular project. You could also define aliases to set the +appropriate environment variables on the fly: + + $ alias mpbug='NMBGIT=/tmp/nmbug NMBPREFIX="myproject::" nmbug' + $ mpbug status + +W. Trevor King (4): + nmbug: Add a git_with_status helper function + nmbug: Handle missing @upstream in is_unmerged + nmbug: Catch stderr in is_unmerged + nmbug: Add an 'init' command + + devel/nmbug/nmbug | 49 +++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 43 insertions(+), 6 deletions(-) + +-- +1.9.1.353.gc66d89d +