From patchwork Thu Jul 25 19:34:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Suhail Singh X-Patchwork-Id: 66487 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 2AF2D27BBE9; Thu, 25 Jul 2024 20:35:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A2B127BBE2 for ; Thu, 25 Jul 2024 20:35:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sX4Ep-0000On-V3; Thu, 25 Jul 2024 15:34:55 -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 1sX4Ep-0000OY-75 for guix-patches@gnu.org; Thu, 25 Jul 2024 15:34:55 -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 1sX4Eo-0004kr-Ha for guix-patches@gnu.org; Thu, 25 Jul 2024 15:34:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sX4Ev-0008FO-Tp for guix-patches@gnu.org; Thu, 25 Jul 2024 15:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72299] [PATCH] gnu: Add git-tools. Resent-From: "Suhail Singh" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jul 2024 19:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72299 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72299@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches mailing list Received: via spool by submit@debbugs.gnu.org id=B.172193608931675 (code B ref -1); Thu, 25 Jul 2024 19:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2024 19:34:49 +0000 Received: from localhost ([127.0.0.1]:37812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sX4Ei-0008Eo-Nu for submit@debbugs.gnu.org; Thu, 25 Jul 2024 15:34:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:36674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sX4Eg-0008Eg-Er for submit@debbugs.gnu.org; Thu, 25 Jul 2024 15:34:47 -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 1sX4EY-0000Lj-IX for guix-patches@gnu.org; Thu, 25 Jul 2024 15:34:38 -0400 Received: from mail-qv1-xf44.google.com ([2607:f8b0:4864:20::f44]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sX4EW-0004k6-V4 for guix-patches@gnu.org; Thu, 25 Jul 2024 15:34:38 -0400 Received: by mail-qv1-xf44.google.com with SMTP id 6a1803df08f44-6b7a433857aso1866306d6.2 for ; Thu, 25 Jul 2024 12:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721936075; x=1722540875; darn=gnu.org; h=content-transfer-encoding:mime-version:user-agent:date:message-id :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=vdGaKtopSZcQwbC9yrnT2M2EC3fsNUocE8eUlmX79RQ=; b=D6lC8xLhFcT+RdB56/dAm+PIwhpfLABjQf8m7w2xol90gFrCvEQhacyrGnQg2iQ8Ca 1Tk5QRinsfugZGNDSvyQY3BjY7gzrZNFwVOwSrAB/dsera4bdCv+NhUMgSz/RUTxZtG8 1x/Xw+nZn0OijUtoF3yxjpy5/eL8ZE2useIQaQEckMqNyJFpRG+NTGol6uuSX17uoIub LrPcKXDZcj2m+m/aoX3ZwFUCdJjJmcwuLXIHuyWt75asgp+/eov4Si/cAdyb1cKSlhNM EHZK7BHvg7NtKrjQ/1PdHxJccv/7o3clRUohHQPrB2PNcWQPgpiogDrqGcA7rZHs513a HVAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721936075; x=1722540875; h=content-transfer-encoding:mime-version:user-agent:date:message-id :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vdGaKtopSZcQwbC9yrnT2M2EC3fsNUocE8eUlmX79RQ=; b=iXsI58z6OL3Q5V1JpU9dzjCXSoOgl/aj24QtGqEslncOYdGqyPaMdD5CMoKInfhXal XUg9MMoqlhp00z8g4QpT2d4eeRz3KsI98GGG94UPW1oOpogSYrNLn7kom8O/JeuWlMI+ uuNSH/H/gCLA52DOU11+aLo4k39QhrNRuCy0/E3wus4t+c4HKAJUYWKEow9E2gR1rD65 5jL8U+M1hTdMteDWCKECBcLePCU0IaFyufsFb5fZtJWmLSnejzPEr5uFdHNxvtIrOLeP WZ3kNGcXlCl3Rz8v7v3xullWeHWtAWQAoRPn/i+ie/zFNif7VFAw4Vpc9agnWUBfML/P XiCA== X-Gm-Message-State: AOJu0Yz/gc3eIt5HLQD05zWedg7cSQK2Jww4gqTyavQ5fFR/+4++2C4g b6lQP6t04mPEEwcHqIyczsX9Xlke2QTmoOr3A/6Rh/OntnjySSvz1fqOFnNb X-Google-Smtp-Source: AGHT+IEy/f/KzulH39q4L2F+W7+WVXmfGFs472+N+3coqSryhzcj5yJkSr61VTH+m0OnxYs4Ld2NFQ== X-Received: by 2002:a05:620a:28cd:b0:7a1:5683:b04b with SMTP id af79cd13be357-7a1d69d2950mr237974785a.9.1721936074957; Thu, 25 Jul 2024 12:34:34 -0700 (PDT) Received: from gnus (modemcable060.24-160-184.mc.videotron.ca. [184.160.24.60]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a1d7435d1esm111203185a.78.2024.07.25.12.34.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jul 2024 12:34:34 -0700 (PDT) From: "Suhail Singh" Message-ID: Date: Thu, 25 Jul 2024 15:34:33 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f44; envelope-from=suhailsingh247@gmail.com; helo=mail-qv1-xf44.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git-tools): Add git-tools v2022.12. Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d --- gnu/packages/version-control.scm | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) base-commit: 03062c7a9fd74d625639e1a325e9cb58d1cd74e3 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index cf7f7b0ad8..09309c8439 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2023 Steve George ;;; Copyright © 2023 Josselin Poiret ;;; Copyright © 2024 Hilton Chain +;;; Copyright © 2024 Suhail Singh ;;; ;;; This file is part of GNU Guix. ;;; @@ -830,6 +831,46 @@ (define-public git-cal to GitHub contributions calendar.") (license license:expat))) +(define-public git-tools + (package + (name "git-tools") + (version "2022.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MestreLion/git-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s8x74ggcr6nqzplr0jfzp3cavq0nmdm35hqywzs2bbq75i1mijd")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("git-branches-rename" "bin/git-branches-rename") + ("git-clone-subset" "bin/git-clone-subset") + ("git-find-uncommitted-repos" + "bin/git-find-uncommitted-repos") + ("git-rebase-theirs" "bin/git-rebase-theirs") + ("git-restore-mtime" "bin/git-restore-mtime") + ("git-strip-merge" "bin/git-strip-merge") + ("./man1/" "share/man/man1" + #:include-regexp (".*\\.1$"))))) + (inputs (list bash-minimal git-minimal python-minimal)) + (home-page "https://github.com/MestreLion/git-tools") + (synopsis "Assorted git-related scripts and tools") + (description "@code{git-tools} is a collection of bash and python scripts. +Specifically, it includes the following tools: + +@itemize +@item @code{git-branches-rename} +@item @code{git-clone-subset} +@item @code{git-find-uncommitted-repos} +@item @code{git-rebase-theirs} +@item @code{git-restore-mtime} +@item @code{git-strip-merge} +@end itemize") + (license license:gpl3))) + (define-public xdiff (let ((revision "0") (commit "a137bc7ee6c76618ed1737c257548eaa10ac0089"))