From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id kN5rEdit1WYFowAA62LTzQ:P1 (envelope-from ) for ; Mon, 02 Sep 2024 12:21:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id kN5rEdit1WYFowAA62LTzQ (envelope-from ) for ; Mon, 02 Sep 2024 14:21:44 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=PZbnIBFD; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=Gn34cn0q; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725279704; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=X1fP6msJ9KHPSype6Oe+lpWEkQ+mmGCBu23hKedvkCQ=; b=JwWfJS1zkSrzkJBPoxbsk3RN6Db7FDXi6hUYqpQTLe37mFz1/qfAkVF5aCzhsdyG9eeddL br/oAVbYshDqtCcGUUibnrN/Fc+L/My78akMeIGdDZWYKBZsOT3fgKMFDpuKqrVXIP+uPf VKpg9BSfzIqav+/gGNBzebThLr6xaWwdJGF/PYtmZ3JzBBA8OtJxmFt3rpAEUSnYfizzRq PDtp1P5+kpx/ESpay0gfx6VXRVSO4sRA5eOZB2dImS9a9DYjUQpCZ424YwPXCQr2p+4DwG 1ay53987xKuBd7jcd3KvsEeMWjvEuGZXAUjhDM6nVlky5LrM4gKT+ta4VtVN2A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=PZbnIBFD; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=Gn34cn0q; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725279704; a=rsa-sha256; cv=none; b=NZtHdXr6gsKcD576V5zSgiAalMGIJSAV2RdLFg+kI+ZECuCgTTkxtWGJ724X1U3W4nTK6U /x32tuDIo181gjSWqnyl+W7uhjkvSS55mzw0kUXa3dNjdi4T/35kIgYvE+2wbV+F7cAqW6 4bPYSycjsRdvU5zO//pepd0ejbzTrUZ8BExC40o7oNH7tj0N6lda4cN5/vumtMqCb7CVpe sDo+6OgrgrI+YTAjiHCTauVgu7QHnnxDGj7rQZfK12cZDHAcigq/SUEqQ1Nk6Ao7BD+Xgr mPKrXNtyawdXEbl95P2ZRZN8V14DYwYo2KpQvOse0hJGDCIHGwU00M4gGdolpA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1A84717CE0 for ; Mon, 2 Sep 2024 14:21:44 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sl63A-0000ra-98; Mon, 02 Sep 2024 08:20:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sl62W-0000aU-5v for guix-patches@gnu.org; Mon, 02 Sep 2024 08:20:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sl62V-0006kj-S3 for guix-patches@gnu.org; Mon, 02 Sep 2024 08:20:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=X1fP6msJ9KHPSype6Oe+lpWEkQ+mmGCBu23hKedvkCQ=; b=PZbnIBFDtdWe19Wlq8E9WM6U5bxQJx20aA78Xj+ZZ/DvbF7q8NqiJDeWFKqd4qWhhi+qnviTNXXX/iTyJwbxsA5INlf9XCXDPUhC9MPt4PzzlfLYU4ZGIOS14T9oeYk01D200H9ox/eZKLS+BLotS6dc3MvPbglj4Y9gblaOiXKXsqwGbY9UKsmLRw2dKG9MQ7n8iKBEeMBdfSbvuH0rDvrpA9Y57/WfKAWqrphEr152coQExKlJlo3npukUrGJwJ4tH1NgwUBwA2wSipUATxewhIXSEmLEv49yd2HVsOZYY9m3fa6OWNjI8+ErSZkk2UAW698Fbv378XCyIB/b1NA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sl63U-000104-Jy for guix-patches@gnu.org; Mon, 02 Sep 2024 08:21:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72963] [PATCH go-team 30/30] gnu: Add git-spice. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2024 12:21:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72963@debbugs.gnu.org Received: via spool by 72963-submit@debbugs.gnu.org id=B72963.17252796423573 (code B ref 72963); Mon, 02 Sep 2024 12:21:12 +0000 Received: (at 72963) by debbugs.gnu.org; 2 Sep 2024 12:20:42 +0000 Received: from localhost ([127.0.0.1]:47077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sl630-0000vU-75 for submit@debbugs.gnu.org; Mon, 02 Sep 2024 08:20:42 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:40907 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sl62s-0000qK-KV for 72963@debbugs.gnu.org; Mon, 02 Sep 2024 08:20:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1725279556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X1fP6msJ9KHPSype6Oe+lpWEkQ+mmGCBu23hKedvkCQ=; b=Gn34cn0qeLtNAswyxOO2CCFAvkTxDSEu74wDARj5DnTs4ZAYNpIIMIUW+M64ssIkuJT/A1 YsxgJStfOMt71uopzqqDoj4Ev9oSbnZUSrZgUBxs8noMAPklRWE+xU81Iwox5TiLm8SwUt rGZCNK4+w1+LGS+dfsRDfZUg9K45SEy99LMt9NMiw94pMta8dIBgz+GW01suSy33pf7pZA FOf/xhOaJrDcf6wjEXhNaaOEG6Hg0vDSlH9OHyRFH1NM8SpQLzjOJpj+7742eSUq9zkY3n goawIG37D5hTvwpDjoqhb4L+laSo3Orpim8CruLkYXCJ6Y4+P/ZJ6x7wOJbL/Q== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f49addf2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <72963@debbugs.gnu.org>; Mon, 2 Sep 2024 12:19:16 +0000 (UTC) Date: Mon, 2 Sep 2024 14:18:38 +0200 Message-ID: <20240902121843.31430-29-herman@rimm.ee> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240902121843.31430-1-herman@rimm.ee> References: <20240902121843.31430-1-herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 1A84717CE0 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.48 X-Spam-Score: -6.48 X-TUID: IcSZ7hYQdE24 * gnu/packages/version-control.scm (git-spice): Add variable. --- gnu/packages/version-control.scm | 89 ++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9f67237d5d..b141e55137 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -877,6 +877,95 @@ (define-public git-tools @end itemize") (license license:gpl3+))) +(define-public git-spice + (package + (name "git-spice") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abhinav/git-spice") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z5jjbnzyrij95fcm4qpy521fbb3mmcxhd35cl0jrlgdcs0lk2q7")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.22 + #:import-path "go.abhg.dev/gs" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion + (string-append "src/" import-path "/testdata/script") + (for-each + delete-file + (list + ;; Tests require networking. + "auth_detect_forge.txt" + "auth_explicit_forge.txt" + "auth_prompt_forge.txt" + "branch_submit_ambiguous_branch.txt" + "branch_submit_by_name.txt" + "branch_submit_create_update.txt" + "branch_submit_detect_existing.txt" + "branch_submit_long_body.txt" + "branch_submit_multiple_commits.txt" + "branch_submit_multiple_pr_templates.txt" + "branch_submit_no_publish.txt" + "branch_submit_pr_template.txt" + "branch_submit_pr_template_cache_invalidation.txt" + "branch_submit_pr_template_no_body.txt" + "branch_submit_pr_template_prompt.txt" + "branch_submit_recover_prepared.txt" + "branch_submit_remote_prompt.txt" + "branch_submit_rename.txt" + "downstack_submit.txt" + "repo_sync_detached_head.txt" + "repo_sync_detect_externally_created_prs.txt" + "repo_sync_external_pr_head_mismatch.txt" + "repo_sync_manual_pull_merged_pr.txt" + "repo_sync_merged_pr.txt" + "repo_sync_trunk_dirty_tree.txt" + "repo_sync_trunk_no_prs.txt" + "repo_sync_unpushed_commits.txt" + "stack_submit.txt" + "stack_submit_update_leave_draft.txt" + "upstack_submit_main.txt")))))))) + (propagated-inputs (list go-pgregory-net-rapid + go-gopkg-in-yaml-v3 + go-gopkg-in-dnaeon-go-vcr-v3-recorder + go-golang-org-x-oauth2 + go-go-uber-org-mock + go-go-abhg-dev-requiredfield + go-github-com-zalando-go-keyring + go-github-com-vito-midterm + go-github-com-stretchr-testify + go-github-com-shurcool-githubv4 + go-github-com-rogpeppe-go-internal + go-github-com-mattn-go-isatty + go-github-com-dustin-go-humanize + go-github-com-creack-pty-v2 + go-github-com-charmbracelet-log + go-github-com-charmbracelet-lipgloss + go-github-com-charmbracelet-bubbletea + go-github-com-charmbracelet-bubbles + go-github-com-buildkite-shellwords + go-github-com-alecthomas-kong)) + (inputs (list go-github-com-rogpeppe-go-internal-diff + go-github-com-rogpeppe-go-internal-testscript + go-github-com-rogpeppe-go-internal-internal-misspell)) + (native-inputs (list git-minimal)) + (home-page "https://go.abhg.dev/gs") + (synopsis "Manage stacks of Git branches") + (description + "git-spice (gs) is a command line tool for stacking Git branches.") + (license license:gpl3))) + (define-public xdiff (let ((revision "0") (commit "a137bc7ee6c76618ed1737c257548eaa10ac0089")) -- 2.45.2