From patchwork Mon Nov 12 21:24:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 195 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B3BBF167F8; Mon, 12 Nov 2018 21:26:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 47291167F6 for ; Mon, 12 Nov 2018 21:26:11 +0000 (GMT) Received: from localhost ([::1]:50734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMJik-00072o-4j for patchwork@mira.cbaines.net; Mon, 12 Nov 2018 16:26:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMJii-00072h-2N for guix-patches@gnu.org; Mon, 12 Nov 2018 16:26:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMJic-0001Xx-Vf for guix-patches@gnu.org; Mon, 12 Nov 2018 16:26:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44119) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMJic-0001XJ-Pw for guix-patches@gnu.org; Mon, 12 Nov 2018 16:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gMJic-0002fk-FP for guix-patches@gnu.org; Mon, 12 Nov 2018 16:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33358] [PATCH] gnu: Add git-when-merged. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Nov 2018 21:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33358@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154205792010220 (code B ref -1); Mon, 12 Nov 2018 21:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Nov 2018 21:25:20 +0000 Received: from localhost ([127.0.0.1]:48377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMJhv-0002el-JI for submit@debbugs.gnu.org; Mon, 12 Nov 2018 16:25:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gMJhs-0002eV-44 for submit@debbugs.gnu.org; Mon, 12 Nov 2018 16:25:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMJhh-0000yd-EN for submit@debbugs.gnu.org; Mon, 12 Nov 2018 16:25:10 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:50876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gMJhf-0000xb-Kn for submit@debbugs.gnu.org; Mon, 12 Nov 2018 16:25:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMJhe-0006Ha-J7 for guix-patches@gnu.org; Mon, 12 Nov 2018 16:25:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMJhV-0000uv-QQ for guix-patches@gnu.org; Mon, 12 Nov 2018 16:24:59 -0500 Received: from pb-smtp1.pobox.com ([64.147.108.70]:60934) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gMJhT-0000r6-MA for guix-patches@gnu.org; Mon, 12 Nov 2018 16:24:51 -0500 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id EE1E4110BD9; Mon, 12 Nov 2018 16:24:39 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=sasl; bh=Q8VXbASXt8BfMOjQayO57yMxDJw=; b=mmlD+mp1dsD1TcQfUOCU a50WNmFru62rEJ161tdOIjnmWggoKU8KRrYf/qSJXnKnu/u+xeaIcgglp8zJkE++ sf5mUqbXDQw050kJNFxSxNAQ2iBTkZCcfx0vRA8uWLdOOocpPwSflr2AJtkvmmqK TRA524B1pmRfdCmuTFcg2Kk= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id E672A110BD7; Mon, 12 Nov 2018 16:24:39 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:date:message-id:mime-version:content-transfer-encoding; s=mesmtp; bh=ebRqsrYCVw8XTD2udcJKznZXmHeS5avV25151rJXFnI=; b=QV5z2n6EhPE0BWchnr/3WbodCDtuQ7NgC3Fw/BxKr1BK7yXWtGLJlP0b9T4/nSTu1lpHmm5W/K3m3dxhGaUb2PYC+ikmsWPw3dDpdywb8RfiZoGagyJa4872ofQxyTwZlii/O8WwMcBOP4f9gHz9VFB23NdjCSG5uSXhsKHitVw= Received: from hylob.local (unknown [76.118.43.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 280FA110BD4; Mon, 12 Nov 2018 16:24:39 -0500 (EST) From: Kyle Meyer Date: Mon, 12 Nov 2018 16:24:23 -0500 Message-Id: <20181112212423.23811-1-kyle@kyleam.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-Pobox-Relay-ID: 5CA6ACFE-E6C1-11E8-A591-063AD72159A7-24757444!pb-smtp1.pobox.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git-when-merged): New variable. --- gnu/packages/version-control.scm | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 04d28044dd..fd90513000 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2279,3 +2279,55 @@ used to keep a folder in sync between computers.") ;; The web app is released under the AGPLv3+. (license (list license:gpl3+ license:agpl3+)))) + +(define-public git-when-merged + ;; Use an unreleased version to get a PY3 compatibility fix. + (let ((commit "ab6af7865a0ba55ba364a6c507e0be6f84f31c6d")) + (package + (name "git-when-merged") + (version (string-append "1.2.0-" (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mhagger/git-when-merged/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0iyk2psf97bc9h43m89p3xjmm79fsx99i7px29g4lcnmdy5kmz0p")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "bin/git-when-merged" + (string-append (assoc-ref outputs "out") + "/bin")) + #t)) + (add-before 'install 'patch-git + (lambda* (#:key inputs #:allow-other-keys) + (let ((git (string-append (assoc-ref inputs "git") + "/bin/git"))) + (substitute* "bin/git-when-merged" + (("'git'") (string-append "'" git "'"))) + #t))) + (add-after 'install 'wrap-script + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/git-when-merged") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t))))) + (inputs + `(("git" ,git) + ("python" ,python-wrapper))) + (home-page "https://github.com/mhagger/git-when-merged") + (synopsis "Determine when a commit was merged into a Git branch") + (description "This Git extension defines a subcommand, +@code{when-merged}, whose core operation is to find the merge that brought a +given commit into the specified ref(s). It has various options that control +how information about the merge is displayed.") + (license license:gpl2))))