From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gPaGKj51qGb+oAAAe85BDQ:P1 (envelope-from ) for ; Tue, 30 Jul 2024 05:08:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gPaGKj51qGb+oAAAe85BDQ (envelope-from ) for ; Tue, 30 Jul 2024 07:08:14 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dM2OeFuR; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=RGE0iuKS; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722316094; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=3/OXzfye6H1XQbeoUqCqUasuJbD7v2TjsFIESzG0rzY=; b=VOPhSTGlcS7tqUa7vg88duehYT24vtF+2lC45unpv8ZffEmDA5aqXRN/bV5bkDGbEZFQuy 4NosmlkPAnqtt/lyHdi6eL0xeyv4I0VTexaj6DV4qw81IYd+OqqLJ/hm/D2GXiay8N4PuT w6aSQI4cgql1aaZwzonWiGKXsXPLOW/h6SwJ/CzXew39n5PQ3jYPN8U6IIu8T3vOlQsSgf j3hAcVnZIYRC1EZ3KGj1oGfxmdptflL1Zzb6JHYDyyLIbuC1iLvPPPKDiVLuaOM9xDJXKf wrQIpN16Mx7HfaXOihJmcr6UdLf3ZhXwxosf2gP+Z0zqmsnAjby439wGRW5r8w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dM2OeFuR; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=RGE0iuKS; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722316094; a=rsa-sha256; cv=none; b=mlyBZahzCuwXw9z7X7jIR+k9uDHF28Q2afle0kTqhUYwsoskeaKQjy6DTPmS9eaUX9pFSI sITtMy8gTPmtZH+eTZKC4a5l6xsUNaIL4++aJucOHtv9mWKYwFNj34J8GgpQAqIJhU3HSp DoUIpgCmT3ix2urrsCZ36hb723QsrECzZiiuPnIW0OkKS9vceBPhWiPsoagezZqBI9O2sy otu3tg6F2h7IujE64ZXCeltyjXYS7u6AIv6W3BMLFcmh6N6OYwIWdMWSh6+7PpBTaESKvE v4HYvthXZqNrmcNzSyhhSOweE5Pojm52DmPScIxmywYC/bnlusdgaGfvXkRH6Q== 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 05B49767BD for ; Tue, 30 Jul 2024 07:08:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYf5R-0005ZS-9f; Tue, 30 Jul 2024 01:07:49 -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 1sYf5Q-0005ZH-Ek for guix-patches@gnu.org; Tue, 30 Jul 2024 01:07:48 -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 1sYf5Q-0004Zc-5H for guix-patches@gnu.org; Tue, 30 Jul 2024 01:07:48 -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:Date:From:To:In-Reply-To:References:Subject; bh=3/OXzfye6H1XQbeoUqCqUasuJbD7v2TjsFIESzG0rzY=; b=dM2OeFuR66yy+ZnhQjnlywknbWJbMu6iqak9dJUKKITBDvpBswCEq53QFg0ddyzGHSrRFrEZDuOGG5++lLDdKcI9/D94+66/9U+3e1eVNsg5ljKRoMEaEpZ2NVEyzSi8FyFNPa3ULev0Ga1xBJ3IeWh4qB7fWOALysdH1mWICI50rJtIGClOUgzaOOwMWTlSPLp2nVEZzjU4N3tUz30NdTWlu6xLoyw26uCOKQ8GpL1FoXX5ZReeWEDNEQMIzAX4iOKp53Yx8i/tsLTY+clyLdsgYjRt/EpcE4JWoWiQ0oIl3YxsUxicvk3SLWGyj7/6otaZxDpsyvsUfWMlmaeXEg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sYf5d-000198-Ph for guix-patches@gnu.org; Tue, 30 Jul 2024 01:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72299] [PATCH v3] gnu: Add git-tools. References: In-Reply-To: Resent-From: Suhail Singh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Jul 2024 05:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72299 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72299@debbugs.gnu.org Received: via spool by 72299-submit@debbugs.gnu.org id=B72299.17223160514370 (code B ref 72299); Tue, 30 Jul 2024 05:08:01 +0000 Received: (at 72299) by debbugs.gnu.org; 30 Jul 2024 05:07:31 +0000 Received: from localhost ([127.0.0.1]:46748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYf58-00018P-Re for submit@debbugs.gnu.org; Tue, 30 Jul 2024 01:07:31 -0400 Received: from mail-ua1-f66.google.com ([209.85.222.66]:37940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sYf56-00018A-C1 for 72299@debbugs.gnu.org; Tue, 30 Jul 2024 01:07:29 -0400 Received: by mail-ua1-f66.google.com with SMTP id a1e0cc1a2514c-822e9b0059cso108447241.0 for <72299@debbugs.gnu.org>; Mon, 29 Jul 2024 22:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722315968; x=1722920768; darn=debbugs.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=3/OXzfye6H1XQbeoUqCqUasuJbD7v2TjsFIESzG0rzY=; b=RGE0iuKSKxjXZCAcaFr9bQ2OmlqXS7YhLbH9rt42QBVjiyxWkZghQ2+wIhTgEJOzgp tOg08eo4AnZeoKCq7qVbECK2S0TqBjJqNodGTAr3D21lZ5foqyPDLLp2l7e/tAv+4OlC VPGZQrAN/FjSONDLA7NIEO7ETtuUTzpQffSAPi7+ywlmjDWTsWgFog/xjnfQ1yn1DMsS Rn7TEHcVlm3dz7WHtiLVg3O6x/Zi+pO1UpgY2zQoABDYASLcCFRZoDkTFtYk8wwCCxUf FbwyNkKIrsTYoRzaIr1jJJAdxWspCBV1LV7WNkimJXpk3TFPe17QDCtcPKmDn61EAKnE ehSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722315968; x=1722920768; 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=3/OXzfye6H1XQbeoUqCqUasuJbD7v2TjsFIESzG0rzY=; b=KGNF2ksFuk0ZuobMOkpZwJg1DJwocW619VSy9CfPQ7M315KwvlU+3pMFVAa3qy2469 qcKem4ANyiWwqcNQ0NyUwM/qJIVSeFgu1cJGFP1itQ2eH2NbAjcyZl1xcruCI07iAHYv Eu3Bf25/AjAP5goAPbo9D4Ec7vZCcKx+CLMtIbjuRlCoMgsmbkI/xvbQ2OlxarY/nMIn SEgt7yHAC9h5WgEnx9RVnZxKEBNWmDIH1wU2UlPbijRDLaxLHYPTUvuVei7/x+SJwkzu u5pdFoe3HMA00WecZtwSQwUgPfkok/6lz+1bXR/FL5tX3ZQ1EgkvZHKKdW+S7uxO0cQ5 izBA== X-Gm-Message-State: AOJu0Yw8WO7O0HMC4xkReOrJm2nTePYjQUHecLh7DLOMkjfY36jzUIea T88H2LPLSxS1lX6M1AGVkihbserPD3Rn+ZExWkTfkHOcnOz9MeEi7rDWEshm X-Google-Smtp-Source: AGHT+IGT6TMxVJAPDrf8dzK9tuK/gcHPOHTX7+NQlH7t8SxmkGR1QcQlW/y2KbPU3oIj9zTf/NZ5ZA== X-Received: by 2002:a05:6102:26c9:b0:493:bb70:940 with SMTP id ada2fe7eead31-493d82759ccmr10913695137.2.1722315968014; Mon, 29 Jul 2024 22:06:08 -0700 (PDT) Received: from gnus ([65.93.169.47]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a1f3a51644sm183332285a.16.2024.07.29.22.06.07 for <72299@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 22:06:07 -0700 (PDT) From: Suhail Singh Message-ID: Date: Tue, 30 Jul 2024 01:05:56 -0400 User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -3.96 X-Migadu-Queue-Id: 05B49767BD X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.96 X-TUID: WTdFKQfnwMok * gnu/packages/version-control.scm (git-tools): New variable. Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d --- gnu/packages/version-control.scm | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro= l.scm index cf7f7b0ad8..d5887f3fbc 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -52,6 +52,7 @@ ;;; Copyright =C2=A9 2023 Steve George ;;; Copyright =C2=A9 2023 Josselin Poiret ;;; Copyright =C2=A9 2024 Hilton Chain +;;; Copyright =C2=A9 2024 Suhail Singh ;;; ;;; This file is part of GNU Guix. ;;; @@ -830,6 +831,52 @@ (define-public git-cal to GitHub contributions calendar.") (license license:expat))) =20 +(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}: Batch rename branches with a matching pr= efix +to another prefix +@item @code{git-clone-subset}: Clone a subset of a git repository +@item @code{git-find-uncommitted-repos}: Recursively list repositories in = the +given directory(ies) that have uncommitted changes +@item @code{git-rebase-theirs}: Resolve rebase conflicts and failed +cherry-picks by favoring \"theirs\" version +@item @code{git-restore-mtime}: Restore modification time of files based on +the date of the most recent commit that modified them +@item @code{git-strip-merge}: A git-merge wrapper that deletes files on a +\"foreign\" branch before merging +@end itemize") + (license license:gpl3+))) + (define-public xdiff (let ((revision "0") (commit "a137bc7ee6c76618ed1737c257548eaa10ac0089")) base-commit: 03062c7a9fd74d625639e1a325e9cb58d1cd74e3 --=20 2.45.2