From unknown Sat Aug 16 18:44:25 2025 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 Cc: Kyle Meyer 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 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 Content-Type: text/plain; charset=UTF-8 X-Pobox-Relay-ID: 00EBF192-F42E-11E8-8F9C-063AD72159A7-24757444!pb-smtp1.pobox.com Content-Transfer-Encoding: quoted-printable 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * 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-cont= rol.scm index cec3e5fc6c..d068c30735 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -7,7 +7,7 @@ ;;; Copyright =C2=A9 2014, 2015, 2016 Mark H Weaver ;;; Copyright =C2=A9 2014, 2016 Eric Bavier ;;; Copyright =C2=A9 2015, 2016, 2017, 2018 Efraim Flashner -;;; Copyright =C2=A9 2015 Kyle Meyer +;;; Copyright =C2=A9 2015, 2018 Kyle Meyer ;;; Copyright =C2=A9 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2016, 2017 Leo Famulari ;;; Copyright =C2=A9 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 con= trol 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=3D" %output) + "PREFIX=3D") + #: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 prima= ry +design goals are to reduce the pain of resolving merge conflicts by find= ing +the smallest possible conflicts and to allow a merge to be saved, tested= , +interrupted, published, and collaborated on while in progress.") + (license license:gpl2+))) --=20 2.19.2 From unknown Sat Aug 16 18:44:25 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kyle Meyer Subject: bug#33554: closed (Re: [bug#33554] [PATCH] gnu: Add git-imerge.) Message-ID: References: <87in0bk17u.fsf@gnu.org> <20181129232451.25726-1-kyle@kyleam.com> X-Gnu-PR-Message: they-closed 33554 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 33554@debbugs.gnu.org Date: Sun, 02 Dec 2018 22:35:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1543790102-26743-1" This is a multi-part message in MIME format... ------------=_1543790102-26743-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #33554: [PATCH] gnu: Add git-imerge. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 33554@debbugs.gnu.org. --=20 33554: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D33554 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1543790102-26743-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 33554-done) by debbugs.gnu.org; 2 Dec 2018 22:34:10 +0000 Received: from localhost ([127.0.0.1]:58445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gTaJV-0006vw-Pg for submit@debbugs.gnu.org; Sun, 02 Dec 2018 17:34:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gTaJU-0006vh-8X for 33554-done@debbugs.gnu.org; Sun, 02 Dec 2018 17:34:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gTaJN-0001JE-6X for 33554-done@debbugs.gnu.org; Sun, 02 Dec 2018 17:34:03 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:38516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gTaJL-0001Id-Qw; Sun, 02 Dec 2018 17:34:00 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=56360 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gTaJL-0006no-Jc; Sun, 02 Dec 2018 17:33:59 -0500 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Kyle Meyer Subject: Re: [bug#33554] [PATCH] gnu: Add git-imerge. References: <20181129232451.25726-1-kyle@kyleam.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 12 Frimaire an 227 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 02 Dec 2018 23:33:57 +0100 In-Reply-To: <20181129232451.25726-1-kyle@kyleam.com> (Kyle Meyer's message of "Thu, 29 Nov 2018 18:24:51 -0500") Message-ID: <87in0bk17u.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 33554-done Cc: 33554-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi, Kyle Meyer skribis: > * gnu/packages/version-control.scm (git-imerge): New variable. Applied, thanks! Ludo=E2=80=99. ------------=_1543790102-26743-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: Add git-imerge. 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 Content-Type: text/plain; charset=UTF-8 X-Pobox-Relay-ID: 00EBF192-F42E-11E8-8F9C-063AD72159A7-24757444!pb-smtp1.pobox.com Content-Transfer-Encoding: quoted-printable 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-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kyle Meyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * 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-cont= rol.scm index cec3e5fc6c..d068c30735 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -7,7 +7,7 @@ ;;; Copyright =C2=A9 2014, 2015, 2016 Mark H Weaver ;;; Copyright =C2=A9 2014, 2016 Eric Bavier ;;; Copyright =C2=A9 2015, 2016, 2017, 2018 Efraim Flashner -;;; Copyright =C2=A9 2015 Kyle Meyer +;;; Copyright =C2=A9 2015, 2018 Kyle Meyer ;;; Copyright =C2=A9 2015, 2017, 2018 Ricardo Wurmus ;;; Copyright =C2=A9 2016, 2017 Leo Famulari ;;; Copyright =C2=A9 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 con= trol 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=3D" %output) + "PREFIX=3D") + #: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 prima= ry +design goals are to reduce the pain of resolving merge conflicts by find= ing +the smallest possible conflicts and to allow a merge to be saved, tested= , +interrupted, published, and collaborated on while in progress.") + (license license:gpl2+))) --=20 2.19.2 ------------=_1543790102-26743-1--