* [bug#72299] [PATCH] gnu: Add git-tools.
@ 2024-07-25 19:34 Suhail Singh
2024-07-25 23:26 ` [bug#72299] [PATCH v2] " Suhail Singh
2024-07-30 5:05 ` [bug#72299] [PATCH v3] " Suhail Singh
0 siblings, 2 replies; 4+ messages in thread
From: Suhail Singh @ 2024-07-25 19:34 UTC (permalink / raw)
To: 72299
* 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@futurile.net>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2024 Suhail Singh <suhail@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#72299] [PATCH v2] gnu: Add git-tools.
2024-07-25 19:34 [bug#72299] [PATCH] gnu: Add git-tools Suhail Singh
@ 2024-07-25 23:26 ` Suhail Singh
2024-07-30 5:05 ` [bug#72299] [PATCH v3] " Suhail Singh
1 sibling, 0 replies; 4+ messages in thread
From: Suhail Singh @ 2024-07-25 23:26 UTC (permalink / raw)
To: 72299
* 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@futurile.net>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2024 Suhail Singh <suhail@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#72299] [PATCH v3] gnu: Add git-tools.
2024-07-25 19:34 [bug#72299] [PATCH] gnu: Add git-tools Suhail Singh
2024-07-25 23:26 ` [bug#72299] [PATCH v2] " Suhail Singh
@ 2024-07-30 5:05 ` Suhail Singh
2024-07-30 23:59 ` bug#72299: " 宋文武 via Guix-patches via
1 sibling, 1 reply; 4+ messages in thread
From: Suhail Singh @ 2024-07-30 5:05 UTC (permalink / raw)
To: 72299
* 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@futurile.net>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
+;;; Copyright © 2024 Suhail Singh <suhail@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#72299: [PATCH v3] gnu: Add git-tools.
2024-07-30 5:05 ` [bug#72299] [PATCH v3] " Suhail Singh
@ 2024-07-30 23:59 ` 宋文武 via Guix-patches via
0 siblings, 0 replies; 4+ messages in thread
From: 宋文武 via Guix-patches via @ 2024-07-30 23:59 UTC (permalink / raw)
To: Suhail Singh; +Cc: 72299-done
Suhail Singh <suhailsingh247@gmail.com> writes:
> * gnu/packages/version-control.scm (git-tools): New variable.
>
> Change-Id: I0ac65c24f787714fe0ef234fce639c6ec561600d
Pushed to master as commit dae712644d05723999c80a518b5f15d78ae317f2,
thank you!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-31 0:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-25 19:34 [bug#72299] [PATCH] gnu: Add git-tools Suhail Singh
2024-07-25 23:26 ` [bug#72299] [PATCH v2] " Suhail Singh
2024-07-30 5:05 ` [bug#72299] [PATCH v3] " Suhail Singh
2024-07-30 23:59 ` bug#72299: " 宋文武 via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).