GNU bug report logs - #72299
[PATCH] gnu: Add git-tools.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72299 in the body.
You can then email your comments to 72299 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Suhail Singh" <suhailsingh247 <at> gmail.com>
To: Guix-patches mailing list <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: Add git-tools.
Date: Thu, 25 Jul 2024 15:34:33 -0400

* 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(+)

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 <steve <at> futurile.net>
 ;;; Copyright © 2023 Josselin Poiret <dev <at> jpoiret.xyz>
 ;;; Copyright © 2024 Hilton Chain <hako <at> ultrarare.space>
+;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
 ;;;
 ;;; 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"))

base-commit: 03062c7a9fd74d625639e1a325e9cb58d1cd74e3
-- 
2.45.2

Message #8 received at 72299 <at> debbugs.gnu.org (full text, mbox):

From: "Suhail Singh" <suhailsingh247 <at> gmail.com>
To: 72299 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: Add git-tools.
Date: Thu, 25 Jul 2024 19:26:52 -0400

* gnu/packages/version-control.scm (git-tools): New variable.

Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d
---
 gnu/packages/version-control.scm | 41 ++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

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 <steve <at> futurile.net>
 ;;; Copyright © 2023 Josselin Poiret <dev <at> jpoiret.xyz>
 ;;; Copyright © 2024 Hilton Chain <hako <at> ultrarare.space>
+;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
 ;;;
 ;;; 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"))

base-commit: 03062c7a9fd74d625639e1a325e9cb58d1cd74e3
-- 
2.45.2

Message #11 received at 72299 <at> debbugs.gnu.org (full text, mbox):

From: Suhail Singh <suhailsingh247 <at> gmail.com>
To: 72299 <at> debbugs.gnu.org
Subject: [PATCH v3] gnu: Add git-tools.
Date: Tue, 30 Jul 2024 01:05:56 -0400

* 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-control.scm
index cf7f7b0ad8..d5887f3fbc 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -52,6 +52,7 @@
 ;;; Copyright © 2023 Steve George <steve <at> futurile.net>
 ;;; Copyright © 2023 Josselin Poiret <dev <at> jpoiret.xyz>
 ;;; Copyright © 2024 Hilton Chain <hako <at> ultrarare.space>
+;;; Copyright © 2024 Suhail Singh <suhail <at> bayesians.ca>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -830,6 +831,52 @@ (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}: Batch rename branches with a matching prefix
+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
-- 
2.45.2

Message #16 received at 72299-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Suhail Singh <suhailsingh247 <at> gmail.com>
Cc: 72299-done <at> debbugs.gnu.org
Subject: Re: [bug#72299] [PATCH v3] gnu: Add git-tools.
Date: Wed, 31 Jul 2024 07:59:14 +0800

Suhail Singh <suhailsingh247 <at> gmail.com> writes:

> * gnu/packages/version-control.scm (git-tools): New variable.
>
> Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d

Pushed to master as commit dae712644d05723999c80a518b5f15d78ae317f2,
thank you!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.