From patchwork Thu Nov 29 23:24:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kyle Meyer X-Patchwork-Id: 355 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 A0D4016853; Thu, 29 Nov 2018 23:26:17 +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=unavailable 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 E3BBB16851 for ; Thu, 29 Nov 2018 23:26:13 +0000 (GMT) Received: from localhost ([::1]:57080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSVhF-0007E8-3y for patchwork@mira.cbaines.net; Thu, 29 Nov 2018 18:26:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSVh9-0007E2-IE for guix-patches@gnu.org; Thu, 29 Nov 2018 18:26:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSVh5-0001EP-FI for guix-patches@gnu.org; Thu, 29 Nov 2018 18:26:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gSVh4-0001EF-M0 for guix-patches@gnu.org; Thu, 29 Nov 2018 18:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gSVh4-0000eG-Ey for guix-patches@gnu.org; Thu, 29 Nov 2018 18:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33554] [PATCH] gnu: Add git-imerge. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Nov 2018 23:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33554 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33554@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15435339342448 (code B ref -1); Thu, 29 Nov 2018 23:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Nov 2018 23:25:34 +0000 Received: from localhost ([127.0.0.1]:55298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gSVgX-0000dL-G8 for submit@debbugs.gnu.org; Thu, 29 Nov 2018 18:25:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gSVgR-0000cz-IF for submit@debbugs.gnu.org; Thu, 29 Nov 2018 18:25:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSVgK-0000m7-Dr for submit@debbugs.gnu.org; Thu, 29 Nov 2018 18:25:18 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:56885) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gSVgI-0000k3-In for submit@debbugs.gnu.org; Thu, 29 Nov 2018 18:25:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSVgH-00076f-GE for guix-patches@gnu.org; Thu, 29 Nov 2018 18:25:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSVgB-0000fH-Rb for guix-patches@gnu.org; Thu, 29 Nov 2018 18:25:12 -0500 Received: from pb-smtp1.pobox.com ([64.147.108.70]:63272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gSVgB-0000eX-GW for guix-patches@gnu.org; Thu, 29 Nov 2018 18:25:07 -0500 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 1144710FA96; Thu, 29 Nov 2018 18:25:06 -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-type :content-transfer-encoding; s=sasl; bh=88h9YNTQlx8S1HZTirG/CI0rk Q8=; b=lBVYDZ/gF49LHyT/VUte1giDEReZQXcSdbxOzD/sXuk65zHuaRqIlqdJd S+OkmUjdj9qUMNGEVAPMTTTC0v9+8DvrAHVeyxeEPKUc8gpqAEIYYESGa3vZIIdT zRuNkwlmGOR7KXxXSie9iRZysvXHcabF8ko/baIjNoSORjjwao= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 08E0110FA94; Thu, 29 Nov 2018 18:25:06 -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-type:content-transfer-encoding; s=mesmtp; bh=QS61CWPVbWWkwfHoxuK5qxwfSuE+h9XbygZXxIUnwAY=; b=zC5CzH+nhqcpcT/okN08JpgnKmE8l4SccWi1C+IskoVEWgH2s3Ngddilsw5FJNp7ThEF13ZK+wlPXz4F3qwkUflYMcf/NQK8Tcb2H2/vodic+dwOpNz97uqgZ0bH33eyjs1wW2OSHJmllBOtFuI8FQrQ/d7tQy0Zhr54xJ4R3fA= Received: from hylob.dartmouth.edu (unknown [129.170.31.180]) (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 883EC10FA91; Thu, 29 Nov 2018 18:25:05 -0500 (EST) From: Kyle Meyer Date: Thu, 29 Nov 2018 18:24:51 -0500 Message-Id: <20181129232451.25726-1-kyle@kyleam.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-Pobox-Relay-ID: 00EBF192-F42E-11E8-8F9C-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-imerge): New variable. --- gnu/packages/version-control.scm | 48 +++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cec3e5fc6c..d068c30735 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner -;;; Copyright © 2015 Kyle Meyer +;;; Copyright © 2015, 2018 Kyle Meyer ;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nils Gillmann @@ -2395,3 +2395,49 @@ used to keep a folder in sync between computers.") given commit into the specified ref(s). It has various options that control how information about the merge is displayed.") (license license:gpl2+)))) + +(define-public git-imerge + (package + (name "git-imerge") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/mhagger/git-imerge/archive/v" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a6ay8fpgz3yd84jc40w41x0rcfpan6bcq4wd1hxiiqwb51jysb2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; The are only manual test scripts. + #:make-flags (list (string-append "DESTDIR=" %output) + "PREFIX=") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'install 'patch-git + (lambda* (#:key inputs #:allow-other-keys) + (let ((git (string-append (assoc-ref inputs "git") + "/bin/git"))) + (substitute* "git-imerge" + (("'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-imerge") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))) + #t))))) + (inputs + `(("git" ,git) + ("python" ,python-wrapper))) + (home-page "https://github.com/mhagger/git-imerge") + (synopsis "Incremental merge for Git") + (description "This Git extension defines a subcommand, @code{imerge}, +which performs an incremental merge between two branches. Its two primary +design goals are to reduce the pain of resolving merge conflicts by finding +the smallest possible conflicts and to allow a merge to be saved, tested, +interrupted, published, and collaborated on while in progress.") + (license license:gpl2+)))